GST Release Add, Edit, Delete Working

Merge pull request 'pankaj-dev - all done' (#18 ) from pankaj-dev into main
Reviewed-on: #18
2026-03-24 18:46:07 +05:30 · 2026-03-24 11:27:55 +00:00 · 2026-03-24 16:56:23 +05:30 · 2026-03-24 16:29:32 +05:30 · 2026-03-24 16:29:18 +05:30 · 2026-03-24 10:51:43 +00:00
107 changed files with 2503 additions and 10263 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,7 @@
+venv/
+*.pyc
+__pycache__/
+
+static/downloads/
+static/uploads/
+
--- a/pycache/config.cpython-313.pyc
+++ b/pycache/config.cpython-313.pyc
--- a/pycache/config.cpython-314.pyc
+++ b/pycache/config.cpython-314.pyc
--- a/activity.log
+++ b/activity.log
--- a/app.log
+++ b/app.log
@@ -1,114 +0,0 @@
-2025-02-15 11:07:16,100 - INFO - Logging is set up.
-2025-02-15 11:07:16,100 - INFO - Logging is set up.
-2025-02-15 11:07:16,131 - WARNING -  * Debugger is active!
-2025-02-15 11:07:16,131 - WARNING -  * Debugger is active!
-2025-02-15 11:07:16,137 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:07:16,137 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:13:26,290 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "GET / HTTP/1.1" 200 -
-2025-02-15 11:13:26,290 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "GET / HTTP/1.1" 200 -
-2025-02-15 11:13:26,315 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/css/index.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,315 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/css/index.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,504 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,504 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,626 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/js/validateFileInput.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,626 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/js/validateFileInput.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,633 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/js/searchContractor.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,633 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[36mGET /static/js/searchContractor.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:26,950 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[33mGET /favicon.ico HTTP/1.1[0m" 404 -
-2025-02-15 11:13:26,950 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:26] "[33mGET /favicon.ico HTTP/1.1[0m" 404 -
-2025-02-15 11:13:28,623 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "GET / HTTP/1.1" 200 -
-2025-02-15 11:13:28,623 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "GET / HTTP/1.1" 200 -
-2025-02-15 11:13:28,933 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/css/index.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,933 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/css/index.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,952 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/js/validateFileInput.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,952 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/js/validateFileInput.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,954 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/js/searchContractor.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,955 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,954 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/js/searchContractor.js HTTP/1.1[0m" 304 -
-2025-02-15 11:13:28,955 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:28] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:31,608 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:13:31,608 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:13:31,639 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:31,639 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:13:31,649 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:13:31,649 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:13:31,967 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:13:31,967 - INFO - 127.0.0.1 - - [15/Feb/2025 11:13:31] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:15:01,349 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:01] "[31m[1mPOST /check_state HTTP/1.1[0m" 409 -
-2025-02-15 11:15:01,349 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:01] "[31m[1mPOST /check_state HTTP/1.1[0m" 409 -
-2025-02-15 11:15:21,783 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:21] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:21,783 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:21] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,127 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,127 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,151 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,151 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,391 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,391 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,440 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:22,440 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:22] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:15:24,266 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:24] "POST /add_state HTTP/1.1" 200 -
-2025-02-15 11:15:24,266 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:24] "POST /add_state HTTP/1.1" 200 -
-2025-02-15 11:15:25,418 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:15:25,418 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:15:25,716 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:15:25,716 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:15:25,749 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:15:25,749 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:15:25,752 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:15:25,752 - INFO - 127.0.0.1 - - [15/Feb/2025 11:15:25] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:46,338 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:16:46,338 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:16:48,798 - INFO - Logging is set up.
-2025-02-15 11:16:48,798 - INFO - Logging is set up.
-2025-02-15 11:16:48,843 - WARNING -  * Debugger is active!
-2025-02-15 11:16:48,843 - WARNING -  * Debugger is active!
-2025-02-15 11:16:48,847 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:16:48,847 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:16:52,045 - DEBUG - Fetched state data successfully.
-2025-02-15 11:16:52,045 - DEBUG - Fetched state data successfully.
-2025-02-15 11:16:52,054 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:16:52,054 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:16:52,076 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:16:52,076 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:16:52,078 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:52,078 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:52,377 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:52,377 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:52] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:54,758 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:54] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:16:54,758 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:54] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:16:54,992 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:54] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:16:54,992 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:54] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:16:55,016 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:55] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:16:55,016 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:55] "POST /check_state HTTP/1.1" 200 -
-2025-02-15 11:16:55,669 - INFO - State 'sss' added successfully.
-2025-02-15 11:16:55,669 - INFO - 'State 'sss added successfully.
-2025-02-15 11:16:55,670 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:55] "POST /add_state HTTP/1.1" 200 -
-2025-02-15 11:16:55,670 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:55] "POST /add_state HTTP/1.1" 200 -
-2025-02-15 11:16:57,235 - DEBUG - Fetched state data successfully.
-2025-02-15 11:16:57,235 - DEBUG - Fetched state data successfully.
-2025-02-15 11:16:57,239 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:16:57,239 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "GET /add_state HTTP/1.1" 200 -
-2025-02-15 11:16:57,263 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:16:57,263 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "[36mGET /static/css/style.css HTTP/1.1[0m" 304 -
-2025-02-15 11:16:57,483 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:57,483 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "[36mGET /static/images/icons/pen_blue_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:57,567 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:16:57,567 - INFO - 127.0.0.1 - - [15/Feb/2025 11:16:57] "[36mGET /static/images/icons/bin_red_icon.png HTTP/1.1[0m" 304 -
-2025-02-15 11:20:55,547 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:20:55,547 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:20:56,800 - INFO - Logging is set up.
-2025-02-15 11:20:56,800 - INFO - Logging is set up.
-2025-02-15 11:20:56,835 - WARNING -  * Debugger is active!
-2025-02-15 11:20:56,835 - WARNING -  * Debugger is active!
-2025-02-15 11:20:56,837 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:20:56,837 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:21:04,060 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:21:04,060 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:21:05,429 - INFO - Logging is set up.
-2025-02-15 11:21:05,429 - INFO - Logging is set up.
-2025-02-15 11:21:05,461 - WARNING -  * Debugger is active!
-2025-02-15 11:21:05,461 - WARNING -  * Debugger is active!
-2025-02-15 11:21:05,463 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:21:05,463 - INFO -  * Debugger PIN: 558-213-972
-2025-02-15 11:21:17,911 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
-2025-02-15 11:21:17,911 - INFO -  * Detected change in 'C:\\Users\\ADMIN\\PycharmProjects\\ManagementApplicationt\\main.py', reloading
--- a/controllers/pycache/auth_controller.cpython-313.pyc
+++ b/controllers/pycache/auth_controller.cpython-313.pyc
--- a/controllers/pycache/auth_controller.cpython-314.pyc
+++ b/controllers/pycache/auth_controller.cpython-314.pyc
--- a/controllers/pycache/block_controller.cpython-313.pyc
+++ b/controllers/pycache/block_controller.cpython-313.pyc
--- a/controllers/pycache/block_controller.cpython-314.pyc
+++ b/controllers/pycache/block_controller.cpython-314.pyc
--- a/controllers/pycache/district_controller.cpython-313.pyc
+++ b/controllers/pycache/district_controller.cpython-313.pyc
--- a/controllers/pycache/district_controller.cpython-314.pyc
+++ b/controllers/pycache/district_controller.cpython-314.pyc
--- a/controllers/pycache/excel_upload_controller.cpython-313.pyc
+++ b/controllers/pycache/excel_upload_controller.cpython-313.pyc
--- a/controllers/pycache/excel_upload_controller.cpython-314.pyc
+++ b/controllers/pycache/excel_upload_controller.cpython-314.pyc
--- a/controllers/pycache/gst_release_controller.cpython-313.pyc
+++ b/controllers/pycache/gst_release_controller.cpython-313.pyc
--- a/controllers/pycache/gst_release_controller.cpython-314.pyc
+++ b/controllers/pycache/gst_release_controller.cpython-314.pyc
--- a/controllers/pycache/hold_types_controller.cpython-313.pyc
+++ b/controllers/pycache/hold_types_controller.cpython-313.pyc
--- a/controllers/pycache/hold_types_controller.cpython-314.pyc
+++ b/controllers/pycache/hold_types_controller.cpython-314.pyc
--- a/controllers/pycache/invoice_controller.cpython-313.pyc
+++ b/controllers/pycache/invoice_controller.cpython-313.pyc
--- a/controllers/pycache/invoice_controller.cpython-314.pyc
+++ b/controllers/pycache/invoice_controller.cpython-314.pyc
--- a/controllers/pycache/log_controller.cpython-313.pyc
+++ b/controllers/pycache/log_controller.cpython-313.pyc
--- a/controllers/pycache/log_controller.cpython-314.pyc
+++ b/controllers/pycache/log_controller.cpython-314.pyc
--- a/controllers/pycache/payment_controller.cpython-313.pyc
+++ b/controllers/pycache/payment_controller.cpython-313.pyc
--- a/controllers/pycache/payment_controller.cpython-314.pyc
+++ b/controllers/pycache/payment_controller.cpython-314.pyc
--- a/controllers/pycache/pmc_report_controller.cpython-313.pyc
+++ b/controllers/pycache/pmc_report_controller.cpython-313.pyc
--- a/controllers/pycache/pmc_report_controller.cpython-314.pyc
+++ b/controllers/pycache/pmc_report_controller.cpython-314.pyc
--- a/controllers/pycache/report_controller.cpython-313.pyc
+++ b/controllers/pycache/report_controller.cpython-313.pyc
--- a/controllers/pycache/report_controller.cpython-314.pyc
+++ b/controllers/pycache/report_controller.cpython-314.pyc
--- a/controllers/pycache/state_controller.cpython-313.pyc
+++ b/controllers/pycache/state_controller.cpython-313.pyc
--- a/controllers/pycache/state_controller.cpython-314.pyc
+++ b/controllers/pycache/state_controller.cpython-314.pyc
--- a/controllers/pycache/subcontractor_controller.cpython-313.pyc
+++ b/controllers/pycache/subcontractor_controller.cpython-313.pyc
--- a/controllers/pycache/subcontractor_controller.cpython-314.pyc
+++ b/controllers/pycache/subcontractor_controller.cpython-314.pyc
--- a/controllers/pycache/village_controller.cpython-313.pyc
+++ b/controllers/pycache/village_controller.cpython-313.pyc
--- a/controllers/pycache/village_controller.cpython-314.pyc
+++ b/controllers/pycache/village_controller.cpython-314.pyc
--- a/controllers/block_controller.py
+++ b/controllers/block_controller.py
@@ -1,37 +1,28 @@
-from flask import Blueprint, render_template, request, redirect, url_for, jsonify
+import config
+from flask import Blueprint, render_template, request, redirect, url_for, jsonify, flash
 from flask_login import login_required

-import config
-import mysql.connector
-
+from model.State import State
 from model.Block import Block
 from model.Utilities import HtmlHelper

 block_bp = Blueprint('block', __name__)

-
+# --- Add Block page -------
@block_bp.route('/add_block', methods=['GET', 'POST'])
@login_required
 def add_block():
-
    block = Block()

    if request.method == 'POST':
        block.AddBlock(request)
        return block.resultMessage
-
-    connection = config.get_db_connection()
-    cursor = connection.cursor()
-
-    cursor.callproc("GetAllStates")
-    for rs in cursor.stored_results():
-        states = rs.fetchall()
+    
+    state = State()
+    states = state.GetAllStates(request=request)

    block_data = block.GetAllBlocks(request)

-    cursor.close()
-    connection.close()
-
    return render_template(
        'add_block.html',
        states=states,
@@ -83,8 +74,15 @@ def edit_block(block_id):

    if request.method == 'POST':
        block.EditBlock(request, block_id)
-        return block.resultMessage
+        block.resultMessage

+        if block.resultMessage:
+            flash("Block updated successfully!", "success")
+            return redirect(url_for('block.add_block'))
+        else:
+            flash(block.resultMessage, "error")
+
+        
    connection = config.get_db_connection()
    cursor = connection.cursor()

--- a/controllers/district_controller.py
+++ b/controllers/district_controller.py
@@ -6,11 +6,10 @@ from model.State import State

 district_bp = Blueprint('district', __name__)

-
+# ------- District page --------
@district_bp.route('/add_district', methods=['GET', 'POST'])
@login_required
 def add_district():
-
    district = District()

    if request.method == 'POST':
@@ -28,7 +27,7 @@ def add_district():
        states=states
    )

-
+# ------- District check --------
@district_bp.route('/check_district', methods=['POST'])
@login_required
 def check_district():
@@ -37,7 +36,7 @@ def check_district():

    return district.CheckDistrict(request=request)

-
+# ------- District delete by district id --------
@district_bp.route('/delete_district/<int:district_id>')
@login_required
 def delete_district(district_id):
@@ -52,6 +51,7 @@ def delete_district(district_id):
        return redirect(url_for('district.add_district'))


+# ------- District update by district id --------
@district_bp.route('/edit_district/<int:district_id>', methods=['GET', 'POST'])
@login_required
 def edit_district(district_id):
--- a/controllers/excel_upload_controller.py
+++ b/controllers/excel_upload_controller.py
@@ -1,28 +1,16 @@
-import os
+import config
 import ast
 import re
-from flask_login import login_required
 import openpyxl
-from flask import Blueprint, request, render_template, redirect, url_for, jsonify, current_app
 from flask_login import current_user
+from flask_login import login_required
+from flask import Blueprint, request, render_template, redirect, url_for, jsonify
+
 from model.Log import LogHelper
-import config
 from model.FolderAndFile import FolderAndFile

 excel_bp = Blueprint('excel', __name__)

-# Default folder in case config not set
-# DEFAULT_UPLOAD_FOLDER = 'uploads'
-
-
-# def get_upload_folder():
-#     """Returns the upload folder from Flask config or default, ensures it exists."""
-#     folder = current_app.config.get('UPLOAD_FOLDER', DEFAULT_UPLOAD_FOLDER)
-#     if not os.path.exists(folder):
-#         os.makedirs(folder)
-#     return folder
-
-
 # ---------------- Upload Excel File ----------------
@excel_bp.route('/upload_excel_file', methods=['GET', 'POST'])
@login_required
@@ -30,9 +18,6 @@ def upload():
    if request.method == 'POST':
        file = request.files.get('file')
        if file and file.filename.endswith('.xlsx'):
-            # upload_folder = get_upload_folder()
-            # filepath = os.path.join(upload_folder, file.filename)
-
            filepath =FolderAndFile.get_upload_path(file.filename)

            file.save(filepath)
@@ -42,6 +27,7 @@ def upload():
                f"User {current_user.id} Upload Excel File '{file.filename}'"
            )
            return redirect(url_for('excel.show_table', filename=file.filename))
+    
    return render_template('uploadExcelFile.html')


@@ -51,7 +37,6 @@ def show_table(filename):
        global data
        data = []

-        # filepath = os.path.join(get_upload_folder(), filename)
        filepath = FolderAndFile.get_upload_path(filename)
        wb = openpyxl.load_workbook(filepath, data_only=True)
        sheet = wb.active
--- a/controllers/gst_release_controller.py
+++ b/controllers/gst_release_controller.py
@@ -1,70 +1,46 @@
-from flask import Blueprint, render_template, request, redirect, url_for, jsonify
-from flask_login import login_required, current_user
-from model.gst_release import GSTReleasemodel
+# routes/gst_release_routes.py
+from flask import Blueprint, render_template, request, redirect, url_for, flash
+from flask_login import login_required
+from model.gst_release import GSTRelease
 from model.Log import LogHelper

 gst_release_bp = Blueprint('gst_release_bp', __name__)
+gst_service = GSTRelease()

-# ------------------- Add GST Release -------------------
+# ---------------- ADD GST RELEASE ----------------
@gst_release_bp.route('/add_gst_release', methods=['GET', 'POST'])
@login_required
 def add_gst_release():
-    gst_releases_dict = GSTReleasemodel.fetch_all_gst_releases()
-    gst_releases = [
-        [
-            g['GST_Release_Id'], g['PMC_No'], g['invoice_no'],
-            g['Basic_Amount'], g['Final_Amount'], g['Total_Amount'], g['UTR']
-        ] for g in gst_releases_dict
-    ] if gst_releases_dict else []
-
    if request.method == 'POST':
-        pmc_no = request.form['PMC_No']
-        invoice_no = request.form['invoice_No']
-        basic_amount = request.form['basic_amount']
-        final_amount = request.form['final_amount']
-        total_amount = request.form['total_amount']
-        utr = request.form['utr']
-        contractor_id = request.form['subcontractor_id']
-
-        LogHelper.log_action("Add GST Release", f"User {current_user.id} added GST release '{pmc_no}'")
-        GSTReleasemodel.insert_gst_release(pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id)
-
+        gst_service.AddGSTRelease(request)
+        LogHelper.log_action("Add GST Release", "User added GST release")
+        flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
        return redirect(url_for('gst_release_bp.add_gst_release'))

-    return render_template('add_gst_release.html', gst_releases=gst_releases, invoices=[])
+    gst_releases = gst_service.GetAllGSTReleases()
+    return render_template('add_gst_release.html', gst_releases=gst_releases)

-
-# ------------------- Edit GST Release -------------------
+# ---------------- EDIT GST RELEASE ----------------
@gst_release_bp.route('/edit_gst_release/<int:gst_release_id>', methods=['GET', 'POST'])
@login_required
 def edit_gst_release(gst_release_id):
-    gst_release_data = GSTReleasemodel.fetch_gst_release_by_id(gst_release_id)
-    if not gst_release_data:
+    gst_data = gst_service.GetGSTReleaseByID(gst_release_id)
+    if not gst_data:
        return "GST Release not found", 404

    if request.method == 'POST':
-        pmc_no = request.form['PMC_No']
-        invoice_no = request.form['invoice_No']
-        basic_amount = request.form['basic_amount']
-        final_amount = request.form['final_amount']
-        total_amount = request.form['total_amount']
-        utr = request.form['utr']
-
-        LogHelper.log_action("Edit GST Release", f"User {current_user.id} edited GST release '{pmc_no}'")
-        GSTReleasemodel.update_gst_release(gst_release_id, pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr)
-
+        gst_service.EditGSTRelease(request, gst_release_id)
+        LogHelper.log_action("Edit GST Release", "User edited GST release")
+        flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
        return redirect(url_for('gst_release_bp.add_gst_release'))

-    return render_template('edit_gst_release.html', gst_release_data=gst_release_data, invoices=[])
+    return render_template('edit_gst_release.html', gst_release_data=gst_data)

-
-# ------------------- Delete GST Release -------------------
+# ---------------- DELETE GST RELEASE ----------------
@gst_release_bp.route('/delete_gst_release/<int:gst_release_id>', methods=['GET', 'POST'])
@login_required
 def delete_gst_release(gst_release_id):
-    success, utr = GSTReleasemodel.delete_gst_release(gst_release_id)
-    if not success:
-        return jsonify({"message": "GST Release not found or failed to delete", "status": "error"}), 404
-
-    LogHelper.log_action("Delete GST Release", f"User {current_user.id} deleted GST release '{gst_release_id}'")
-    return jsonify({"message": f"GST Release {gst_release_id} deleted successfully.", "status": "success"}), 200
+    gst_service.DeleteGSTRelease(gst_release_id)
+    LogHelper.log_action("Delete GST Release", "User deleted GST release")
+    flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
+    return redirect(url_for('gst_release_bp.add_gst_release'))
--- a/controllers/hold_types_controller.py
+++ b/controllers/hold_types_controller.py
@@ -10,21 +10,21 @@ hold_bp = Blueprint("hold_types", __name__)
@hold_bp.route('/add_hold_type', methods=['GET','POST'])
@login_required
 def add_hold_type():
-
-    hold = HoldTypes()   
+    hold = HoldTypes()

    if request.method == 'POST':
-        hold.AddHoldType(request)   # ✅
-        return hold.resultMessage
+        hold.AddHoldType(request)
+        # ✅ Always redirect to same page (NO JSON)
+        return redirect(url_for("hold_types.add_hold_type"))

-    hold_types = hold.GetAllHoldTypes()   # ✅
+    # GET request → show data
+    hold_types = hold.GetAllHoldTypes()

    return render_template(
        "add_hold_type.html",
        Hold_Types_data=hold_types
    )

-
 # ---------------- CHECK HOLD TYPE (OPTIONAL LIKE BLOCK) ----------------
@hold_bp.route('/check_hold_type', methods=['POST'])
@login_required
--- a/controllers/invoice_controller.py
+++ b/controllers/invoice_controller.py
@@ -1,98 +1,101 @@
+
+
+
 # controllers/invoice_controller.py

 from flask import Blueprint, request, jsonify, render_template
 from flask_login import login_required, current_user
 from model.Invoice import *
-from model.Log import LogHelper 
+from model.Log import LogHelper

 invoice_bp = Blueprint('invoice', __name__)

-# -------------------------------- Add Invoice ---------------------------------
-@invoice_bp.route('/add_invoice', methods=['GET', 'POST'])
-@login_required
-def add_invoice():
-    if request.method == 'POST':
+# ------------------------------- Helpers -------------------------------
+def handle_exception(func):
+    """Decorator to handle exceptions and return JSON error responses."""
+    def wrapper(*args, **kwargs):
        try:
-            village_name = request.form.get('village')
-            village_result = get_village_id(village_name)
-
-            if not village_result:
-                return jsonify({"status": "error", "message": f"Village '{village_name}' not found"}), 400
-
-            village_id = village_result['Village_Id']
-            data = request.form
-
-            invoice_id = insert_invoice(data, village_id)
-            assign_subcontractor(data, village_id)
-            insert_hold_types(data, invoice_id)
-
-            LogHelper.log_action("Add invoice", f"User {current_user.id} Added invoice '{data.get('pmc_no')}'")
-
-            return jsonify({"status": "success", "message": "Invoice added successfully"}), 201
-
+            return func(*args, **kwargs)
        except Exception as e:
            return jsonify({"status": "error", "message": str(e)}), 500
+    wrapper.__name__ = func.__name__
+    return wrapper
+
+def log_action(action: str, detail: str):
+    LogHelper.log_action(action, f"User {current_user.id} {detail}")
+
+
+# ------------------------------- Add Invoice -------------------------------
+@invoice_bp.route('/add_invoice', methods=['GET', 'POST'])
+@login_required
+@handle_exception
+def add_invoice():
+    if request.method == 'POST':
+        data = request.form
+        village_name = data.get('village')
+        village_result = get_village_id(village_name)
+
+        if not village_result:
+            return jsonify({"status": "error", "message": f"Village '{village_name}' not found"}), 400
+
+        village_id = village_result['Village_Id']
+        invoice_id = insert_invoice(data, village_id)
+        assign_subcontractor(data, village_id)
+        insert_hold_types(data, invoice_id)
+
+        log_action("Add invoice", f"added invoice '{data.get('pmc_no')}'")
+        return jsonify({"status": "success", "message": "Invoice added successfully"}), 201

    invoices = get_all_invoice_details()
    villages = get_all_villages()
    return render_template('add_invoice.html', invoices=invoices, villages=villages)


-# ------------------- Search Subcontractor -------------------
+# ------------------------------- Search Subcontractor -------------------------------
@invoice_bp.route('/search_subcontractor', methods=['POST'])
@login_required
+@handle_exception
 def search_subcontractor():
-    sub_query = request.form.get("query")
-    results = search_contractors(sub_query)
+    query = request.form.get("query", "").strip()
+    results = search_contractors(query)

    if not results:
        return "<li>No subcontractor found</li>"

-    output = "".join(
-        f"<li data-id='{row['Contractor_Id']}'>{row['Contractor_Name']}</li>"
-        for row in results
-    )
-    return output
+    return "".join(f"<li data-id='{r['Contractor_Id']}'>{r['Contractor_Name']}</li>" for r in results)


-# ------------------- Get Hold Types -------------------
+# ------------------------------- Get Hold Types -------------------------------
@invoice_bp.route('/get_hold_types', methods=['GET'])
@login_required
+@handle_exception
 def get_hold_types():
    hold_types = get_all_hold_types()
-    LogHelper.log_action("Get hold type", f"User {current_user.id} Get hold type '{hold_types}'")
+    log_action("Get hold type", f"retrieved hold types '{hold_types}'")
    return jsonify(hold_types)


-# ------------------- Edit Invoice -------------------
+# ------------------------------- Edit Invoice -------------------------------
@invoice_bp.route('/edit_invoice/<int:invoice_id>', methods=['GET', 'POST'])
@login_required
+@handle_exception
 def edit_invoice(invoice_id):
    if request.method == 'POST':
        data = request.form
        update_invoice(data, invoice_id)
        update_inpayment(data)
-
-        LogHelper.log_action("Edit invoice", f"User {current_user.id} Edit invoice '{invoice_id}'")
+        log_action("Edit invoice", f"edited invoice '{invoice_id}'")
        return jsonify({"status": "success", "message": "Invoice updated successfully"}), 200

    invoice = get_invoice_by_id(invoice_id)
    return render_template('edit_invoice.html', invoice=invoice)


-# ------------------- Delete Invoice -------------------
+# ------------------------------- Delete Invoice -------------------------------
@invoice_bp.route('/delete_invoice/<int:invoice_id>', methods=['GET'])
@login_required
+@handle_exception
 def delete_invoice_route(invoice_id):
-    try:
-        delete_invoice_data(invoice_id, current_user.id)
-        LogHelper.log_action("Delete Invoice", f"User {current_user.id} deleted Invoice '{invoice_id}'")
-        return jsonify({
-            "message": f"Invoice {invoice_id} deleted successfully.",
-            "status": "success"
-        })
-    except Exception as e:
-        return jsonify({
-            "message": str(e),
-            "status": "error"
-        }), 500
+    delete_invoice_data(invoice_id, current_user.id)
+    log_action("Delete invoice", f"deleted invoice '{invoice_id}'")
+    return jsonify({"status": "success", "message": f"Invoice {invoice_id} deleted successfully."})
--- a/controllers/log_controller.py
+++ b/controllers/log_controller.py
@@ -21,7 +21,6 @@ def activity_log():
        end_date,
        user_name
    )
-
    return render_template(
        "activity_log.html",
        logs=filtered_logs,
--- a/controllers/payment_controller.py
+++ b/controllers/payment_controller.py
@@ -1,4 +1,4 @@
-from flask import Blueprint, render_template, request, redirect, url_for, jsonify
+from flask import Blueprint, render_template, request, redirect, url_for, jsonify, flash
 from flask_login import login_required, current_user
 from model.payment import Paymentmodel
 from model.Log import LogHelper
@@ -86,18 +86,16 @@ def edit_payment(payment_id):

    return render_template('edit_payment.html', payment_data=payment_data)

-
 # ------------------- Delete Payment -------------------
-@payment_bp.route('/delete_payment/<int:payment_id>', methods=['GET', 'POST'])
+@payment_bp.route('/delete_payment/<int:payment_id>', methods=['GET'])
@login_required
 def delete_payment(payment_id):
    success, pmc_no, invoice_no = Paymentmodel.delete_payment(payment_id)
+
    if not success:
-        return jsonify({"message": "Payment not found or failed to delete", "status": "error"}), 404
+        flash("Payment not found or failed to delete", "error")
+    else:
+        LogHelper.log_action("Delete Payment", f"User {current_user.id} deleted Payment '{payment_id}'")
+        flash(f"Payment ID {payment_id} deleted successfully.", "success")

-    LogHelper.log_action("Delete Payment", f"User {current_user.id} deleted Payment '{payment_id}'")
-
-    return jsonify({
-        "message": f"Payment ID {payment_id} deleted successfully.",
-        "status": "success"
-    }), 200
+    return redirect(url_for('payment_bp.add_payment'))
--- a/controllers/pmc_report_controller.py
+++ b/controllers/pmc_report_controller.py
@@ -1,9 +1,11 @@
 from flask import Blueprint, render_template, send_from_directory
-from flask_login import login_required, current_user
+from flask_login import login_required
+
 from model.PmcReport import PmcReport

 pmc_report_bp = Blueprint("pmc_report", __name__)

+# ---------------- Contractor Report by pmc no ----------------
@pmc_report_bp.route("/pmc_report/<pmc_no>")
@login_required
 def pmc_report(pmc_no):
@@ -23,6 +25,7 @@ def pmc_report(pmc_no):
        total=data["total"]
    )

+# ---------------- Contractor Download Report by pmc no ----------------
@pmc_report_bp.route("/download_pmc_report/<pmc_no>")
@login_required
 def download_pmc_report(pmc_no):
--- a/controllers/report_controller.py
+++ b/controllers/report_controller.py
@@ -1,13 +1,8 @@
-from flask import Blueprint, render_template, request, jsonify, send_file
+from flask import Blueprint, render_template, request, jsonify
 from flask_login import login_required, current_user
+
 from model.Report import ReportHelper
 from model.Log import LogHelper
-import config
-import os
-import openpyxl
-from openpyxl.styles import Font
-from model.ContractorInfo import ContractorInfo
-from model.FolderAndFile import FolderAndFile


 report_bp = Blueprint("report", __name__)
@@ -36,7 +31,7 @@ def search_contractor():

    return jsonify(data)

-# ---------------- Contractor Report ----------------
+# ---------------- Contractor Report by contractor id ----------------
@report_bp.route('/contractor_report/<int:contractor_id>')
@login_required
 def contractor_report(contractor_id):
@@ -49,145 +44,10 @@ def contractor_report(contractor_id):
        **data
    )

+# ---------------- Contractor Download Report by contractor id ----------------
@report_bp.route('/download_report/<int:contractor_id>')
@login_required
 def download_report(contractor_id):

    return ReportHelper().download_report(contractor_id=contractor_id)
-  
-    
-
-
-# @report_bp.route('/download_report/<int:contractor_id>')
-# @login_required
-# def download_report(contractor_id):
-#     try:
-#         connection = config.get_db_connection()
-#         cursor = connection.cursor(dictionary=True)
-
-#         # -------- Contractor Info --------
-#         contractor = ContractorInfo(contractor_id)
-#         contInfo = contractor.contInfo
-
-#         if not contInfo:
-#             return "No contractor found", 404
-
-#         # -------- Invoice Data --------
-#         cursor.callproc('FetchInvoicesByContractor', [contractor_id])
-
-#         invoices = []
-#         for result in cursor.stored_results():
-#             invoices.extend(result.fetchall())
-
-#         if not invoices:
-#             return "No invoice data found"
-
-#         # -------- Create Workbook --------
-#         workbook = openpyxl.Workbook()
-#         sheet = workbook.active
-#         sheet.title = "Contractor Report"
-
-#         # ================= CONTRACTOR DETAILS =================
-#         sheet.append(["SUB CONTRACTOR DETAILS"])
-#         sheet.cell(row=sheet.max_row, column=1).font = Font(bold=True)
-#         sheet.append([])
-
-#         sheet.append(["Name", contInfo.get("Contractor_Name") or ""])
-#         sheet.append(["Mobile No", contInfo.get("Mobile_No") or ""])
-#         sheet.append(["Email", contInfo.get("Email") or ""])
-#         sheet.append(["Village", contInfo.get("Village_Name") or ""])
-#         sheet.append(["Block", contInfo.get("Block_Name") or ""])
-#         sheet.append(["District", contInfo.get("District_Name") or ""])
-#         sheet.append(["State", contInfo.get("State_Name") or ""])
-#         sheet.append(["Address", contInfo.get("Address") or ""])
-#         sheet.append(["GST No", contInfo.get("GST_No") or ""])
-#         sheet.append(["PAN No", contInfo.get("PAN_No") or ""])
-#         sheet.append([])
-#         sheet.append([])
-
-#         # ================= TABLE HEADERS =================
-#         headers = [
-#             "PMC No", "Village", "Invoice No", "Invoice Date", "Work Type","Invoice_Details",
-#             "Basic Amount", "Debit Amount", "After Debit Amount",
-#             "Amount", "GST Amount", "TDS Amount", "SD Amount",
-#             "On Commission", "Hydro Testing", "Hold Amount",
-#             "GST SD Amount", "Final Amount",
-#             "Payment Amount", "TDS Payment",
-#             "Total Amount", "UTR"
-#         ]
-#         sheet.append(headers)
-#         for col in range(1, len(headers) + 1):
-#             sheet.cell(row=sheet.max_row, column=col).font = Font(bold=True)
-
-#         # ================= DATA =================
-#         total_final = 0
-#         total_payment = 0
-#         total_amount = 0
-
-#         for inv in invoices:
-#             row = [
-#                 inv.get("PMC_No"),
-#                 inv.get("Village_Name"),
-#                 inv.get("invoice_no"),
-#                 inv.get("Invoice_Date"),
-#                 inv.get("Work_Type"),
-#                 inv.get("Invoice_Details"),
-#                 inv.get("Basic_Amount"),
-#                 inv.get("Debit_Amount"),
-#                 inv.get("After_Debit_Amount"),
-#                 inv.get("Amount"),
-#                 inv.get("GST_Amount"),
-#                 inv.get("TDS_Amount"),
-#                 inv.get("SD_Amount"),
-#                 inv.get("On_Commission"),
-#                 inv.get("Hydro_Testing"),
-#                 inv.get("Hold_Amount"),
-#                 inv.get("GST_SD_Amount"),
-#                 inv.get("Final_Amount"),
-#                 inv.get("Payment_Amount"),
-#                 inv.get("TDS_Payment_Amount"),
-#                 inv.get("Total_Amount"),
-#                 inv.get("UTR")
-#             ]
-
-#             total_final += float(inv.get("Final_Amount") or 0)
-#             total_payment += float(inv.get("Payment_Amount") or 0)
-#             total_amount += float(inv.get("Total_Amount") or 0)
-
-#             sheet.append(row)
-
-#         # ================= TOTAL ROW =================
-#         sheet.append([])
-#         sheet.append([
-#             "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
-#             "TOTAL",
-#             total_final,
-#             total_payment,
-#             "",
-#             total_amount,
-#             ""
-#         ])
-
-#         # ================= AUTO WIDTH =================
-#         for column in sheet.columns:
-#             max_length = 0
-#             column_letter = column[0].column_letter
-#             for cell in column:
-#                 if cell.value:
-#                     max_length = max(max_length, len(str(cell.value)))
-#             sheet.column_dimensions[column_letter].width = max_length + 2
-
-#         # ================= SAVE FILE =================
-#         # output_folder = "downloads"
-#         # os.makedirs(output_folder, exist_ok=True)
-#         # filename = f"Contractor_Report_{contInfo.get('Contractor_Name')}.xlsx"
-#         # output_file = os.path.join(output_folder, filename)
-
-#         filename = f"Contractor_Report_{contInfo.get('Contractor_Name')}.xlsx"
-#         output_file = FolderAndFile.get_download_path(filename)
-#         workbook.save(output_file)
-
-#         return send_file(output_file, as_attachment=True)
-
-#     except Exception as e:
-#         return str(e)
+  
--- a/controllers/state_controller.py
+++ b/controllers/state_controller.py
@@ -4,7 +4,7 @@ from model.State import State

 state_bp = Blueprint('state', __name__)

-
+# ----- State page ------
@state_bp.route('/add_state', methods=['GET', 'POST'])
@login_required
 def add_state():
@@ -19,7 +19,7 @@ def add_state():

    return render_template('add_state.html', statedata=statedata)

-
+# ----- State check ------
@state_bp.route('/check_state', methods=['POST'])
@login_required
 def check_state():
@@ -28,21 +28,21 @@ def check_state():

    return state.CheckState(request=request)

-
+# ----- State delete by state id ------
@state_bp.route('/delete_state/<int:id>')
@login_required
 def deleteState(id):

    state = State()

-    msg = state.DeleteState(request=request, id=id)
+    state.DeleteState(request=request, id=id)

    if not state.isSuccess:
        return state.resultMessage
    else:
        return redirect(url_for('state.add_state'))

-
+# ----- State update by state id ------
@state_bp.route('/edit_state/<int:id>', methods=['GET', 'POST'])
@login_required
 def editState(id):
--- a/controllers/subcontractor_controller.py
+++ b/controllers/subcontractor_controller.py
@@ -1,34 +1,11 @@
 from flask import Blueprint, render_template, request, redirect, url_for, jsonify
 from flask_login import login_required
 from model.Subcontractor import Subcontractor
+from model.Utilities import HtmlHelper, ResponseHandler
+

 subcontractor_bp = Blueprint('subcontractor', __name__)

-# ----------------------------------------------------------
-# Helpers (unchanged)
-# ----------------------------------------------------------
-class HtmlHelper:
-    @staticmethod
-    def json_response(data, status=200):
-        return jsonify(data), status
-
-class ResponseHandler:
-    @staticmethod
-    def fetch_failure(entity):
-        return {"status": "error", "message": f"Failed to fetch {entity}"}
-
-    @staticmethod
-    def add_failure(entity):
-        return {"status": "error", "message": f"Failed to add {entity}"}
-
-    @staticmethod
-    def update_failure(entity):
-        return {"status": "error", "message": f"Failed to update {entity}"}
-
-    @staticmethod
-    def delete_failure(entity):
-        return {"status": "error", "message": f"Failed to delete {entity}"}
-

 # ----------------------------------------------------------
 # LIST + ADD
--- a/controllers/village_controller.py
+++ b/controllers/village_controller.py
@@ -1,8 +1,11 @@
+
+
+
+
 from flask import Blueprint, render_template, request, redirect, url_for, flash, jsonify
 from flask_login import login_required

 import config
-
 from model.Village import Village
 from model.State import State

@@ -16,14 +19,13 @@ village_bp = Blueprint('village', __name__)
 def add_village():

    village = Village()
-
+ 
    if request.method == 'POST':
        village.AddVillage(request=request)
        return village.resultMessage

    state = State()
    states = state.GetAllStates(request=request)
-
    villages = village.GetAllVillages(request=request)

    return render_template(
@@ -42,7 +44,6 @@ def get_districts(state_id):
    cursor = connection.cursor()

    cursor.callproc("GetDistrictByStateID", [state_id])
-
    districts = []

    for rs in cursor.stored_results():
@@ -51,15 +52,7 @@ def get_districts(state_id):
    cursor.close()
    connection.close()

-    district_list = []
-
-    for d in districts:
-        district_list.append({
-            "id": d[0],
-            "name": d[1]
-        })
-
-    return jsonify(district_list)
+    return jsonify([{"id": d[0], "name": d[1]} for d in districts])


 # ------------------------- Fetch Blocks -------------------------
@@ -71,7 +64,6 @@ def get_blocks(district_id):
    cursor = connection.cursor()

    cursor.callproc("GetBlocksByDistrictID", [district_id])
-
    blocks = []

    for rs in cursor.stored_results():
@@ -80,42 +72,40 @@ def get_blocks(district_id):
    cursor.close()
    connection.close()

-    block_list = []
-
-    for b in blocks:
-        block_list.append({
-            "id": b[0],
-            "name": b[1]
-        })
-
-    return jsonify(block_list)
+    return jsonify([{"id": b[0], "name": b[1]} for b in blocks])


 # ------------------------- Check Village -------------------------
@village_bp.route('/check_village', methods=['POST'])
@login_required
 def check_village():
-
    village = Village()
    return village.CheckVillage(request=request)


-# ------------------------- Delete Village -------------------------
@village_bp.route('/delete_village/<int:village_id>')
@login_required
 def delete_village(village_id):
-
    village = Village()
-
    village.DeleteVillage(request=request, village_id=village_id)

-    if not village.isSuccess:
-        flash(village.resultMessage, "error")
+    # ✅ Convert resultMessage to string if it's a Response or tuple
+    raw_msg = village.resultMessage
+
+    if isinstance(raw_msg, tuple):
+        # e.g., (<Response ...>, 200)
+        msg = "Village deleted successfully!"
+    elif hasattr(raw_msg, 'get_data'):
+        # Flask Response object
+        msg = raw_msg.get_data(as_text=True)  # get raw text
    else:
-        flash(village.resultMessage, "success")
-
-    return redirect(url_for('village.add_village'))
+        # fallback
+        msg = str(raw_msg) if raw_msg else "Village deleted successfully!"

+    return jsonify({
+        "status": "success" if village.isSuccess else "error",
+        "message": msg
+    })

 # ------------------------- Edit Village -------------------------
@village_bp.route('/edit_village/<int:village_id>', methods=['GET', 'POST'])
@@ -135,8 +125,8 @@ def edit_village(village_id):
        else:
            flash(village.resultMessage, "error")

-            village_data = village.GetVillageByID(request=request, id=village_id)
-            blocks = village.GetAllBlocks(request=request)
+            village_data = village.GetVillageByID(id=village_id) or []
+            blocks = village.GetAllBlocks() or []

            return render_template(
                'edit_village.html',
@@ -145,23 +135,17 @@ def edit_village(village_id):
            )

    else:
-
-        village_data = village.GetVillageByID(request=request, id=village_id)
+        # ✅ FIXED HERE (removed request)
+        village_data = village.GetVillageByID(id=village_id)

        if not village.isSuccess:
            flash(village.resultMessage, "error")
            return redirect(url_for('village.add_village'))

-        blocks = village.GetAllBlocks(request=request)
-
-        if village_data is None:
-            village_data = []
-
-        if blocks is None:
-            blocks = []
+        blocks = village.GetAllBlocks() or []

        return render_template(
            'edit_village.html',
-            village_data=village_data,
+            village_data=village_data or [],
            blocks=blocks
        )
--- a/model/Block.py
+++ b/model/Block.py
@@ -1,8 +1,4 @@
-from flask import Flask, render_template, request, redirect, url_for, send_from_directory, flash, jsonify, json
-from flask import current_app
-
-from datetime import datetime
-from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
+from flask import Blueprint, render_template, request, redirect, url_for, jsonify

 from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
 from model.Log import LogData, LogHelper
@@ -151,7 +147,7 @@ class Block:

        self.isSuccess = block.isSuccess
        self.resultMessage = block.resultMessage
-        return render_template('add_block.html')
+        return 
  
    # ----------------------------------------------------------
    # Delete Block
--- a/model/ContractorInfo.py
+++ b/model/ContractorInfo.py
@@ -1,72 +1,65 @@
-import mysql.connector
+
+
+
 from mysql.connector import Error
 import config
-import openpyxl
-import os
-import re
-import ast
 from datetime import datetime


 class ContractorInfo:
-    ID = ""
-    contInfo = None
-    def __init__(self, id):
-        self.ID = id
-        print(id)
+    def __init__(self, contractor_id):
+        self.ID = contractor_id
+        self.contInfo = None
        self.fetchData()

    def fetchData(self):
+        """Fetch basic contractor info by ID."""
        try:
            connection = config.get_db_connection()
-            cursor = connection.cursor(dictionary=True, buffered=True)        
-            cursor.callproc('GetContractorInfoById', [self.ID])
-            for result in cursor.stored_results():
-                self.contInfo = result.fetchone() 
-            
-            print(self.contInfo,flush=True)
+            with connection.cursor(dictionary=True, buffered=True) as cursor:
+                cursor.callproc('GetContractorInfoById', [self.ID])
+                # Get the first result set
+                for result in cursor.stored_results():
+                    self.contInfo = result.fetchone()
+        except Error as e:
+            print(f"Error fetching contractor info: {e}")
        finally:
-            cursor.close()
-            connection.close()
+            if connection.is_connected():
+                connection.close()

    def fetchalldata(self):
-
+        """Fetch hold types and invoices for contractor."""
+        data = {}
        try:
            connection = config.get_db_connection()
-            cursor = connection.cursor(dictionary=True, buffered=True)
-            print("here", flush=True)
-            
+            with connection.cursor(dictionary=True, buffered=True) as cursor:
+                # Fetch Hold Types
+                cursor.callproc('GetHoldTypesByContractor', [self.ID])
+                hold_types = []
+                for result in cursor.stored_results():
+                    hold_types = result.fetchall()
+                hold_type_map = {ht['hold_type_id']: ht['hold_type'] for ht in hold_types}
+                data['hold_types'] = hold_type_map

-               # ---------------- Hold Types ----------------
-            cursor = connection.cursor(dictionary=True)
+                # Fetch Invoices
+                cursor.callproc('GetInvoicesByContractor', [self.ID])
+                invoices = []
+                for result in cursor.stored_results():
+                    invoices = result.fetchall()

-            cursor.callproc('GetHoldTypesByContractor', [self.ID])
-
-            hold_types = []
-            for result in cursor.stored_results():
-                hold_types = result.fetchall()
-            hold_type_map = {ht['hold_type_id']: ht['hold_type'] for ht in hold_types}
-
-            # ---------------- Invoices ----------------
-            cursor = connection.cursor(dictionary=True)
-
-            cursor.callproc('GetInvoicesByContractor', [self.ID])
-
-            invoices = []
-            for result in cursor.stored_results():
-                invoices = result.fetchall()
-
-            # Remove duplicate invoices
-            invoice_ids_seen = set()
-            unique_invoices = []
-            for inv in invoices:
-                if inv["Invoice_Id"] not in invoice_ids_seen:
-                    invoice_ids_seen.add(inv["Invoice_Id"])
-                    unique_invoices.append(inv)
-            invoices = unique_invoices
+                # Remove duplicate invoices
+                seen_ids = set()
+                unique_invoices = []
+                for inv in invoices:
+                    if inv['Invoice_Id'] not in seen_ids:
+                        seen_ids.add(inv['Invoice_Id'])
+                        unique_invoices.append(inv)
+                data['invoices'] = unique_invoices

+        except Error as e:
+            print(f"Error fetching contractor data: {e}")
        finally:
-            cursor.close()
-            connection.close()
+            if connection.is_connected():
+                connection.close()

- 
+        return data
--- a/model/District.py
+++ b/model/District.py
@@ -1,20 +1,6 @@
-from flask import Flask, render_template, request, redirect, url_for, send_from_directory, flash, jsonify, json
-from flask import current_app
-
-from datetime import datetime
-from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
-
-from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
-from model.Log import LogData, LogHelper
-
-import os
-import config
-import re
-
-import mysql.connector
-from mysql.connector import Error
-
+from model.Utilities import ItemCRUDType
 from model.ItemCRUD import ItemCRUD
+
 class District:

    isSuccess = False
@@ -24,7 +10,7 @@ class District:
        self.isSuccess = False
        self.resultMessage = ""

-
+    # edit district 
    def EditDistrict(self, request, district_id):
        district = ItemCRUD(itemType=ItemCRUDType.District)

@@ -36,7 +22,7 @@ class District:
        self.resultMessage = district.resultMessage
        return
            
-
+    # add district
    def AddDistrict(self, request): 

       district = ItemCRUD(ItemCRUDType.District)
@@ -50,7 +36,7 @@ class District:
       return
 
 
-
+    # get all district data
    def GetAllDistricts(self, request):
        district = ItemCRUD(itemType=ItemCRUDType.District)
        districtsdata = district.GetAllData(request=request, storedproc="GetAllDistricts")
@@ -58,7 +44,7 @@ class District:
        self.resultMessage = district.resultMessage
        return districtsdata

-
+    # check district validation
    def CheckDistrict(self, request):
        district = ItemCRUD(itemType=ItemCRUDType.District)
        district_name = request.json.get('district_Name', '').strip()
@@ -68,13 +54,7 @@ class District:
        self.resultMessage = district.resultMessage
        return result

-
-    # def GetDistrictByID(self, request,district_id):
-    #     district = ItemCRUD(itemType=ItemCRUDType.District)
-    #     districtdata = district.GetAllData(id=district_id,storedproc="GetDistrictDataByID")
-    #     self.isSuccess = district.isSuccess
-    #     self.resultMessage = district.resultMessage
-    #     return districtdata
+    # get district by district id
    def GetDistrictByID(self, request, district_id):
        district = ItemCRUD(itemType=ItemCRUDType.District)

@@ -92,7 +72,7 @@ class District:
        return districtdata
        

-#Delete District
+    # Delete District by district id
    def DeleteDistrict(self, request, district_id):
        district = ItemCRUD(itemType=ItemCRUDType.District)
        district.DeleteItem(request=request,itemID=district_id,storedprocDelete="DeleteDistrict")
--- a/model/FolderAndFile.py
+++ b/model/FolderAndFile.py
@@ -27,13 +27,27 @@ class FolderAndFile:
        os.makedirs(folder, exist_ok=True)
        return folder

-    # -----------------------------
-    # FILE PATH METHODS
-    # -----------------------------
+    @staticmethod
+    def get_logs_folder():
+        folder = os.path.join(current_app.root_path, "logs")
+
+        if not os.path.exists(folder):
+            os.makedirs(folder)
+
+        os.makedirs(folder, exist_ok=True)
+        return folder
+    
+    # FILE PATH METHODS - download
    @staticmethod
    def get_download_path(filename):
        return os.path.join(FolderAndFile.get_download_folder(), filename)
-
+    
+    # FILE PATH METHODS - upload file
    @staticmethod
    def get_upload_path(filename):
-        return os.path.join(FolderAndFile.get_upload_folder(), filename)
+        return os.path.join(FolderAndFile.get_upload_folder(), filename)
+    
+    # FILE PATH METHODS - activity log file
+    @staticmethod
+    def get_activity_log_path(filename):
+        return os.path.join(FolderAndFile.get_logs_folder(), filename)
--- a/model/GST.py
+++ b/model/GST.py
@@ -1,55 +1,51 @@
-import config
+from model.ItemCRUD import ItemCRUD
+from model.Utilities import ItemCRUDType

 class GST:

    @staticmethod
    def get_unreleased_gst():
+        # Use ItemCRUD for Invoices
+        invoice_crud = ItemCRUD(itemType=ItemCRUDType.Invoice)
+        invoices_rows = invoice_crud.GetAllData(storedproc="GetAllInvoicesBasic")

-        connection = config.get_db_connection()
-        cursor = connection.cursor(dictionary=True)
+        if not invoice_crud.isSuccess:
+            return []  # Could also log invoice_crud.resultMessage

-        try:
-            # ----------- Invoices -----------
-            cursor.callproc('GetAllInvoicesBasic')
-            invoices = []
-            for result in cursor.stored_results():
-                invoices = result.fetchall()
+        invoices = [
+            dict(
+                Invoice_No=row[1],
+                GST_SD_Amount=float(row[2]) if row[2] is not None else 0
+            )
+            for row in invoices_rows
+        ]

+        # Use ItemCRUD for GST Releases
+        gst_crud = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+        gst_rows = gst_crud.GetAllData(storedproc="GetAllGSTReleasesBasic")

-            # ----------- GST Releases -----------
-            cursor.callproc('GetAllGSTReleasesBasic')
-            gst_releases = []
-            for result in cursor.stored_results():
-                gst_releases = result.fetchall()
+        if not gst_crud.isSuccess:
+            return []  # Could also log gst_crud.resultMessage

-            gst_invoice_nos = {
-                g['Invoice_No']
-                for g in gst_releases
-                if g['Invoice_No']
-            }
+        gst_invoice_nos = {
+            g[2]  # Invoice_No is at index 2
+            for g in gst_rows
+            if g[2]
+        }

-            gst_basic_amounts = {
-                float(g['Basic_Amount'])
-                for g in gst_releases
-                if g['Basic_Amount'] is not None
-            }
+        gst_basic_amounts = {
+            float(g[3])  # Basic_Amount at index 3
+            for g in gst_rows
+            if g[3] is not None
+        }

-            unreleased = []
+        # Filter unreleased invoices
+        unreleased = []
+        for inv in invoices:
+            match_by_invoice = inv['Invoice_No'] in gst_invoice_nos
+            match_by_gst_amount = inv['GST_SD_Amount'] in gst_basic_amounts

-            for inv in invoices:
+            if not (match_by_invoice or match_by_gst_amount):
+                unreleased.append(inv)

-                match_by_invoice = inv['Invoice_No'] in gst_invoice_nos
-
-                match_by_gst_amount = float(
-                    inv.get('GST_SD_Amount') or 0
-                ) in gst_basic_amounts
-
-                if not (match_by_invoice or match_by_gst_amount):
-                    unreleased.append(inv)
-
-            return unreleased
-
-        finally:
-            cursor.close()
-            connection.close()
-            
+        return unreleased
--- a/model/Invoice.py
+++ b/model/Invoice.py
@@ -1,35 +1,76 @@
+
 import config
 import mysql.connector

-# ------------------- Helper -------------------
+# ------------------- Helper Functions -------------------
 def clear_results(cursor):
+    """Consume all stored results to prevent cursor issues."""
    for r in cursor.stored_results():
        r.fetchall()

+def fetch_one(cursor):
+    """Fetch first row from stored results."""
+    for result in cursor.stored_results():
+        return result.fetchone()
+    return None

-# ------------------- Get Village Id -------------------
-def get_village_id(village_name):
+def fetch_all(cursor):
+    """Fetch all rows from stored results."""
+    data = []
+    for result in cursor.stored_results():
+        data.extend(result.fetchall())
+    return data
+
+def get_numeric_values(data):
+    """Return numeric fields for invoices safely."""
+    return [
+        float(data.get('basic_amount') or 0),
+        float(data.get('debit_amount') or 0),
+        float(data.get('after_debit_amount') or 0),
+        float(data.get('amount') or 0),
+        float(data.get('gst_amount') or 0),
+        float(data.get('tds_amount') or 0),
+        float(data.get('sd_amount') or 0),
+        float(data.get('on_commission') or 0),
+        float(data.get('hydro_testing') or 0),
+        float(data.get('gst_sd_amount') or 0),
+        float(data.get('final_amount') or 0),
+    ]
+
+def execute_db_operation(operation_func):
+    """General DB operation wrapper with commit/rollback."""
    connection = config.get_db_connection()
    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc("GetVillageIdByName", (village_name,))
-    village_result = None
-
-    for rs in cursor.stored_results():
-        village_result = rs.fetchone()
-
-    cursor.close()
-    connection.close()
-    return village_result
-
-
-# ------------------- Insert Invoice -------------------
-def insert_invoice(data, village_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
    try:
-        # 1. Insert Invoice
+        result = operation_func(cursor)
+        connection.commit()
+        return result
+    except Exception:
+        connection.rollback()
+        raise
+    finally:
+        cursor.close()
+        connection.close()
+
+
+# ------------------- Village Functions -------------------
+def get_village_id(village_name):
+    def operation(cursor):
+        cursor.callproc("GetVillageIdByName", (village_name,))
+        return fetch_one(cursor)
+    return execute_db_operation(operation)
+
+def get_all_villages():
+    def operation(cursor):
+        cursor.callproc("GetAllVillages")
+        return fetch_all(cursor)
+    return execute_db_operation(operation)
+
+ 
+# ------------------- Invoice Functions -------------------
+def insert_invoice(data, village_id):
+    def operation(cursor):
+        # Insert invoice
        cursor.callproc('InsertInvoice', [
            data.get('pmc_no'),
            village_id,
@@ -37,29 +78,14 @@ def insert_invoice(data, village_id):
            data.get('invoice_details'),
            data.get('invoice_date'),
            data.get('invoice_no'),
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0)
+            *get_numeric_values(data)
        ])
-
-        invoice_id = None
-        for result in cursor.stored_results():
-            row = result.fetchone()
-            if row:
-                invoice_id = row.get('invoice_id')
-
-        if not invoice_id:
+        invoice_row = fetch_one(cursor)
+        if not invoice_row:
            raise Exception("Invoice ID not returned")
+        invoice_id = invoice_row.get('invoice_id')

-        # 2. Insert Inpayment
+        # Insert inpayment
        cursor.callproc('InsertInpayment', [
            data.get('pmc_no'),
            village_id,
@@ -67,221 +93,41 @@ def insert_invoice(data, village_id):
            data.get('invoice_details'),
            data.get('invoice_date'),
            data.get('invoice_no'),
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0),
+            *get_numeric_values(data),
            data.get('subcontractor_id')
        ])
        clear_results(cursor)
-
-        connection.commit()
        return invoice_id

-    except Exception as e:
-        connection.rollback()
-        raise e
+    return execute_db_operation(operation)

-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Assign Subcontractor -------------------
-def assign_subcontractor(data, village_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        cursor.callproc('AssignSubcontractor', [
-            data.get('pmc_no'),
-            data.get('subcontractor_id'),
-            village_id
-        ])
-        clear_results(cursor)
-
-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Insert Hold Types -------------------
-def insert_hold_types(data, invoice_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        hold_types = data.getlist('hold_type[]')
-        hold_amounts = data.getlist('hold_amount[]')
-
-        for hold_type, hold_amount in zip(hold_types, hold_amounts):
-            if not hold_type:
-                continue
-
-            cursor.callproc('GetHoldTypeIdByName', [hold_type])
-            hold_type_result = None
-
-            for result in cursor.stored_results():
-                hold_type_result = result.fetchone()
-
-            if not hold_type_result:
-                cursor.callproc('InsertHoldType', [hold_type, 0])
-                cursor.execute("SELECT @_InsertHoldType_1")
-                hold_type_id = cursor.fetchone()[0]
-            else:
-                hold_type_id = hold_type_result['hold_type_id']
-
-            hold_amount = float(hold_amount or 0)
-
-            cursor.callproc('InsertInvoiceSubcontractorHold', [
-                data.get('subcontractor_id'),
-                invoice_id,
-                hold_type_id,
-                hold_amount
-            ])
-            clear_results(cursor)
-
-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Get All Invoices -------------------
 def get_all_invoice_details():
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
+    def operation(cursor):
+        cursor.callproc('GetAllInvoiceDetails')
+        return fetch_all(cursor)
+    return execute_db_operation(operation)

-    cursor.callproc('GetAllInvoiceDetails')
-    invoices = []
-
-    for result in cursor.stored_results():
-        invoices = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return invoices
-
-
-# ------------------- Get All Villages -------------------
-def get_all_villages():
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc("GetAllVillages")
-    villages = []
-
-    for result in cursor.stored_results():
-        villages = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return villages
-
-
-# ------------------- Search Contractors -------------------
-def search_contractors(sub_query):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc('SearchContractorsByName', [sub_query])
-    results = []
-
-    for result in cursor.stored_results():
-        results = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return results
-
-
-# ------------------- Get All Hold Types -------------------
-def get_all_hold_types():
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc("GetAllHoldTypes")
-    hold_types = []
-
-    for result in cursor.stored_results():
-        hold_types = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return hold_types
-
-
-# ------------------- Get Invoice By Id -------------------
 def get_invoice_by_id(invoice_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
+    def operation(cursor):
+        cursor.callproc('GetInvoiceDetailsById', [invoice_id])
+        invoice = fetch_one(cursor)

-    cursor.callproc('GetInvoiceDetailsById', [invoice_id])
-    invoice = None
+        cursor.callproc('GetHoldAmountsByInvoiceId', [invoice_id])
+        hold_amounts = fetch_all(cursor)

-    for result in cursor.stored_results():
-        invoice = result.fetchone()
+        if invoice:
+            invoice["hold_amounts"] = hold_amounts
+        return invoice
+    return execute_db_operation(operation)

-    cursor.callproc('GetHoldAmountsByInvoiceId', [invoice_id])
-    hold_amounts = []
-
-    for result in cursor.stored_results():
-        hold_amounts = result.fetchall()
-
-    if invoice:
-        invoice["hold_amounts"] = hold_amounts
-
-    cursor.close()
-    connection.close()
-    return invoice
-
-
-# ------------------- Update Invoice -------------------
 def update_invoice(data, invoice_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
+    def operation(cursor):
        cursor.callproc("GetVillageIdByName", (data.get('village'),))
-        village = None
-
-        for rs in cursor.stored_results():
-            village = rs.fetchone()
-
+        village = fetch_one(cursor)
+        if not village:
+            raise Exception("Village not found")
        village_id = village['Village_Id']

-        numeric = [
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0),
-        ]
-
        cursor.callproc('UpdateInvoice', [
            data.get('pmc_no'),
            village_id,
@@ -289,91 +135,101 @@ def update_invoice(data, invoice_id):
            data.get('invoice_details'),
            data.get('invoice_date'),
            data.get('invoice_no'),
-            *numeric,
+            *get_numeric_values(data),
            invoice_id
        ])
        clear_results(cursor)
+    execute_db_operation(operation)

-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Update Inpayment -------------------
 def update_inpayment(data):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        numeric = [
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0),
-        ]
-
+    def operation(cursor):
        cursor.callproc('UpdateInpayment', [
            data.get('work_type'),
            data.get('invoice_details'),
            data.get('invoice_date'),
-            *numeric,
+            *get_numeric_values(data),
            data.get('pmc_no'),
            data.get('invoice_no')
        ])
        clear_results(cursor)
+    execute_db_operation(operation)

-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Delete Invoice -------------------
 def delete_invoice_data(invoice_id, user_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        cursor.callproc('GetInvoicePMCById', [invoice_id])
-
+    def operation(cursor):
+        # Fetch PMC and Invoice_No from DB
+        cursor.callproc('GetInvoicePMCById', (invoice_id,))
        record = {}
        for result in cursor.stored_results():
            record = result.fetchone() or {}
        if not record:
            raise Exception("Invoice not found")

+        # Use exact DB keys
+        pmc_no = record['PMC_No']
+        invoice_no = record['Invoice_No']
+
+        # Delete invoice
        cursor.callproc("DeleteInvoice", (invoice_id,))
        clear_results(cursor)

-        cursor.callproc(
-            'DeleteInpaymentByPMCInvoice',
-            [record['PMC_No'], record['invoice_no']]
-        )
+        # Delete inpayment
+        cursor.callproc('DeleteInpaymentByPMCInvoice', (pmc_no, invoice_no))
+        clear_results(cursor)

-        connection.commit()
+    execute_db_operation(operation)

-    except Exception as e:
-        connection.rollback()
-        raise e

-    finally:
-        cursor.close()
-        connection.close()
+# ------------------- Subcontractor Functions -------------------
+def assign_subcontractor(data, village_id):
+    def operation(cursor):
+        cursor.callproc('AssignSubcontractor', [
+            data.get('pmc_no'),
+            data.get('subcontractor_id'),
+            village_id
+        ])
+        clear_results(cursor)
+    execute_db_operation(operation)
+
+
+# ------------------- Hold Types Functions -------------------
+def insert_hold_types(data, invoice_id):
+    def operation(cursor):
+        hold_types = data.getlist('hold_type[]')
+        hold_amounts = data.getlist('hold_amount[]')
+
+        for hold_type, hold_amount in zip(hold_types, hold_amounts):
+            if not hold_type:
+                continue
+
+            cursor.callproc('GetHoldTypeIdByName', [hold_type])
+            hold_type_result = fetch_one(cursor)
+
+            if not hold_type_result:
+                cursor.callproc('InsertHoldType', [hold_type, 0])
+                cursor.execute("SELECT @_InsertHoldType_1")
+                hold_type_id = cursor.fetchone()[0]
+            else:
+                hold_type_id = hold_type_result['hold_type_id']
+
+            cursor.callproc('InsertInvoiceSubcontractorHold', [
+                data.get('subcontractor_id'),
+                invoice_id,
+                hold_type_id,
+                float(hold_amount or 0)
+            ])
+            clear_results(cursor)
+    execute_db_operation(operation)
+
+def get_all_hold_types():
+    def operation(cursor):
+        cursor.callproc("GetAllHoldTypes")
+        return fetch_all(cursor)
+    return execute_db_operation(operation)
+
+
+# ------------------- Contractor Functions -------------------
+def search_contractors(sub_query):
+    def operation(cursor):
+        cursor.callproc('SearchContractorsByName', [sub_query])
+        return fetch_all(cursor)
+    return execute_db_operation(operation)
--- a/model/ItemCRUD.py
+++ b/model/ItemCRUD.py
@@ -6,7 +6,6 @@ import config
 import re
 import mysql.connector

-
 # ----------------------------------------------------------
 # Mapping Class
 # ----------------------------------------------------------
@@ -23,10 +22,11 @@ class itemCRUDMapping:
            self.name = "Hold Type"
        elif itemType is ItemCRUDType.Subcontractor:
            self.name = "Subcontractor"
+        elif itemType.name == "GSTRelease":
+            self.name = "GSTRelease"
        else:
            self.name = "Item"

-
 # ----------------------------------------------------------
 # Generic CRUD Class
 # ----------------------------------------------------------
@@ -93,13 +93,47 @@ class ItemCRUD:

        try:
            # ======================================================
-            # SUBCONTRACTOR (MULTI-FIELD)
+            # GSTRelease MULTI-FIELD
            # ======================================================
-            if data:
+            if self.itemCRUDType.name == "GSTRelease" and data:
+
+                # Duplicate check (PMC_No + Invoice_No)
+                if storedprocfetch:
+                    cursor.callproc(storedprocfetch, (data['PMC_No'], data['Invoice_No']))
+                    existing_item = None
+                    for rs in cursor.stored_results():
+                        existing_item = rs.fetchone()
+                    if existing_item:
+                        self.isSuccess = False
+                        self.resultMessage = HtmlHelper.json_response(
+                            ResponseHandler.already_exists(self.itemCRUDMapping.name), 409
+                        )
+                        return
+
+                # Insert GSTRelease
+                cursor.callproc(storedprocadd, (
+                    data['PMC_No'],
+                    data['Invoice_No'],
+                    data['Basic_Amount'],
+                    data['Final_Amount'],
+                    data['Total_Amount'],
+                    data['UTR'],
+                    data['Contractor_ID']
+                ))
+                connection.commit()
+
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.add_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # SUBCONTRACTOR MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "Subcontractor" and data:

-                # Duplicate check
                cursor.callproc(storedprocfetch, (data['Contractor_Name'],))
-
                existing_item = None
                for rs in cursor.stored_results():
                    existing_item = rs.fetchone()
@@ -111,7 +145,6 @@ class ItemCRUD:
                    )
                    return

-                # Insert
                cursor.callproc(storedprocadd, (
                    data['Contractor_Name'],
                    data['Address'],
@@ -123,26 +156,24 @@ class ItemCRUD:
                    data['GST_No'],
                    data['Contractor_password']
                ))
-
                connection.commit()
-
                self.isSuccess = True
                self.resultMessage = HtmlHelper.json_response(
                    ResponseHandler.add_success(self.itemCRUDMapping.name), 200
                )
                return
+            

            # ======================================================
-            # NORMAL (Village / Block / State)
+            # NORMAL SINGLE-FIELD (Village / Block / State)
            # ======================================================
-            if not re.match(RegEx.patternAlphabetOnly, childname):
+            if not re.match(RegEx.allPattern, childname):
                self.isSuccess = False
                self.resultMessage = HtmlHelper.json_response(
                    ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
                )
                return

-            # Duplicate check
            if parentid is None:
                cursor.callproc(storedprocfetch, (childname,))
            else:
@@ -159,17 +190,14 @@ class ItemCRUD:
                )
                return

-            # Insert
            if parentid is None:
                cursor.callproc(storedprocadd, (childname,))
            else:
                cursor.callproc(storedprocadd, (childname, parentid))

            connection.commit()
-
            self.isSuccess = True
            self.resultMessage = HtmlHelper.json_response(
-              
                ResponseHandler.add_success(self.itemCRUDMapping.name), 200
            )

@@ -199,9 +227,32 @@ class ItemCRUD:

        try:
            # ======================================================
-            # SUBCONTRACTOR (MULTI-FIELD)
+            # GSTRelease MULTI-FIELD
            # ======================================================
-            if data:
+            if self.itemCRUDType.name == "GSTRelease" and data:
+
+                cursor.callproc(storedprocupdate, (
+                    data['p_pmc_no'],       # PMC_No
+                    data['p_invoice_no'],   # Invoice_No
+                    data['p_basic_amount'], # Basic_Amount
+                    data['p_final_amount'], # Final_Amount
+                    data['p_total_amount'], # Total_Amount
+                    data['p_utr'],          # UTR
+                    data['p_gst_release_id']# GST_Release_Id
+                ))
+                connection.commit()
+
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.update_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # SUBCONTRACTOR MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "Subcontractor" and data:
+
                cursor.callproc(storedprocupdate, (
                    childid,
                    data['Contractor_Name'],
@@ -214,9 +265,7 @@ class ItemCRUD:
                    data['GST_No'],
                    data['Contractor_password']
                ))
-
                connection.commit()
-
                self.isSuccess = True
                self.resultMessage = HtmlHelper.json_response(
                    ResponseHandler.update_success(self.itemCRUDMapping.name), 200
@@ -224,9 +273,9 @@ class ItemCRUD:
                return

            # ======================================================
-            # NORMAL
+            # NORMAL SINGLE-FIELD
            # ======================================================
-            if not re.match(RegEx.patternAlphabetOnly, childname):
+            if not re.match(RegEx.allPattern, childname):
                self.isSuccess = False
                self.resultMessage = ResponseHandler.update_failure(self.itemCRUDMapping.name)['message']
                return
@@ -237,7 +286,6 @@ class ItemCRUD:
                cursor.callproc(storedprocupdate, (childid, parentid, childname))

            connection.commit()
-
            self.isSuccess = True
            self.resultMessage = ResponseHandler.update_success(self.itemCRUDMapping.name)['message']

@@ -259,20 +307,15 @@ class ItemCRUD:

        data = []
        connection = config.get_db_connection()
-
        if not connection:
            return []

        cursor = connection.cursor()
-
        try:
            cursor.callproc(storedproc)
-
            for result in cursor.stored_results():
                data = result.fetchall()
-
            self.isSuccess = True
-
        except mysql.connector.Error as e:
            print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
            self.isSuccess = False
@@ -280,7 +323,6 @@ class ItemCRUD:
                ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
            )
            return []
-
        finally:
            cursor.close()
            connection.close()
@@ -298,13 +340,10 @@ class ItemCRUD:

        try:
            cursor.callproc(storedproc, (id,))
-
            for rs in cursor.stored_results():
                data = rs.fetchone()
-
        except mysql.connector.Error as e:
            print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
-
        finally:
            cursor.close()
            connection.close()
@@ -324,7 +363,7 @@ class ItemCRUD:
            f"User {current_user.id} checked '{childname}'"
        )

-        if not re.match(RegEx.patternAlphabetOnly, childname):
+        if not re.match(RegEx.allPattern, childname):
            return HtmlHelper.json_response(
                ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
            )
@@ -353,7 +392,6 @@ class ItemCRUD:
            return HtmlHelper.json_response(
                ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
            )
-
        finally:
            cursor.close()
            connection.close()
--- a/model/Log.py
+++ b/model/Log.py
@@ -1,10 +1,10 @@
-from flask import Flask, render_template, request, redirect, url_for, send_from_directory, flash, jsonify, json
+import os
 from flask import current_app
-
-from datetime import datetime
 from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user

-import os
+from datetime import datetime
+
+from model.FolderAndFile import FolderAndFile

 class LogHelper:
    @staticmethod
@@ -14,22 +14,24 @@ class LogHelper:
        logData.WriteLog(action, details="")

 class LogData:
-
    filepath = ""
    timestamp = None

    def __init__(self):
-        self.filepath = os.path.join(current_app.root_path, 'activity.log')
+        self.filepath = FolderAndFile.get_activity_log_path('activity.log')
        self.timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        self.user = LogData.get_current_user()

+
+    @staticmethod
+    def get_current_user():
        if hasattr(current_user, "cn") and current_user.cn:
-            self.user = current_user.cn
+            return current_user.cn
        elif hasattr(current_user, "username") and current_user.username:
-            self.user = current_user.username
+            return current_user.username
        elif hasattr(current_user, "sAMAccountName") and current_user.sAMAccountName:
-            self.user = current_user.sAMAccountName
-        else:
-            self.user = "Unknown"
+            return current_user.sAMAccountName
+        return "Unknown"

    def WriteLog(self, action, details=""):
        """Log user actions with timestamp, user, action, and details."""
@@ -42,7 +44,6 @@ class LogData:
                f"Details: {details}\n"
            )

-
    def GetActivitiesLog(self):
        logs = []

@@ -60,7 +61,6 @@ class LogData:
        return logs

    def GetFilteredActivitiesLog(self, startDate, endDate, userName):
-
        filtered_logs = self.GetActivitiesLog()

        # Date filter
@@ -69,17 +69,14 @@ class LogData:
                start_dt = datetime.strptime(startDate, "%Y-%m-%d") if startDate else datetime.min
                end_dt = datetime.strptime(endDate, "%Y-%m-%d") if endDate else datetime.max

-
                filtered_logs = [
                    log for log in filtered_logs
                    if start_dt <= datetime.strptime(log["timestamp"], "%Y-%m-%d %H:%M:%S") <= end_dt
                ]

-
            except Exception as e:
                print("Date filter error:", e)
-            #Why catching all exceptions? Need to handle specific exceptions
-
+            
        # Username filter
        if userName:
            filtered_logs = [log for log in filtered_logs if userName.lower() in log["user"].lower()]
--- a/model/State.py
+++ b/model/State.py
@@ -1,13 +1,9 @@
-from flask import request, redirect, url_for
-from flask_login import current_user
-
-from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
-from model.Log import LogHelper
-from model.ItemCRUD import ItemCRUD  
-
 import config
-import re
 import mysql.connector
+from flask import request, redirect, url_for
+
+from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
+from model.ItemCRUD import ItemCRUD  


 class State:
@@ -20,7 +16,6 @@ class State:
    # ADD STATE (USING ITEM CRUD)
    # ----------------------------------------------------------
    def AddState(self, request):
-
        state_name = request.form['state_Name'].strip()

        crud = ItemCRUD(ItemCRUDType.State)
@@ -42,16 +37,14 @@ class State:
    # GET ALL STATES (NO CHANGE - THIS IS CORRECT)
    # ----------------------------------------------------------
    def GetAllStates(self, request):
-
        connection = config.get_db_connection()
        data = []

        if not connection:
            return []

-        cursor = connection.cursor()
-
        try:
+            cursor = connection.cursor()
            cursor.callproc("GetAllStates")
            for res in cursor.stored_results():
                data = res.fetchall()
@@ -77,7 +70,6 @@ class State:
    # CHECK STATE (USING ITEM CRUD)
    # ----------------------------------------------------------
    def CheckState(self, request):
-
        state_name = request.json.get('state_Name', '').strip()

        crud = ItemCRUD(ItemCRUDType.State)
@@ -94,7 +86,6 @@ class State:
    # DELETE STATE (USING ITEM CRUD)
    # ----------------------------------------------------------
    def DeleteState(self, request, id):
-
        crud = ItemCRUD(ItemCRUDType.State)

        crud.DeleteItem(
@@ -113,7 +104,6 @@ class State:
    # EDIT STATE (USING ITEM CRUD)
    # ----------------------------------------------------------
    def EditState(self, request, id):
-
        state_name = request.form['state_Name'].strip()

        crud = ItemCRUD(ItemCRUDType.State)
@@ -136,16 +126,14 @@ class State:
    # GET STATE BY ID (KEEP SAME)
    # ----------------------------------------------------------
    def GetStateByID(self, request, id):
-
        connection = config.get_db_connection()
        data = None

        if not connection:
            return None

-        cursor = connection.cursor()
-
        try:
+            cursor = connection.cursor()
            cursor.callproc("GetStateByID", (id,))
            for res in cursor.stored_results():
                data = res.fetchone()
--- a/model/Utilities.py
+++ b/model/Utilities.py
@@ -8,10 +8,11 @@ class ItemCRUDType(Enum):
    State = 4
    HoldType = 5
    Subcontractor = 6
-    
+    GSTRelease = 7

 class RegEx:
    patternAlphabetOnly = "^[A-Za-z ]+$"
+    allPattern = "^(?!\s*$).+"


 class ResponseHandler:
@@ -62,5 +63,5 @@ class HtmlHelper:
    @staticmethod
    def json_response(message_obj, status_code):
        return jsonify(message_obj), status_code
-    #May need to refactor further
+  

--- a/model/Village.py
+++ b/model/Village.py
@@ -1,17 +1,11 @@

-from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
-
-from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
-from model.Log import LogData, LogHelper

+from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
 import config
-
 import mysql.connector
-from mysql.connector import Error
-
 from model.ItemCRUD import ItemCRUD

-
+ 
 class Village:
    isSuccess = False
    resultMessage = ""
@@ -19,103 +13,174 @@ class Village:
    def __init__(self):
        self.isSuccess = False
        self.resultMessage = ""
+        self.response = {}  # ✅ ADDED
+        self.village = ItemCRUD(itemType=ItemCRUDType.Village)
+
+    # 🔹 Helper: sync status
+    def _set_status(self, village):
+        self.isSuccess = village.isSuccess
+
+        # ✅ UPDATED (safe handling)
+        if hasattr(village, "response"):
+            self.response = village.response
+            self.resultMessage = village.response.get("message", "")
+        else:
+            self.resultMessage = village.resultMessage
+
+    # 🔹 Helper: get request data
+    def _get_form_data(self, request):
+        block_id = request.form.get('block_Id')
+        village_name = request.form.get('Village_Name', '').strip()
+        return block_id, village_name

    def AddVillage(self, request):
-       village = ItemCRUD(itemType=ItemCRUDType.Village)
+        block_id, village_name = self._get_form_data(request)

-       block_id = request.form.get('block_Id')
-       village_name = request.form.get('Village_Name', '').strip()
+        if not village_name:
+            self.response = ResponseHandler.invalid_name("village")  # ✅ UPDATED
+            self.resultMessage = self.response["message"]
+            self.isSuccess = False
+            return

-       village.AddItem(request=request, parentid=block_id, childname=village_name,  storedprocfetch="GetVillageByNameAndBlock", storedprocadd="SaveVillage" )
-       self.isSuccess = village.isSuccess
-       self.resultMessage = village.resultMessage
-       return
-       #self.isSuccess = False
+        try:
+            self.village.AddItem(
+                request=request,
+                parentid=block_id,
+                childname=village_name,
+                storedprocfetch="GetVillageByNameAndBlock",
+                storedprocadd="SaveVillage"
+            )
+            self._set_status(self.village)
+
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)

    def GetAllVillages(self, request):
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
-        villagesdata = village.GetAllData(request=request, storedproc="GetAllVillages")
-        self.isSuccess = village.isSuccess
-        self.resultMessage = village.resultMessage
-        return villagesdata

+        try:
+            villagesdata = self.village.GetAllData(
+                request=request,
+                storedproc="GetAllVillages"
+            )
+            self._set_status(self.village)
+            return villagesdata
+
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
+            return []

    def CheckVillage(self, request):
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
-        block_id = request.form.get('block_Id')
-        village_name = request.form.get('Village_Name', '').strip()
-        result = village.CheckItem(request=request, parentid=block_id, childname=village_name, storedprocfetch="GetVillageByNameAndBlocks")
-        self.isSuccess = village.isSuccess
-        self.resultMessage = village.resultMessage
-        return result
+        block_id, village_name = self._get_form_data(request)
+
+        if not village_name:
+            self.response = ResponseHandler.invalid_name("village")  # ✅ UPDATED
+            self.resultMessage = self.response["message"]
+            self.isSuccess = False
+            return None
+
+        try:
+            result = self.village.CheckItem(
+                request=request,
+                parentid=block_id,
+                childname=village_name,
+                storedprocfetch="GetVillageByNameAndBlocks"
+            )
+            self._set_status(self.village)
+            return result
+
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
+            return None

- 
    def DeleteVillage(self, request, village_id):

-       village = ItemCRUD(itemType=ItemCRUDType.Village)
+        try:
+            self.village.DeleteItem(
+                request=request,
+                itemID=village_id,
+                storedprocDelete="DeleteVillage"
+            )
+            self._set_status(self.village)

-       village.DeleteItem(request=request, itemID=village_id, storedprocDelete="DeleteVillage" )
-       self.isSuccess = village.isSuccess
-       self.resultMessage = village.resultMessage
-       return
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)

    def EditVillage(self, request, village_id):
-        corsor=None
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
+        block_id, village_name = self._get_form_data(request)

-        block_id = request.form.get('block_Id')
-        village_name = request.form.get('Village_Name', '').strip()
-
-        village.EditItem(request=request,childid=village_id,parentid=block_id,childname=village_name,storedprocupdate="UpdateVillage" )
-
-        self.isSuccess = village.isSuccess
-        self.resultMessage = village.resultMessage
-        return
-
-    # def GetVillageByID(self, request, id):
-
-    #     village = ItemCRUD(itemType=ItemCRUDType.Village)
-    #     villagedetailsdata = village.GetAllData(request=request, storedproc="GetVillageDetailsById")
-    #     self.isSuccess = village.isSuccess
-    #     self.resultMessage = village.resultMessage
-    #     return villagedetailsdata
-
-    def GetVillageByID(self, request, id):
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
-        villagedetailsdata = village.GetDataByID(id=id,storedproc="GetVillageDetailsById")
-        if villagedetailsdata:
-            self.isSuccess = True
-        else:
+        if not village_name:
+            self.response = ResponseHandler.invalid_name("village")  # ✅ UPDATED
+            self.resultMessage = self.response["message"]
            self.isSuccess = False
-            self.resultMessage = "Village not found"
+            return

-        return villagedetailsdata
+        try:
+            self.village.EditItem(
+                request=request,
+                childid=village_id,
+                parentid=block_id,
+                childname=village_name,
+                storedprocupdate="UpdateVillage"
+            )
+            self._set_status(self.village)

+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)

-    def GetAllBlocks(self, request):
+    def GetVillageByID(self, id):

+        try:
+            villagedetailsdata = self.village.GetDataByID(
+                id=id,
+                storedproc="GetVillageDetailsById"
+            )
+
+            if villagedetailsdata:
+                self.isSuccess = True
+            else:
+                self.isSuccess = False
+                self.resultMessage = "Village not found"
+
+            return villagedetailsdata
+
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
+            return None
+
+    def GetAllBlocks(self):
        blocks = []
        self.isSuccess = False
        self.resultMessage = ""
-        connection = config.get_db_connection()

+        connection = config.get_db_connection()
        if not connection:
            return []

-        cursor = connection.cursor()
-
        try:
-            cursor.callproc('GetAllBlocks')
-            for result in cursor.stored_results():
-                blocks = result.fetchall()
+            with connection.cursor() as cursor:
+                cursor.callproc('GetAllBlocks')
+
+                for result in cursor.stored_results():
+                    blocks.extend(result.fetchall())
+
            self.isSuccess = True
+            return blocks

        except mysql.connector.Error as e:
            print(f"Error fetching blocks: {e}")
            self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(ResponseHandler.fetch_failure("block"), 500)
-        finally:
-            cursor.close()
-            connection.close()

-        return blocks
+            # ✅ FIXED (removed jsonify response)
+            self.response = ResponseHandler.fetch_failure("block")
+            self.resultMessage = self.response["message"]
+
+            return []
+
+        finally:
+            connection.close()
--- a/model/pycache/Auth.cpython-313.pyc
+++ b/model/pycache/Auth.cpython-313.pyc
--- a/model/pycache/Auth.cpython-314.pyc
+++ b/model/pycache/Auth.cpython-314.pyc
--- a/model/pycache/Block.cpython-313.pyc
+++ b/model/pycache/Block.cpython-313.pyc
--- a/model/pycache/Block.cpython-314.pyc
+++ b/model/pycache/Block.cpython-314.pyc
--- a/model/pycache/ContractorInfo.cpython-313.pyc
+++ b/model/pycache/ContractorInfo.cpython-313.pyc
--- a/model/pycache/District.cpython-313.pyc
+++ b/model/pycache/District.cpython-313.pyc
--- a/model/pycache/District.cpython-314.pyc
+++ b/model/pycache/District.cpython-314.pyc
--- a/model/pycache/FolderAndFile.cpython-313.pyc
+++ b/model/pycache/FolderAndFile.cpython-313.pyc
--- a/model/pycache/GST.cpython-313.pyc
+++ b/model/pycache/GST.cpython-313.pyc
--- a/model/pycache/GST.cpython-314.pyc
+++ b/model/pycache/GST.cpython-314.pyc
--- a/model/pycache/HoldTypes.cpython-313.pyc
+++ b/model/pycache/HoldTypes.cpython-313.pyc
--- a/model/pycache/HoldTypes.cpython-314.pyc
+++ b/model/pycache/HoldTypes.cpython-314.pyc
--- a/model/pycache/Invoice.cpython-313.pyc
+++ b/model/pycache/Invoice.cpython-313.pyc
--- a/model/pycache/Invoice.cpython-314.pyc
+++ b/model/pycache/Invoice.cpython-314.pyc
--- a/model/pycache/ItemCRUD.cpython-313.pyc
+++ b/model/pycache/ItemCRUD.cpython-313.pyc
--- a/model/pycache/ItemCRUD.cpython-314.pyc
+++ b/model/pycache/ItemCRUD.cpython-314.pyc
--- a/model/pycache/Log.cpython-313.pyc
+++ b/model/pycache/Log.cpython-313.pyc
--- a/model/pycache/Log.cpython-314.pyc
+++ b/model/pycache/Log.cpython-314.pyc
--- a/model/pycache/PmcReport.cpython-313.pyc
+++ b/model/pycache/PmcReport.cpython-313.pyc
--- a/model/pycache/PmcReport.cpython-314.pyc
+++ b/model/pycache/PmcReport.cpython-314.pyc
--- a/model/pycache/Report.cpython-313.pyc
+++ b/model/pycache/Report.cpython-313.pyc
--- a/model/pycache/Report.cpython-314.pyc
+++ b/model/pycache/Report.cpython-314.pyc
--- a/model/pycache/State.cpython-313.pyc
+++ b/model/pycache/State.cpython-313.pyc
--- a/model/pycache/State.cpython-314.pyc
+++ b/model/pycache/State.cpython-314.pyc
--- a/model/pycache/Subcontractor.cpython-313.pyc
+++ b/model/pycache/Subcontractor.cpython-313.pyc
--- a/model/pycache/Subcontractor.cpython-314.pyc
+++ b/model/pycache/Subcontractor.cpython-314.pyc
--- a/model/pycache/Utilities.cpython-313.pyc
+++ b/model/pycache/Utilities.cpython-313.pyc
--- a/model/pycache/Utilities.cpython-314.pyc
+++ b/model/pycache/Utilities.cpython-314.pyc
--- a/model/pycache/Village.cpython-313.pyc
+++ b/model/pycache/Village.cpython-313.pyc
--- a/model/pycache/Village.cpython-314.pyc
+++ b/model/pycache/Village.cpython-314.pyc
--- a/model/pycache/gst_release.cpython-313.pyc
+++ b/model/pycache/gst_release.cpython-313.pyc
--- a/model/pycache/gst_release.cpython-314.pyc
+++ b/model/pycache/gst_release.cpython-314.pyc
--- a/model/pycache/payment.cpython-313.pyc
+++ b/model/pycache/payment.cpython-313.pyc
--- a/model/pycache/payment.cpython-314.pyc
+++ b/model/pycache/payment.cpython-314.pyc
--- a/model/gst_release.py
+++ b/model/gst_release.py
@@ -1,150 +1,160 @@
-import config
-import mysql.connector
+# model/gst_release.py
+from flask import request, jsonify
+from model.ItemCRUD import ItemCRUD
+from model.Utilities import ItemCRUDType

-class GSTReleasemodel:
+class GSTRelease:
+
+    def __init__(self):
+        self.isSuccess = False
+        self.resultMessage = ""
+ 
+    # ------------------- Add GST Release -------------------
+    def AddGSTRelease(self, request):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+
+            # Print the full form data
+            print("===== DEBUG: FORM DATA =====")
+            for key, value in request.form.items():
+                print(f"{key} : {value}")
+            print("=============================")
+
+            data = {
+                "PMC_No": request.form.get("PMC_No", "").strip(),
+                "Invoice_No": request.form.get("Invoice_No", "").strip(),
+                "Basic_Amount": float(request.form.get("Basic_Amount", 0) or 0),
+                "Final_Amount": float(request.form.get("Final_Amount", 0) or 0),
+                "Total_Amount": float(request.form.get("Total_Amount", 0) or 0),
+                "UTR": request.form.get("UTR", "").strip(),
+                "Contractor_ID": int(request.form.get("Contractor_ID", 0) or 0)
+            }
+
+            print("===== DEBUG: PARSED DATA =====")
+            print(data)
+            print("==============================")
+
+            # Add GST Release
+            gst.AddItem(
+                request=request,
+                data=data,
+                storedprocfetch="CheckGSTReleaseExists",
+                storedprocadd="AddGSTReleaseFromExcel"
+            )
+
+            print(f"AddItem result: isSuccess={gst.isSuccess}, message={gst.resultMessage}")
+
+            self.isSuccess = gst.isSuccess
+            self.resultMessage = str(gst.resultMessage)
+
+        except Exception as e:
+            print("ERROR in AddGSTRelease:", e)
+            self.isSuccess = False
+            self.resultMessage = str(e)
+
+        return jsonify({"success": self.isSuccess, "message": self.resultMessage})
+
+    def EditGSTRelease(self, request, gst_release_id):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+
+            # Map form inputs to stored procedure parameters
+            data = {
+                "p_pmc_no": request.form.get("PMC_No", "").strip(),
+                "p_invoice_no": request.form.get("invoice_no", "").strip(),
+                "p_basic_amount": float(request.form.get("Basic_Amount", 0) or 0),
+                "p_final_amount": float(request.form.get("Final_Amount", 0) or 0),
+                "p_total_amount": float(request.form.get("Total_Amount", 0) or 0),
+                "p_utr": request.form.get("UTR", "").strip(),
+                "p_gst_release_id": gst_release_id
+            }
+
+            print("===== DEBUG: UPDATE DATA =====")
+            print(data)
+            print("==============================")
+
+            # Call your stored procedure
+            gst.EditItem(
+                request=request,
+                childid=gst_release_id,
+                data=data,
+                storedprocupdate="UpdateGSTRelease"
+            )
+
+            self.isSuccess = gst.isSuccess
+            self.resultMessage = str(gst.resultMessage)
+
+        except Exception as e:
+            print("ERROR in EditGSTRelease:", e)
+            self.isSuccess = False
+            self.resultMessage = str(e)
+
+    # ------------------- Delete GST Release -------------------
+    def DeleteGSTRelease(self, gst_release_id):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+
+            gst.DeleteItem(
+                request=None,
+                itemID=gst_release_id,
+                storedprocDelete="DeleteGSTReleaseById"
+            )
+
+            self.isSuccess = gst.isSuccess
+            self.resultMessage = str(gst.resultMessage)
+
+        except Exception as e:
+            print("ERROR in DeleteGSTRelease:", e)
+            self.isSuccess = False
+            self.resultMessage = str(e)
+
+        return jsonify({"success": self.isSuccess, "message": self.resultMessage})
+
+    # ------------------- Get All GST Releases -------------------
+    def GetAllGSTReleases(self):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+            rows = gst.GetAllData(None, "GetAllGSTReleases")
+
+            data = []
+            for row in rows:
+                data.append({
+                    "gst_release_id": row[0],
+                    "pmc_no": row[1],
+                    "invoice_no": row[2],
+                    "basic_amount": row[3],
+                    "final_amount": row[4],
+                    "total_amount": row[5],
+                    "utr": row[6],
+                    "contractor_id": row[7]
+                })
+
+            return data
+
+        except Exception as e:
+            print("ERROR in GetAllGSTReleases:", e)
+            return []
+
+    # ------------------- Get GST Release By ID -------------------
+    def GetGSTReleaseByID(self, gst_release_id):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+            row = gst.GetDataByID(gst_release_id, "GetGSTReleaseById")
+
+            if row:
+                return {
+                    "gst_release_id": row[0],
+                    "pmc_no": row[1],
+                    "invoice_no": row[2],
+                    "basic_amount": row[3],
+                    "final_amount": row[4],
+                    "total_amount": row[5],
+                    "utr": row[6],
+                    "contractor_id": row[7]
+                }

-    @staticmethod
-    def get_connection():
-        connection = config.get_db_connection()
-        if not connection:
            return None
-        return connection

-    @staticmethod
-    def fetch_all_gst_releases():
-        connection = GSTReleasemodel.get_connection()
-        gst_releases = []
-        if connection:
-            cursor = connection.cursor(dictionary=True)
-
-            try:
-                cursor.callproc('GetAllGSTReleases')
-
-                gst_releases = []
-                for result in cursor.stored_results():                              # change to procedure
-                    gst_releases = result.fetchall()
-
-            except mysql.connector.Error as e:
-                print(f"Error fetching GST releases: {e}")
-            finally:
-                cursor.close()
-                connection.close()
-        return gst_releases
-
-    @staticmethod
-    def insert_gst_release(pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id):
-        connection = GSTReleasemodel.get_connection()
-        if not connection:
-            return False
-        try:
-            cursor = connection.cursor()
-
-            # Insert into gst_release
-            cursor.callproc(
-                'InsertGSTReleaseOnly',
-                [pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id]
-            )
-
-            # Insert into inpayment
-            cursor.callproc(
-                'InsertInpaymentOnly',
-                [pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id]
-            )
-
-            connection.commit()
-            return True
-        except mysql.connector.Error as e:
-            print(f"Error inserting GST release: {e}")
-            return False
-        finally:
-            cursor.close()
-            connection.close()
-
-    @staticmethod
-    def fetch_gst_release_by_id(gst_release_id):
-        connection = GSTReleasemodel.get_connection()
-        if not connection:
-            return None
-        data = {}
-        try:
-            cursor = connection.cursor(dictionary=True)
-
-            cursor.callproc('GetGSTReleaseById', [gst_release_id])
-
-            for result in cursor.stored_results():
-                    data = result.fetchone()
-            if data:
-                # Convert to array for template
-                data = [
-                    data.get('GST_Release_Id'),
-                    data.get('PMC_No'),
-                    data.get('Invoice_No'),
-                    data.get('Basic_Amount'),
-                    data.get('Final_Amount'),
-                    data.get('Total_Amount'),
-                    data.get('UTR')
-                ]
-        except mysql.connector.Error as e:
-            print(f"Error fetching GST release by id: {e}")
-        finally:
-            cursor.close()
-            connection.close()
-        return data
-
-    @staticmethod
-    def update_gst_release(gst_release_id, pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr):
-        connection = GSTReleasemodel.get_connection()
-        if not connection:
-            return False
-        try:
-            cursor = connection.cursor()
-            # Update gst_release
-            cursor.callproc(
-                'UpdateGSTRelease',
-                [pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, gst_release_id]
-            )
-            # Update inpayment
-            cursor.callproc(
-                'UpdateInpaymentByUTR',
-                [basic_amount, final_amount, total_amount, utr]
-            )
-            connection.commit()
-            return True
-        except mysql.connector.Error as e:
-            print(f"Error updating GST release: {e}")
-            return False
-        finally:
-            cursor.close()
-            connection.close()
-
-    @staticmethod
-    def delete_gst_release(gst_release_id):
-        connection = GSTReleasemodel.get_connection()
-        if not connection:
-            return False, None
-        try:
-            cursor = connection.cursor(dictionary=True)
-            cursor.callproc('GetGSTReleaseUTRById', [gst_release_id])
-            record = None
-            for result in cursor.stored_results():
-                record = result.fetchone()
-
-            if not record:
-                return False, None
-
-            utr = record['UTR']
-
-            # Step 1: Delete gst_release
-            cursor.callproc('DeleteGSTReleaseById', [gst_release_id])
-
-            # Step 2: Reset inpayment using UTR
-            cursor.callproc('ResetInpaymentByUTR', [utr])
-            
-            connection.commit()
-            return True, utr
-        except mysql.connector.Error as e:
-            print(f"Error deleting GST release: {e}")
-            return False, None
-        finally:
-            cursor.close()
-            connection.close()
+        except Exception as e:
+            print("ERROR in GetGSTReleaseByID:", e)
+            return None
--- a/model/payment.py
+++ b/model/payment.py
@@ -1,8 +1,13 @@
 import config
 import mysql.connector
+import config
+import mysql.connector
+from enum import Enum
+from model.Utilities import  ItemCRUDType

 class Paymentmodel:

+    # ---------------- Database Connection ----------------
    @staticmethod
    def get_connection():
        connection = config.get_db_connection()
@@ -10,6 +15,7 @@ class Paymentmodel:
            return None
        return connection

+    # ---------------- Payment Methods ----------------
    @staticmethod
    def fetch_all_payments():
        connection = Paymentmodel.get_connection()
@@ -52,14 +58,8 @@ class Paymentmodel:
        try:
            cursor = connection.cursor()
            cursor.callproc('UpdateInpaymentRecord', [
-                    subcontractor_id,
-                    pmc_no,
-                    invoice_no,
-                    amount,
-                    tds_amount,
-                    total_amount,
-                    utr
-                ])
+                subcontractor_id, pmc_no, invoice_no, amount, tds_amount, total_amount, utr
+            ])
            connection.commit()
            return True
        except mysql.connector.Error as e:
@@ -80,7 +80,6 @@ class Paymentmodel:
            cursor.callproc("GetPaymentById", (payment_id,))
            for result in cursor.stored_results():
                payment_data = result.fetchone()
-            # Convert to array for template
            if payment_data:
                payment_data = [
                    payment_data.get('Payment_Id'),
@@ -117,42 +116,99 @@ class Paymentmodel:

    @staticmethod
    def delete_payment(payment_id):
-        """
-        Deletes a payment and resets the related inpayment fields in one go.
-        Returns (success, pmc_no, invoice_no)
-        """
        connection = Paymentmodel.get_connection()
        if not connection:
            return False, None, None
-
        try:
            cursor = connection.cursor(dictionary=True)
-
+            # Fetch PMC & Invoice before deleting
            cursor.callproc('GetPaymentPMCInvoiceById', [payment_id])
-
            record = {}
            for result in cursor.stored_results():
                record = result.fetchone() or {}
            if not record:
                return False, None, None
-
            pmc_no = record['PMC_No']
            invoice_no = record['Invoice_No']
-
-            # Step 2: Delete the payment using the stored procedure
+            # Delete payment
            cursor.callproc("DeletePayment", (payment_id,))
            connection.commit()
-
-            # Step 3: Reset inpayment fields using the stored procedure
+            # Reset inpayment fields
            cursor.callproc("ResetInpayment", [pmc_no, invoice_no])
            connection.commit()
-
            return True, pmc_no, invoice_no
-
        except mysql.connector.Error as e:
            print(f"Error deleting payment: {e}")
            return False, None, None
+        finally:
+            cursor.close()
+            connection.close()

+    # ---------------- Item CRUD Methods ----------------
+    @staticmethod
+    def fetch_items(item_type: ItemCRUDType):
+        connection = Paymentmodel.get_connection()
+        items = []
+        if connection:
+            cursor = connection.cursor(dictionary=True)
+            try:
+                cursor.callproc('GetItemsByType', [item_type.value])
+                for result in cursor.stored_results():
+                    items = result.fetchall()
+            except mysql.connector.Error as e:
+                print(f"Error fetching {item_type.name}: {e}")
+            finally:
+                cursor.close()
+                connection.close()
+        return items
+
+    @staticmethod
+    def insert_item(item_type: ItemCRUDType, name: str):
+        connection = Paymentmodel.get_connection()
+        if not connection:
+            return False
+        try:
+            cursor = connection.cursor()
+            cursor.callproc('InsertItem', [item_type.value, name])
+            connection.commit()
+            return True
+        except mysql.connector.Error as e:
+            print(f"Error inserting {item_type.name}: {e}")
+            return False
+        finally:
+            cursor.close()
+            connection.close()
+
+    @staticmethod
+    def update_item(item_type: ItemCRUDType, item_id: int, new_name: str):
+        connection = Paymentmodel.get_connection()
+        if not connection:
+            return False
+        try:
+            cursor = connection.cursor()
+            cursor.callproc('UpdateItem', [item_type.value, item_id, new_name])
+            connection.commit()
+            return True
+        except mysql.connector.Error as e:
+            print(f"Error updating {item_type.name}: {e}")
+            return False
+        finally:
+            cursor.close()
+            connection.close()
+
+    @staticmethod
+    def delete_item(item_type: ItemCRUDType, item_id: int):
+        connection = Paymentmodel.get_connection()
+        if not connection:
+            return False
+        try:
+            cursor = connection.cursor()
+            cursor.callproc('DeleteItem', [item_type.value, item_id])
+            connection.commit()
+            return True
+        except mysql.connector.Error as e:
+            print(f"Error deleting {item_type.name}: {e}")
+            return False
        finally:
            cursor.close()
            connection.close()
--- a/static/js/hold_types.js
+++ b/static/js/hold_types.js
@@ -3,7 +3,7 @@ $(document).ready(function () {
        let holdType = $(this).val().replace(/^\s+/, "");
        $(this).val(holdType);

-         let reg = /^[A-Za-z]/;
+        let reg = /^.+$/; // all pattern allow

        if (!reg.test(holdType)) {
            $("#holdTypeMessage").text("Hold Type must start with a letter.").css("color", "red");
--- a/static/js/invoice.js
+++ b/static/js/invoice.js
@@ -1,62 +1,271 @@
-// Subcontractor autocomplete functionality
-    $(document).ready(function () {
-      $("#subcontractor").keyup(function () {
+// $(document).ready(function () {
+//     // ===============================
+//     // FORM / TABLE TOGGLE
+//     // ===============================
+//     if ($('#addForm').length && $('#addTable').length) {
+//         $('#addForm').show();
+//         $('#addTable').hide();
+
+//         $('#addButton').click(function () {
+//             $('#addForm').show();
+//             $('#addTable').hide();
+//         });
+
+//         $('#displayButton').click(function () {
+//             $('#addForm').hide();
+//             $('#addTable').show();
+//         });
+//     }
+
+//     // ===============================
+//     // Subcontractor autocomplete
+//     // ===============================
+//     $("#subcontractor").keyup(function () {
+//         let query = $(this).val();
+//         if (query !== "") {
+//             $.ajax({
+//                 url: "/search_subcontractor",
+//                 method: "POST",
+//                 data: { query: query },
+//                 success: function (data) {
+//                     $("#subcontractor_list").fadeIn().html(data);
+//                 }
+//             });
+//         } else {
+//             $("#subcontractor_list").fadeOut();
+//         }
+//     });
+
+//     $(document).on("click", "li", function () {
+//         $("#subcontractor").val($(this).text());
+//         $("#subcontractor_id").val($(this).attr("data-id"));
+//         $("#subcontractor_list").fadeOut();
+//     });
+
+//     // Focus
+//     if (document.getElementById('subcontractor')) {
+//         document.getElementById('subcontractor').focus();
+//     }
+
+//     // ===============================
+//     // ADD INVOICE
+//     // ===============================
+//     if ($('#invoiceForm').length && window.location.href.includes('add_invoice')) {
+//         $("#invoiceForm").on("submit", function (e) {
+//             e.preventDefault();
+//             let formData = $(this).serialize();
+
+//             $.ajax({
+//                 url: '/add_invoice',
+//                 method: 'POST',
+//                 data: formData,
+//                 dataType: 'json',
+//                 success: function (response) {
+//                     if (response.status === "success") {
+//                         alert(response.message || "Invoice added successfully!");
+//                         $('#invoiceForm')[0].reset(); // clear form
+//                         $('#addForm').hide();
+//                         $('#addTable').show(); // switch to table
+//                         location.reload(); // optional refresh
+//                     } else {
+//                         alert(response.message || "Error adding invoice.");
+//                     }
+//                 },
+//                 error: function (xhr) {
+//                     alert(xhr.responseJSON?.message || "Submission failed. Please try again.");
+//                 }
+//             });
+//         });
+//     }
+// // Example AJAX update function
+// function updateInvoice(invoiceId, formElement) {
+//     const formData = $(formElement).serialize();
+
+//     $.ajax({
+//         url: '/update_invoice/' + invoiceId,
+//         method: 'POST',
+//         data: formData,
+//         dataType: 'json',
+//         success: function(response) {
+//             if(response.status === "success") {
+//                 alert(response.message || "Invoice updated successfully!");
+                
+//                 // ✅ Hide Add Form, Show Table
+//                 $('#addForm').hide();
+//                 $('#addTable').show();
+
+//                 // Optional: reload table or refresh page
+//                 location.reload();
+//             } else {
+//                 alert(response.message || "Update failed. Please try again.");
+//             }
+//         },
+//         error: function(xhr) {
+//             alert(xhr.responseJSON?.message || "Error updating invoice.");
+//         }
+//     });
+// }
+
+// // ===============================
+// // DELETE INVOICE
+// // ===============================
+// function deleteInvoice(invoiceId, element) {
+//     if (!confirm("Are you sure you want to delete this invoice?")) return;
+
+//     $.ajax({
+//         url: '/delete_invoice/' + invoiceId,
+//         method: 'GET',
+//         dataType: 'json',
+//         success: function (response) {
+//             alert(response.message || "Invoice deleted successfully!");
+//             if (element) $(element).closest("tr").remove();
+//         },
+//         error: function (xhr) {
+//             alert(xhr.responseJSON?.message || "Error deleting invoice. Please try again.");
+//         }
+//     });
+// }
+
+$(document).ready(function () {
+    // ===============================
+    // FORM / TABLE TOGGLE
+    // ===============================
+    if ($('#addForm').length && $('#addTable').length) {
+        // Default: show form, hide table
+        $('#addForm').show();
+        $('#addTable').hide();
+
+        // ✅ Check URL hash to show table instead
+        if (window.location.hash === "#addTable") {
+            $('#addForm').hide();
+            $('#addTable').show();
+        }
+
+        $('#addButton').click(function () {
+            $('#addForm').show();
+            $('#addTable').hide();
+        });
+
+        $('#displayButton').click(function () {
+            $('#addForm').hide();
+            $('#addTable').show();
+        });
+    }
+
+    // ===============================
+    // Subcontractor autocomplete
+    // ===============================
+    $("#subcontractor").keyup(function () {
        let query = $(this).val();
        if (query !== "") {
-          $.ajax({
-            url: "/search_subcontractor",
-            method: "POST",
-            data: { query: query },
-            success: function (data) {
-              $("#subcontractor_list").fadeIn().html(data);
-            }
-          });
+            $.ajax({
+                url: "/search_subcontractor",
+                method: "POST",
+                data: { query: query },
+                success: function (data) {
+                    $("#subcontractor_list").fadeIn().html(data);
+                }
+            });
        } else {
-          $("#subcontractor_list").fadeOut();
+            $("#subcontractor_list").fadeOut();
        }
-      });
+    });

-      $(document).on("click", "li", function () {
+    $(document).on("click", "li", function () {
        $("#subcontractor").val($(this).text());
        $("#subcontractor_id").val($(this).attr("data-id"));
        $("#subcontractor_list").fadeOut();
-      });
    });

-    // Success Alert: show alert and reload after 3 seconds
-    function showSuccessAlert() {
-      const alertBox = document.getElementById("invoiceSuccessAlert");
-      alertBox.classList.add("show");
-      setTimeout(() => {
-        alertBox.classList.remove("show");
-        // Reload page or redirect after alert hides
-        window.location.href = '/add_invoice';
-      }, 3000);
+    // Focus
+    if (document.getElementById('subcontractor')) {
+        document.getElementById('subcontractor').focus();
    }

-    // Submit form via AJAX
-    $("#invoiceForm").on("submit", function (e) {
-      e.preventDefault();
-      let formData = $(this).serialize();
-      $.ajax({
-        url: '/add_invoice',
-        method: 'POST',
-        data: formData,
-        success: function (response) {
-          if(response.status === "success") {
-            showSuccessAlert();
-          } else {
-            alert(response.message);
-          }
-        },
-        error: function (xhr, status, error) {
-          alert("Submission failed: " + error);
-        }
-      });
-    });
+    // ===============================
+    // ADD INVOICE
+    // ===============================
+    if ($('#invoiceForm').length && window.location.href.includes('add_invoice')) {
+        $("#invoiceForm").on("submit", function (e) {
+            e.preventDefault();
+            let formData = $(this).serialize();

+            $.ajax({
+                url: '/add_invoice',
+                method: 'POST',
+                data: formData,
+                dataType: 'json',
+                success: function (response) {
+                    if (response.status === "success") {
+                        alert(response.message || "Invoice added successfully!");
+                        $('#invoiceForm')[0].reset(); // clear form
+                        $('#addForm').hide();
+                        $('#addTable').show(); // switch to table
+                        location.reload(); // optional refresh
+                    } else {
+                        alert(response.message || "Error adding invoice.");
+                    }
+                },
+                error: function (xhr) {
+                    let msg = xhr.responseJSON?.message || "Submission failed. Please try again.";
+                    alert(msg);
+                }
+            });
+        });
+    }

+    // ===============================
+    // UPDATE INVOICE
+    // ===============================
+    function updateInvoice(invoiceId, formElement) {
+        const formData = $(formElement).serialize();

-window.onload = function () {
-        document.getElementById('subcontractor').focus();
-    };
+        $.ajax({
+            url: '/update_invoice/' + invoiceId,
+            method: 'POST',
+            data: formData,
+            dataType: 'json',
+            success: function(response) {
+                if(response.status === "success") {
+                    alert(response.message || "Invoice updated successfully!");
+
+                    // Redirect to Add Invoice page's table part
+                    window.location.href = "/add_invoice#addTable";
+                } else {
+                    alert(response.message || "Update failed. Please try again.");
+                }
+            },
+            error: function(xhr) {
+                let msg = xhr.responseJSON?.message || "Error updating invoice.";
+                alert(msg);
+            }
+        });
+    }
+    window.updateInvoice = updateInvoice; // make globally accessible
+
+    // ===============================
+    // DELETE INVOICE
+    // ===============================
+    function deleteInvoice(invoiceId, element) {
+        if (!confirm("Are you sure you want to delete this invoice?")) return;
+
+        $.ajax({
+            url: '/delete_invoice/' + invoiceId,
+            method: 'GET',
+            dataType: 'json',
+            success: function (response) {
+                if (response.status === "success") {
+                    alert(response.message || "Invoice deleted successfully!");
+                    if (element) $(element).closest("tr").remove();
+                } else {
+                    alert(response.message || "Error deleting invoice.");
+                }
+            },
+            error: function (xhr) {
+                let msg = xhr.responseJSON?.message || "Error deleting invoice. Please try again.";
+                alert(msg);
+            }
+        });
+    }
+    window.deleteInvoice = deleteInvoice; // make globally accessible
+});
--- a/static/js/search_on_table.js
+++ b/static/js/search_on_table.js
@@ -1,26 +1,23 @@
-
 // Search on table using search inpute options
 function searchTable() {
    let input = document.getElementById("searchBar").value.toLowerCase();
-    let rows = document.querySelectorAll("table tbody tr");
+    let tables = document.querySelectorAll("table");

-    rows.forEach(row => {
-        let blockName = row.cells[1].textContent.toLowerCase();
-        let districtName = row.cells[2].textContent.toLowerCase();
-        let villageName = row.cells[3].textContent.toLowerCase();
+    tables.forEach(table => {
+        let rows = table.querySelectorAll("tr");

-        if (blockName.includes(input) || districtName.includes(input)|| villageName.includes(input)) {
-            row.style.display = "";
-        } else {
-            row.style.display = "none";
-        }
+        rows.forEach((row, index) => {
+            if (index === 0) return; // header skip
+
+            let text = row.textContent.toLowerCase();
+
+            row.style.display = text.includes(input) ? "" : "none";
+        });
    });
 }



-
-
 // Common Sorting Script for Tables
 function sortTable(n, dir) {
    var table, rows, switching, i, x, y, shouldSwitch;
@@ -57,14 +54,14 @@ function sortTable(n, dir) {
 }

 // Attach sorting functionality to all sortable tables
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
    // Find all elements with the class "sortable-header"
    var sortableHeaders = document.querySelectorAll(".sortable-header");

-    sortableHeaders.forEach(function(header) {
+    sortableHeaders.forEach(function (header) {
        // Attach click event for ascending sort
        if (header.querySelector(".sort-asc")) {
-            header.querySelector(".sort-asc").addEventListener("click", function() {
+            header.querySelector(".sort-asc").addEventListener("click", function () {
                var columnIndex = Array.from(header.parentNode.children).indexOf(header);
                sortTable(columnIndex, "asc");
            });
@@ -72,7 +69,7 @@ document.addEventListener("DOMContentLoaded", function() {

        // Attach click event for descending sort
        if (header.querySelector(".sort-desc")) {
-            header.querySelector(".sort-desc").addEventListener("click", function() {
+            header.querySelector(".sort-desc").addEventListener("click", function () {
                var columnIndex = Array.from(header.parentNode.children).indexOf(header);
                sortTable(columnIndex, "desc");
            });
@@ -105,4 +102,31 @@ document.addEventListener("DOMContentLoaded", function () {
        displayButton.classList.add("active-button");
        addButton.classList.remove("active-button");
    });
+});
+
+document.addEventListener("DOMContentLoaded", function () {
+
+    let tables = document.querySelectorAll("table");
+
+    tables.forEach(table => {
+        let header = table.querySelector("tr:first-child");
+
+        if (header) {
+            header.style.position = "sticky";
+            header.style.top = "0";
+            header.style.background = "#fff";
+            header.style.zIndex = "2";
+        }
+
+        if (!table.parentElement.classList.contains("table-wrapper")) {
+            let wrapper = document.createElement("div");
+            wrapper.classList.add("table-wrapper");
+            wrapper.style.maxHeight = "65vh"
+            wrapper.style.overflowY = "auto";
+
+            table.parentNode.insertBefore(wrapper, table);
+            wrapper.appendChild(table);
+        }
+    });
+
 });
--- a/static/js/village.js
+++ b/static/js/village.js
@@ -1,198 +1,250 @@
 window.onload = function () {
-    document.getElementById('Village_Name').focus();
+    if (document.getElementById('Village_Name')) {
+        document.getElementById('Village_Name').focus();
+    }
 };
-
+ 
 $(document).ready(function () {

+    // ✅ RUN ONLY IF THIS PAGE HAS FORM/TABLE
+    if ($('#addForm').length && $('#addTable').length) {
+
+        // ✅ DEFAULT VIEW → SHOW FORM
+        $('#addForm').show();
+        $('#addTable').hide();
+
+
+        // 🔥 BUTTON TOGGLE
+        $('#addButton').click(function () {
+            $('#addForm').show();
+            $('#addTable').hide();
+        });
+
+        $('#displayButton').click(function () {
+            $('#addForm').hide();
+            $('#addTable').show();
+        });
+    }
+
+
+    // ===============================
    // STATE → DISTRICT
-    $('#state_Id').change(function () {
+    // ===============================
+    if ($('#state_Id').length) {

-        var stateId = $(this).val();
+        $('#state_Id').change(function () {

-        if (stateId) {
+            var stateId = $(this).val();

-            $.ajax({
-                url: '/get_districts/' + stateId,
-                type: 'GET',
+            if (stateId) {

-                success: function (data) {
+                $.ajax({
+                    url: '/get_districts/' + stateId,
+                    type: 'GET',

-                    var districtDropdown = $('#district_Id');
+                    success: function (data) {

-                    districtDropdown.empty();
-                    districtDropdown.append('<option value="" disabled selected>Select District</option>');
+                        var districtDropdown = $('#district_Id');

-                    data.forEach(function (district) {
+                        districtDropdown.empty();
+                        districtDropdown.append('<option value="" disabled selected>Select District</option>');

-                        districtDropdown.append(
-                            '<option value="' + district.id + '">' + district.name + '</option>'
-                        );
+                        data.forEach(function (district) {
+                            districtDropdown.append(
+                                '<option value="' + district.id + '">' + district.name + '</option>'
+                            );
+                        });

-                    });
-
-                    districtDropdown.prop('disabled', false);
-
-                }
-
-            });
-
-        }
-
-    });
+                        districtDropdown.prop('disabled', false);
+                    }
+                });
+            }
+        });
+    }


+    // ===============================
    // DISTRICT → BLOCK
-    $('#district_Id').change(function () {
+    // ===============================
+    if ($('#district_Id').length) {

-        var districtId = $(this).val();
+        $('#district_Id').change(function () {

-        if (districtId) {
+            var districtId = $(this).val();

-            $.ajax({
-                url: '/get_blocks/' + districtId,
-                type: 'GET',
+            if (districtId) {

-                success: function (data) {
+                $.ajax({
+                    url: '/get_blocks/' + districtId,
+                    type: 'GET',

-                    var blockDropdown = $('#block_Id');
+                    success: function (data) {

-                    blockDropdown.empty();
-                    blockDropdown.append('<option value="" disabled selected>Select Block</option>');
+                        var blockDropdown = $('#block_Id');

-                    data.forEach(function (block) {
+                        blockDropdown.empty();
+                        blockDropdown.append('<option value="" disabled selected>Select Block</option>');

-                        blockDropdown.append(
-                            '<option value="' + block.id + '">' + block.name + '</option>'
-                        );
+                        data.forEach(function (block) {
+                            blockDropdown.append(
+                                '<option value="' + block.id + '">' + block.name + '</option>'
+                            );
+                        });

-                    });
-
-                    blockDropdown.prop('disabled', false);
-
-                }
-
-            });
-
-        }
-
-    });
+                        blockDropdown.prop('disabled', false);
+                    }
+                });
+            }
+        });
+    }


+    // ===============================
    // VILLAGE NAME VALIDATION
-    $('#Village_Name').on('input', function () {
+    // ===============================
+    if ($('#Village_Name').length) {

-        var villageName = $(this).val();
-        var validPattern = /^[A-Za-z ]*$/;
+        $('#Village_Name').on('input', function () {

-        if (!validPattern.test(villageName)) {
+            var villageName = $(this).val();
+            var validPattern = /^[A-Za-z ]*$/;

-            $('#villageMessage')
-                .text('Only letters and spaces are allowed!')
-                .css('color', 'red');
+            if (!validPattern.test(villageName)) {

-            $('#submitVillage').prop('disabled', true);
+                $('#villageMessage')
+                    .text('Only letters and spaces are allowed!')
+                    .css('color', 'red');

-        } else {
+                $('#submitVillage').prop('disabled', true);

-            $('#villageMessage').text('');
-            $('#submitVillage').prop('disabled', false);
+            } else {

-        }
-
-    });
+                $('#villageMessage').text('');
+                $('#submitVillage').prop('disabled', false);
+            }
+        });
+    }


+    // ===============================
    // CHECK DUPLICATE VILLAGE
-    $('#Village_Name, #block_Id').on('change keyup', function () {
+    // ===============================
+    if ($('#Village_Name').length && $('#block_Id').length) {

-        var blockId = $('#block_Id').val();
-        var villageName = $('#Village_Name').val().trim();
+        $('#Village_Name, #block_Id').on('change keyup', function () {

-        if (blockId && villageName) {
+            var blockId = $('#block_Id').val();
+            var villageName = $('#Village_Name').val().trim();

-            $.ajax({
+            if (blockId && villageName) {

-                url: '/check_village',
-                type: 'POST',
+                $.ajax({
+                    url: '/check_village',
+                    type: 'POST',

-                data: {
-                    block_Id: blockId,
-                    Village_Name: villageName
-                },
+                    data: {
+                        block_Id: blockId,
+                        Village_Name: villageName
+                    },

-                success: function (response) {
+                    success: function (response) {

-                    if (response.status === 'exists') {
+                        if (response.status === 'exists') {
+
+                            $('#villageMessage')
+                                .text(response.message)
+                                .css('color', 'red');
+
+                            $('#submitVillage').prop('disabled', true);
+
+                        } else {
+
+                            $('#villageMessage')
+                                .text(response.message)
+                                .css('color', 'green');
+
+                            $('#submitVillage').prop('disabled', false);
+                        }
+                    },
+
+                    error: function () {

                        $('#villageMessage')
-                            .text(response.message)
+                            .text('Error checking village name')
                            .css('color', 'red');

                        $('#submitVillage').prop('disabled', true);
+                    }
+                });
+            }
+        });
+    }
+
+
+    // ===============================
+    // ADD VILLAGE (SAFE SCOPE FIX)
+    // ===============================
+    if ($('#villageForm').length) {
+
+        $('#villageForm').submit(function (event) {
+
+            event.preventDefault();
+
+            $.ajax({
+                url: '/add_village',
+                type: 'POST',
+                data: $(this).serialize(),
+
+                success: function (response) {
+
+                    if (response && response.status === 'success') {
+
+                        alert(response.message || 'Village added successfully!');
+
+                        // ✅ clear form
+                        $('#villageForm')[0].reset();
+
+                        // ✅ switch to table
+                        $('#addForm').hide();
+                        $('#addTable').show();
+
+                        // optional refresh
+                        location.reload();

                    } else {
-
-                        $('#villageMessage')
-                            .text(response.message)
-                            .css('color', 'green');
-
-                        $('#submitVillage').prop('disabled', false);
-
+                        alert(response.message || 'Error adding village. Please try again.');
                    }
-
                },

                error: function () {
-
-                    $('#villageMessage')
-                        .text('Error checking village name')
-                        .css('color', 'red');
-
-                    $('#submitVillage').prop('disabled', true);
-
+                    alert('An error occurred. Please try again.');
                }
-
            });

-        }
-
-    });
-
-
-    // ADD VILLAGE
-    $('#villageForm').submit(function (event) {
-
-        event.preventDefault();
-
-        $.ajax({
-
-            url: '/add_village',
-            type: 'POST',
-            data: $(this).serialize(),
-
-            success: function (response) {
-
-                if (response.status === 'success') {
-
-                    alert('Village added successfully!');
-                    location.reload();
-
-                } else {
-
-                    alert('Error adding village. Please try again.');
-
-                }
-
-            },
-
-            error: function () {
-
-                alert('An error occurred. Please try again.');
-
-            }
-
        });
+    }

+});
+
+
+
+
+// ===============================
+// DELETE FUNCTION (SAFE)
+// ===============================
+function deleteVillage(villageId, element) {
+    if (!confirm("Are you sure you want to delete this village?")) return;
+
+    $.ajax({
+        url: '/delete_village/' + villageId,
+        type: 'GET',
+        dataType: 'json',
+        success: function (response) {
+            alert(response.message); // ✅ now shows "Village deleted successfully!"
+            if (element) $(element).closest("tr").remove();
+        },
+        error: function () {
+            alert("Error deleting village. Please try again.");
+        }
    });
-
-});
+}
--- a/templates/activity_log.html
+++ b/templates/activity_log.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <meta charset="UTF-8">
    <title>Activity Logs</title>
@@ -9,67 +10,79 @@
            background-color: #f8f9fa;
            margin: 20px;
        }
+
        h2 {
            text-align: center;
            margin-bottom: 20px;
        }
+
        form {
            display: flex;
            gap: 10px;
            justify-content: center;
            margin-bottom: 20px;
+            flex-wrap: wrap;
        }
-        input, button {
+
+        input,
+        button {
            padding: 8px;
            border-radius: 6px;
            border: 1px solid #ccc;
        }
+
        button {
            background-color: #007bff;
            color: white;
            cursor: pointer;
        }
+
        button:hover {
            background-color: #0056b3;
        }
+
        table {
            width: 90%;
            margin: auto;
            border-collapse: collapse;
            background: white;
-            box-shadow: 0 0 8px rgba(0,0,0,0.1);
+            box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
        }
-        th, td {
+
+        th,
+        td {
            padding: 12px;
            border: 1px solid #ddd;
            text-align: center;
        }
+
        th {
            background-color: #007bff;
            color: white;
        }
+
        tr:nth-child(even) {
            background-color: #f2f2f2;
        }
    </style>
 </head>
+
 <body>
    <h2>Activity Logs</h2>
-<form method="get" action="{{ url_for('activity_log') }}" class="filter-form">

-      <label for="username">Username:</label>
-    <input type="text" id="username" name="username" placeholder="Enter username" value="{{ username or '' }}">
+    <form method="get" action="{{ url_for('log.activity_log') }}" class="filter-form">
+        <label for="username">Username:</label>
+        <input type="text" id="username" name="username" placeholder="Enter username" value="{{ username or '' }}">

-    <label for="start_date">Start Date:</label>
-    <input type="date" id="start_date" name="start_date" value="{{ start_date or '' }}">
+        <label for="start_date">Start Date:</label>
+        <input type="date" id="start_date" name="start_date" value="{{ start_date or '' }}">

-    <label for="end_date">End Date:</label>
-    <input type="date" id="end_date" name="end_date" value="{{ end_date or '' }}">
+        <label for="end_date">End Date:</label>
+        <input type="date" id="end_date" name="end_date" value="{{ end_date or '' }}">

-
-    <button type="submit" class="btn btn-primary">Filter</button>
-    <!-- <button type="button" style="background-color: #6c757d;" onclick="resetFilter()">Reset</button> -->
-</form>
+        <button type="submit" class="btn btn-primary">Filter</button>
+        <button type="button" style="background-color: #6c757d;" onclick="resetFilter()">Reset</button>
+    </form>

    <table>
        <tr>
@@ -94,9 +107,10 @@
    </table>

    <script>
-    function resetFilter() {
-        window.location.href = "{{ url_for('activity_log') }}";
-    }
-</script>
+        function resetFilter() {
+            window.location.href = "{{ url_for('log.activity_log') }}";
+        }
+    </script>
 </body>
-</html>
+
+</html>
--- a/templates/add_gst_release.html
+++ b/templates/add_gst_release.html
@@ -15,17 +15,21 @@
    <button id="addButton" class="action-button">Add</button>
    <button id="displayButton" class="action-button">Display</button>
 </div>
-
+ 
 <div id="addForm" style="display: none;">
    <h2>Add GST Release</h2>
    <form action="/add_gst_release" method="POST" onsubmit="showSuccessAlert(event)">
        <div class="row1">
-            <div>
-                <label for="subcontractor">Subcontractor Name:</label>
-                <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off"/>
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id"/>
-                <div id="subcontractor_list" class="autocomplete-items"></div>
-            </div>
+           <div>
+    <label for="subcontractor">Subcontractor Name:</label>
+    <!-- Text input for user-friendly autocomplete -->
+    <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off"/>
+    
+    <!-- Hidden input for backend; must match model's Contractor_ID -->
+    <input type="hidden" id="subcontractor_id" name="Contractor_ID"/>
+    
+    <div id="subcontractor_list" class="autocomplete-items"></div>
+</div>
        </div>

        <label for="PMC_No">PMC No:</label><br>
@@ -37,19 +41,19 @@
        </select><br><br>

        <label for="invoice_No">Invoice No:</label><br>
-        <input type="text" id="invoice_No" name="invoice_No" required><br><br>
+        <input type="text" id="invoice_No" name="Invoice_No" required><br><br>

        <label for="basic_amount">Basic Amount:</label><br>
-        <input type="number" step="0.01" id="basic_amount" name="basic_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="basic_amount" name="Basic_Amount" placeholder="₹ - 00.00" required><br><br>

        <label for="final_amount">Final Amount:</label><br>
-        <input type="number" step="0.01" id="final_amount" name="final_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="final_amount" name="Final_Amount" placeholder="₹ - 00.00" required><br><br>

        <label for="total_amount">Total Amount:</label><br>
-        <input type="number" step="0.01" id="total_amount" name="total_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="total_amount" name="Total_Amount" placeholder="₹ - 00.00" required><br><br>

        <label for="utr">UTR:</label><br>
-        <input type="text"  id="utr" name="utr"  required><br><br>
+        <input type="text"  id="utr" name="UTR"  required><br><br>

        <button type="submit">Submit GST Release</button>
    </form>
@@ -68,96 +72,110 @@
    {% endwith %}
 </div>

+<!-- GST Release History Table -->
 <div id="addTable" style="display: none;">
    <div class="search-container">
        <h2>GST Release History</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+        <input type="text" id="searchBar" placeholder="Search..." onkeyup="searchTable()">
    </div>
    <table id="sortableTable" border="1">
        <thead>
-        <tr>
-            <th class="sortable-header">GST_Release_Id</th>
-            <th class="sortable-header">PMC_No</th>
-            <th>Invoice_No</th>
-            <th>Basic_Amount</th>
-            <th>Final_Amount</th>
-            <th>Total_Amount</th>
-            <th>UTR</th>
-            <th>Update</th>
-            <th>Delete</th>
-        </tr>
+            <tr>
+                <th class="sortable-header">GST_Release_Id</th>
+                <th class="sortable-header">PMC_No</th>
+                <th>Invoice_No</th>
+                <th>Basic_Amount</th>
+                <th>Final_Amount</th>
+                <th>Total_Amount</th>
+                <th>UTR</th>
+                <th>Update</th>
+                <th>Delete</th>
+            </tr>
        </thead>
        <tbody>
-        {% for gst_rel in gst_releases %}
-        <tr>
-            <td>{{ gst_rel[0] }}</td>
-            <td>{{ gst_rel[1] }}</td>
-            <td>{{ gst_rel[2] }}</td>
-            <td>{{ gst_rel[3] }}</td>
-            <td>{{ gst_rel[4] }}</td>
-            <td>{{ gst_rel[5] }}</td>
-            <td>{{ gst_rel[6] }}</td>
-            <td>
-                <a href="/edit_gst_release/{{ gst_rel[0] }}">
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
-                         class="icon">
-                </a>
-            </td>
-            <td>
-                <a href="/delete_gst_release/{{ gst_rel[0] }}"
-                   onclick="return confirm('Are you sure you want to delete this GST Release?')">
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
-                         class="icon">
-                </a>
-            </td>
-        </tr>
-        {% endfor %}
+            {% for gst_rel in gst_releases %}
+            <tr>
+                <td>{{ gst_rel.gst_release_id }}</td>
+                <td>{{ gst_rel.pmc_no }}</td>
+                <td>{{ gst_rel.invoice_no }}</td>
+                <td>{{ gst_rel.basic_amount }}</td>
+                <td>{{ gst_rel.final_amount }}</td>
+                <td>{{ gst_rel.total_amount }}</td>
+                <td>{{ gst_rel.utr }}</td>
+                <td>
+                    <a href="{{ url_for('gst_release_bp.edit_gst_release', gst_release_id=gst_rel.gst_release_id) }}">
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon">
+                    </a>
+                </td>
+                <td>
+                    <a href="{{ url_for('gst_release_bp.delete_gst_release', gst_release_id=gst_rel.gst_release_id) }}" 
+                       onclick="return confirm('Are you sure you want to delete this GST Release?')">
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon">
+                    </a>
+                </td>
+            </tr>
+            {% endfor %}
        </tbody>
    </table>
 </div>

 <script>
 document.addEventListener('DOMContentLoaded', function() {
-    // Handle subcontractor autocomplete
-    document.getElementById("subcontractor").addEventListener("input", function () {
+
+    const subcontractorInput = document.getElementById("subcontractor");
+    const subcontractorIdInput = document.getElementById("subcontractor_id");
+    const subcontractorList = document.getElementById("subcontractor_list");
+    const pmcDropdown = document.getElementById("PMC_No");
+    const form = document.querySelector('form');
+
+    // --------------------------
+    // Subcontractor autocomplete
+    // --------------------------
+    subcontractorInput.addEventListener("input", function () {
        const query = this.value;
-        const list = document.getElementById("subcontractor_list");

        if (query.length < 2) {
-            list.innerHTML = '';
+            subcontractorList.innerHTML = '';
+            subcontractorIdInput.value = ''; // reset hidden id
+            pmcDropdown.innerHTML = '<option value="">Select PMC No</option>'; // reset PMC dropdown
            return;
        }

        fetch(`/search_subcontractor?query=${encodeURIComponent(query)}`)
            .then(response => response.json())
            .then(data => {
-                list.innerHTML = '';
+                subcontractorList.innerHTML = '';
                data.results.forEach(item => {
                    const div = document.createElement("div");
                    div.setAttribute("data-id", item.id);
                    div.textContent = item.name;
-                    list.appendChild(div);
+                    subcontractorList.appendChild(div);
                });
            });
    });

-    // Handle subcontractor selection
-    document.getElementById("subcontractor_list").addEventListener("click", function (e) {
+    // --------------------------
+    // Subcontractor selection
+    // --------------------------
+    subcontractorList.addEventListener("click", function (e) {
        const selectedId = e.target.getAttribute("data-id");
        const selectedName = e.target.textContent;

        if (selectedId) {
-            document.getElementById("subcontractor_id").value = selectedId;
-            document.getElementById("subcontractor").value = selectedName;
-            document.getElementById("subcontractor_list").innerHTML = "";
+            // Set hidden field for backend
+            subcontractorIdInput.value = selectedId;

-            // Update PMC dropdown for selected subcontractor
+            // Set text input to selected name
+            subcontractorInput.value = selectedName;
+
+            // Clear the autocomplete list
+            subcontractorList.innerHTML = "";
+
+            // Fetch and populate PMC dropdown
            fetch(`/get_pmc_nos_by_subcontractor/${encodeURIComponent(selectedId)}`)
                .then(response => response.json())
                .then(data => {
-                    const pmcDropdown = document.getElementById("PMC_No");
                    pmcDropdown.innerHTML = '<option value="">Select PMC No</option>';
-
                    data.pmc_nos.forEach(pmc => {
                        const option = document.createElement("option");
                        option.value = pmc;
@@ -167,6 +185,22 @@ document.addEventListener('DOMContentLoaded', function() {
                });
        }
    });
+
+    // --------------------------
+    // Form submit validation
+    // --------------------------
+    form.addEventListener('submit', function(e) {
+        if (!subcontractorIdInput.value) {
+            e.preventDefault();
+            alert("Please select a subcontractor from the list.");
+            subcontractorInput.focus();
+        } else if (!pmcDropdown.value) {
+            e.preventDefault();
+            alert("Please select a PMC No.");
+            pmcDropdown.focus();
+        }
+    });
+
 });
 </script>

--- a/templates/add_hold_type.html
+++ b/templates/add_hold_type.html
@@ -1,59 +1,73 @@
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
    <title>Manage Hold Types</title>
    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
    <!-- <script src="{{ url_for('static', filename='js/hold_types.js') }}"></script> -->
    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
-       <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
+
 <body>

-<div class="button-container">
-    <button id="addButton" class="action-button">Add</button>
-    <button id="displayButton" class="action-button">Display</button>
-</div>
+    <div class="button-container">
+        <button id="addButton" class="action-button">Add</button>
+        <button id="displayButton" class="action-button">Display</button>
+    </div>

-<div id="addForm">
-    <h2>Add Hold Types</h2>
-    <form id="holdTypeForm" method="POST" action="{{ url_for('hold_types.add_hold_type') }}">
-        <label>Enter Hold Amount Type:</label>
-        <input type="text" id="hold_type" name="hold_type" placeholder="Enter Type" required>
-        <span id="holdTypeMessage"></span>
-        <button type="submit" value="Add Hold Type" id="successPopup">Add Hold Type</button>
-    </form>
-</div>
-  
-<div id="addTable" style="display: none;">
-  <div class="search-container">
-        <h2>Hold Type List</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
-            </div>
-    <table id="sortableTable" border="1">
-        <tr>
-            <th>ID</th>
-            <th class="sortable-header">
-                Hold Type
-                <span class="sort-buttons">
-                    <span class="sort-asc">⬆️</span>
-                    <span class="sort-desc">⬇️</span>
-                </span>
-            </th>
-            <th>Update</th>
-            <th>Delete</th>
-        </tr>
-        {% for htd in Hold_Types_data %}
-        <tr>
-            <td>{{ htd['hold_type_id'] }}</td>
-            <td>{{ htd['hold_type'] }}</td>
-            <td><a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">Edit</a></td>
-            <td><button class="delete-button" data-id="{{ htd['hold_type_id'] }}">Delete</button></td>
-        </tr>
-        {% endfor %}
-    </table>
+    <div id="addForm">
+        <h2>Add Hold Types</h2>
+        <form id="holdTypeForm" method="POST" action="{{ url_for('hold_types.add_hold_type') }}">
+            <label>Enter Hold Amount Type:</label>
+            <input type="text" id="hold_type" name="hold_type" placeholder="Enter Type" required>
+            <span id="holdTypeMessage"></span>
+            <button type="submit" value="Add Hold Type" id="successPopup">Add Hold Type</button>
+        </form>
+    </div>

-    <a href="/">Back to Dashboard</a>
-</div>
+    <div id="addTable" style="display: none;">
+        <div class="search-container">
+            <h2>Hold Type List</h2>
+            <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+        </div>
+        <table id="sortableTable" border="1">
+            <tr>
+                <th>ID</th>
+                <th class="sortable-header">
+                    Hold Type
+                    <span class="sort-buttons">
+                        <span class="sort-asc">⬆️</span>
+                        <span class="sort-desc">⬇️</span>
+                    </span>
+                </th>
+                <th>Update</th>
+                <th>Delete</th>
+            </tr>
+            {% for htd in Hold_Types_data %}
+            <tr>
+                <td>{{ htd['hold_type_id'] }}</td>
+                <td>{{ htd['hold_type'] }}</td>
+                <td style="text-align:center;">
+                    <a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                            class="icon">
+                    </a>
+                </td>
+
+                <td style="text-align:center;">
+                    <a href="{{ url_for('hold_types.delete_hold_type', id=htd['hold_type_id']) }}"
+                        onclick="return confirm('Are you sure you want to delete this hold type?');">
+
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                            class="icon">
+                    </a>
+                </td>
+            </tr>
+            {% endfor %}
+        </table>
+
+        <a href="/">Back to Dashboard</a>
+    </div>
 </body>
-{% endblock %}
-
+{% endblock %}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Swapnil9693	d84ba520cf	GST Release Add, Edit, Delete Working	2026-03-24 18:46:07 +05:30
Pankaj J Patil	0aeaf775dd	Merge pull request 'pankaj-dev - all done' (#18 ) from pankaj-dev into main Reviewed-on: #18	2026-03-24 11:27:55 +00:00
pjpatil12	88e8771b51	add log file function	2026-03-24 16:56:23 +05:30
pjpatil12	6c74b5d3bf	Merge branch 'main' of https://gitea.lcepl.org/pjpatil12/Payment_Reconciliation into pankaj-dev	2026-03-24 16:29:32 +05:30
pjpatil12	47ba78d72c	search on table	2026-03-24 16:29:18 +05:30
Pankaj J Patil	1946a98d59	Merge pull request 'Invoice Add Edit and Delete Done' (#17 ) from swapnil-dev into main Reviewed-on: #17	2026-03-24 10:51:43 +00:00
Pankaj J Patil	8f35e08429	Merge pull request 'GST Release Display Chages' (#16 ) from laxmi-dev into main Reviewed-on: #16 Reviewed-by: Pankaj J Patil <pankajjpatil2001@gmail.com>	2026-03-24 10:51:05 +00:00
Pankaj J Patil	82bedc3117	Update activity.log	2026-03-24 10:49:06 +00:00
Pankaj J Patil	cb68e454bc	Update .env	2026-03-24 10:47:05 +00:00
Swapnil9693	91b078a0c3	edit_invoice html removed	2026-03-24 16:16:43 +05:30
Swapnil9693	eb46929893	New invoice commit	2026-03-24 16:13:04 +05:30
anishd100	675301df7f	GST Release Display Chages	2026-03-24 16:08:37 +05:30
Swapnil9693	14e799a1d4	Inoive add update delete messages shown properly	2026-03-24 15:51:55 +05:30
Pankaj J Patil	8ab1b69033	Merge pull request 'hold type updated , delete done by prajkta' (#13 ) from pankaj-dev into main Reviewed-on: #13	2026-03-24 09:51:42 +00:00
pjpatil12	dbeec9962d	hold type updated , delete done by prajkta	2026-03-24 15:19:38 +05:30
Pankaj J Patil	8750f268db	Merge pull request 'Village Add, Edit and Delete Messages done' (#12 ) from swapnil-dev into main Reviewed-on: #12	2026-03-24 09:47:16 +00:00
Swapnil9693	b78526ad9f	Village Add, Edit and Delete Messages done	2026-03-24 13:41:00 +05:30
Pankaj J Patil	7146391c18	Merge pull request 'delete payment code updated by prajakta' (#11 ) from pankaj-dev into main Reviewed-on: #11	2026-03-24 07:21:43 +00:00
pjpatil12	94b5563d15	delete payment code updated by prajakta	2026-03-24 12:50:44 +05:30
Pankaj J Patil	937018dc16	Merge pull request 'add item crude' (#10 ) from pankaj-dev into main Reviewed-on: #10	2026-03-24 07:07:31 +00:00
pjpatil12	eda238c235	add itemcrude	2026-03-24 12:36:15 +05:30
Pankaj J Patil	f184d6cecc	Merge pull request 'update block redirect added' (#9 ) from pankaj-dev into main Reviewed-on: #9	2026-03-24 06:26:39 +00:00
Pankaj J Patil	e7646eee76	Merge pull request 'Village module delete issue resolved and also message shown in alert' (#8 ) from swapnil-dev into main Reviewed-on: #8	2026-03-24 06:25:19 +00:00
pjpatil12	64ca39944b	update block redirect added	2026-03-24 11:47:57 +05:30
Swapnil9693	6b4beb5af8	Village module delete issue resolved and also message shown on alert	2026-03-24 11:43:16 +05:30
Swapnil9693	d092eb0527	Sync .env and activity.log with main	2026-03-24 11:39:08 +05:30
Swapnil9693	f9e9612df5	Re-add .env and activity.log	2026-03-24 11:37:08 +05:30
Swapnil9693	46ec2c0276	Remove sensitive files (.env, activity.log) from repo	2026-03-24 11:32:00 +05:30
Swapnil9693	630ee1744f	Backup Before Changes village Task	2026-03-24 11:28:14 +05:30
Pankaj J Patil	2679554e98	Merge pull request 'edit comments main code' (#7 ) from pankaj-dev into main Reviewed-on: #7	2026-03-24 04:55:48 +00:00
pjpatil12	0912aef85e	edit comments	2026-03-23 18:45:16 +05:30
Pankaj J Patil	ce90c6b350	Merge pull request 'pankaj-dev' (#6 ) from pankaj-dev into main Reviewed-on: #6	2026-03-23 11:52:17 +00:00
pjpatil12	bc20a53f26	updated code of prajakta block,payment, gst	2026-03-23 17:19:21 +05:30
pjpatil12	42f69773ec	Merge branch 'main' of https://gitea.lcepl.org/pjpatil12/Payment_Reconciliation into pankaj-dev	2026-03-23 14:31:57 +05:30
Pankaj J Patil	79ea359b1c	Merge pull request 'pankaj-dev' (#4 ) from pankaj-dev into main Reviewed-on: #4	2026-03-23 09:01:20 +00:00
pjpatil12	acbea7942c	Merge branch 'main' of https://gitea.lcepl.org/pjpatil12/Payment_Reconciliation into pankaj-dev	2026-03-23 14:15:59 +05:30
pjpatil12	13a4c5836e	remove commented code	2026-03-23 14:15:11 +05:30
Pankaj J Patil	315e972e1f	Merge pull request 'Village, invoice and Contractor Info model and controller added' (#3 ) from swapnil-dev into main Reviewed-on: #3	2026-03-23 08:41:38 +00:00
anishd100	dffa9769bc	Village, invoice and Contractor Info model and controller added	2026-03-23 13:09:34 +05:30
pjpatil12	af15b3934e	Added gitignore	2026-03-23 11:55:16 +05:30