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
120 changed files with 2966 additions and 10552 deletions
--- a/.env
+++ b/.env
@@ -2,7 +2,7 @@ Secret_Key = 9f2a1b8c4d6e7f0123456789abcdef01

 MYSQL_HOST=127.0.0.1
 MYSQL_USER=root
-MYSQL_PASSWORD=admin
+MYSQL_PASSWORD=root
 MYSQL_DB=test

 DEFAULT_USERNAME=admin
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
 venv/
 *.pyc
 __pycache__/
-.uploads
-static/download/
-downloads/
-uploads/

+static/downloads/
+static/uploads/

--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-main.py
--- a/.idea/ManagementApplicationt.iml
+++ b/.idea/ManagementApplicationt.iml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.13" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.13 (ManagementApplicationt)" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ManagementApplicationt.iml" filepath="$PROJECT_DIR$/.idea/ManagementApplicationt.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
--- a/README.md
+++ b/README.md
@@ -1 +0,0 @@
-# MA07-05-2025
--- 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,7 +74,14 @@ 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,27 +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  # your database connection module
+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
@@ -29,8 +18,8 @@ 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)

            LogHelper.log_action(
@@ -38,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')


@@ -47,7 +37,7 @@ 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

@@ -69,7 +59,6 @@ def show_table(filename):
            try:
                cursor = connection.cursor(dictionary=True)

-                print(f"Calling GetStateByName with: {file_info['State']}")
                cursor.callproc('GetStateByName', [file_info['State']])
                for result in cursor.stored_results():
                    state_data = result.fetchone()
@@ -77,7 +66,6 @@ def show_table(filename):
                    errors.append(f"State '{file_info['State']}' is not valid. Please add it.")

                if state_data:
-                    print(f"Calling GetDistrictByNameAndStates with: {file_info['District']}, {state_data['State_ID']}")
                    cursor.callproc('GetDistrictByNameAndStates', [file_info['District'], state_data['State_ID']])
                    for result in cursor.stored_results():
                        district_data = result.fetchone()
@@ -85,27 +73,23 @@ def show_table(filename):
                        errors.append(f"District '{file_info['District']}' is not valid under state '{file_info['State']}'.")

                if district_data:
-                    print(f"Calling GetBlockByNameAndDistricts with: {file_info['Block']}, {district_data['District_ID']}")
                    cursor.callproc('GetBlockByNameAndDistricts', [file_info['Block'], district_data['District_ID']])
                    for result in cursor.stored_results():
                        block_data = result.fetchone()
                    if not block_data:
                        errors.append(f"Block '{file_info['Block']}' is not valid under district '{file_info['District']}'.")

-                print(f"Calling GetSubcontractorByName with: {file_info['Subcontractor']}")
                cursor.callproc('GetSubcontractorByName', [file_info['Subcontractor']])
                for result in cursor.stored_results():
                    subcontractor_data = result.fetchone()

                if not subcontractor_data:
-                    print(f"Inserting subcontractor: {file_info['Subcontractor']}")
                    cursor.callproc('InsertSubcontractor', [file_info['Subcontractor']])
                    connection.commit()
                    cursor.callproc('GetSubcontractorByName', [file_info['Subcontractor']])
                    for result in cursor.stored_results():
                        subcontractor_data = result.fetchone()

-                print("Calling GetAllHoldTypes")
                cursor.callproc("GetAllHoldTypes")
                hold_types_data = []
                for ht in cursor.stored_results():
--- 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()

    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,102 +1,3 @@
-# # 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 
-
-# invoice_bp = Blueprint('invoice', __name__)
-
-# # -------------------------------- Add Invoice ---------------------------------
-# @invoice_bp.route('/add_invoice', methods=['GET', 'POST'])
-# @login_required
-# def add_invoice():
-#     if request.method == 'POST':
-#         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
-
-#         except Exception as e:
-#             return jsonify({"status": "error", "message": str(e)}), 500
-
-#     invoices = get_all_invoice_details()
-#     villages = get_all_villages()
-#     return render_template('add_invoice.html', invoices=invoices, villages=villages)
-
-
-# # ------------------- Search Subcontractor -------------------
-# @invoice_bp.route('/search_subcontractor', methods=['POST'])
-# @login_required
-# def search_subcontractor():
-#     sub_query = request.form.get("query")
-#     results = search_contractors(sub_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
-
-
-# # ------------------- Get Hold Types -------------------
-# @invoice_bp.route('/get_hold_types', methods=['GET'])
-# @login_required
-# 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}'")
-#     return jsonify(hold_types)
-
-
-# # ------------------- Edit Invoice -------------------
-# @invoice_bp.route('/edit_invoice/<int:invoice_id>', methods=['GET', 'POST'])
-# @login_required
-# 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}'")
-#         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 -------------------
-# @invoice_bp.route('/delete_invoice/<int:invoice_id>', methods=['GET'])
-# @login_required
-# 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
-



--- 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")

-    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,13 +1,15 @@
 from flask import Blueprint, render_template, send_from_directory
+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):
-
    data = PmcReport.get_pmc_report(pmc_no)
-
    if not data:
        return "No PMC found with this number", 404

@@ -23,7 +25,9 @@ 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):

    result = PmcReport.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
-from datetime import datetime
-import os
-import openpyxl
-from openpyxl.styles import Font
-from model.ContractorInfo import ContractorInfo


 report_bp = Blueprint("report", __name__)
@@ -26,35 +21,17 @@ def report_page():
 def search_contractor():

    subcontractor_name = request.form.get("subcontractor_name")
-    pmc_no = request.form.get("pmc_no")
-    state = request.form.get("state")
-    district = request.form.get("district")
-    block = request.form.get("block")
-    village = request.form.get("village")
-    year_from = request.form.get("year_from")
-    year_to = request.form.get("year_to")

    LogHelper.log_action(
        "Search Contractor",
-        f"User {current_user.id} Search contractor '{subcontractor_name}'"
+        f"User {current_user.id} searched contractor '{subcontractor_name}'"
    )

-    data = ReportHelper.search_contractor(
-        subcontractor_name,
-        pmc_no,
-        state,
-        district,
-        block,
-        village,
-        year_from,
-        year_to
-    )
+    data = ReportHelper.search_contractor(request)

    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):
@@ -67,136 +44,10 @@ def contractor_report(contractor_id):
        **data
    )

-class FilePathData:
-    downloadReportFolder = "static/download"
-
+# ---------------- Contractor Download Report by 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
+    return ReportHelper().download_report(contractor_id=contractor_id)
  
-        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)
-        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,100 +1,94 @@
-# controllers/subcontractor_controller.py
-
 from flask import Blueprint, render_template, request, redirect, url_for, jsonify
 from flask_login import login_required
 from model.Subcontractor import Subcontractor
-from model.Log import LogHelper 
+from model.Utilities import HtmlHelper, ResponseHandler
+
+
 subcontractor_bp = Blueprint('subcontractor', __name__)

-# Simple replacements for missing HtmlHelper and ResponseHandler
-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
+# ----------------------------------------------------------
@subcontractor_bp.route('/subcontractor', methods=['GET', 'POST'])
@login_required
 def subcontract():
-    subcontractor = []

+    sub = Subcontractor()
+
+    # ---------------- GET ----------------
    if request.method == 'GET':
-        subcontractor, error = Subcontractor.get_all_subcontractors()
-        if error:
-            return HtmlHelper.json_response(ResponseHandler.fetch_failure("Subcontractor"), 500)
+        subcontractor = sub.GetAllSubcontractors(request)

+        if not sub.isSuccess:
+            return HtmlHelper.json_response(
+                ResponseHandler.fetch_failure("Subcontractor"), 500
+            )
+
+        return render_template('add_subcontractor.html', subcontractor=subcontractor)
+
+    # ---------------- POST (ADD) ----------------
    if request.method == 'POST':
-        contractor_data = {
-            'Contractor_Name': request.form['Contractor_Name'],
-            'Address': request.form['Address'],
-            'Mobile_No': request.form['Mobile_No'],
-            'PAN_No': request.form['PAN_No'],
-            'Email': request.form['Email'],
-            'Gender': request.form['Gender'],
-            'GST_Registration_Type': request.form['GST_Registration_Type'],
-            'GST_No': request.form['GST_No'],
-            'Contractor_password': request.form['Contractor_password'],
-        }
-        error = Subcontractor.save_subcontractor(contractor_data)
-        if error:
-            return HtmlHelper.json_response(ResponseHandler.add_failure("Subcontractor"), 500)
-        subcontractor, _ = Subcontractor.get_all_subcontractors()
+
+        sub.AddSubcontractor(request)
+
+        if not sub.isSuccess:
+            return HtmlHelper.json_response(
+                ResponseHandler.add_failure("Subcontractor"), 500
+            )
+
+        # Reload list after insert
+        subcontractor = sub.GetAllSubcontractors(request)

        return render_template('add_subcontractor.html', subcontractor=subcontractor)


+# ----------------------------------------------------------
+# EDIT
+# ----------------------------------------------------------
@subcontractor_bp.route('/edit_subcontractor/<int:id>', methods=['GET', 'POST'])
@login_required
 def edit_subcontractor(id):
-    subcontractor, error = Subcontractor.get_subcontractor_by_id(id)
-    if error:
-        return HtmlHelper.json_response(ResponseHandler.fetch_failure("Subcontractor"), 500)
-    if not subcontractor:
-        return HtmlHelper.json_response(ResponseHandler.fetch_failure("Subcontractor"), 404)

+    sub = Subcontractor()
+
+    # Fetch data
+    subcontractor = sub.GetSubcontractorByID(id)
+
+    if not subcontractor:
+        return HtmlHelper.json_response(
+            ResponseHandler.fetch_failure("Subcontractor"), 404
+        )
+
+    # ---------------- POST (UPDATE) ----------------
    if request.method == 'POST':
-        updated_data = {
-            'Contractor_Name': request.form['Contractor_Name'],
-            'Address': request.form['Address'],
-            'Mobile_No': request.form['Mobile_No'],
-            'PAN_No': request.form['PAN_No'],
-            'Email': request.form['Email'],
-            'Gender': request.form['Gender'],
-            'GST_Registration_Type': request.form['GST_Registration_Type'],
-            'GST_No': request.form['GST_No'],
-            'Contractor_password': request.form['Contractor_password'],
-        }
-        error = Subcontractor.update_subcontractor(id, updated_data)
-        if error:
-            return HtmlHelper.json_response(ResponseHandler.update_failure("Subcontractor"), 500)
+
+        sub.EditSubcontractor(request, id)
+
+        if not sub.isSuccess:
+            return HtmlHelper.json_response(
+                ResponseHandler.update_failure("Subcontractor"), 500
+            )
+
        return redirect(url_for('subcontractor.subcontract'))

    return render_template('edit_subcontractor.html', subcontractor=subcontractor)


+# ----------------------------------------------------------
+# DELETE
+# ----------------------------------------------------------
@subcontractor_bp.route('/deleteSubContractor/<int:id>', methods=['GET', 'POST'])
@login_required
 def deleteSubContractor(id):
-    error, affected_rows = Subcontractor.delete_subcontractor(id)
-    if error:
-        return HtmlHelper.json_response(ResponseHandler.delete_failure("Subcontractor"), 500)
-    if affected_rows == 0:
-        return HtmlHelper.json_response(ResponseHandler.fetch_failure("Subcontractor not deleted"), 404)
+
+    sub = Subcontractor()
+
+    sub.DeleteSubcontractor(request, id)
+
+    if not sub.isSuccess:
+        return HtmlHelper.json_response(
+            ResponseHandler.delete_failure("Subcontractor"), 500
+        )
+
    return redirect(url_for('subcontractor.subcontract'))
--- a/controllers/village_controller.py
+++ b/controllers/village_controller.py
@@ -1,170 +1,4 @@
-# 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
-
-# # Create Blueprint
-# village_bp = Blueprint('village', __name__)
-
-
-# # ------------------------- Add Village -------------------------
-# @village_bp.route('/add_village', methods=['GET', 'POST'])
-# @login_required
-# 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(
-#         'add_village.html',
-#         states=states,
-#         villages=villages
-#     )
-
-
-# # ------------------------- Fetch Districts -------------------------
-# @village_bp.route('/get_districts/<int:state_id>')
-# @login_required
-# def get_districts(state_id):
-
-#     connection = config.get_db_connection()
-#     cursor = connection.cursor()
-
-#     cursor.callproc("GetDistrictByStateID", [state_id])
-
-#     districts = []
-
-#     for rs in cursor.stored_results():
-#         districts = rs.fetchall()
-
-#     cursor.close()
-#     connection.close()
-
-#     district_list = []
-
-#     for d in districts:
-#         district_list.append({
-#             "id": d[0],
-#             "name": d[1]
-#         })
-
-#     return jsonify(district_list)
-
-
-# # ------------------------- Fetch Blocks -------------------------
-# @village_bp.route('/get_blocks/<int:district_id>')
-# @login_required
-# def get_blocks(district_id):
-
-#     connection = config.get_db_connection()
-#     cursor = connection.cursor()
-
-#     cursor.callproc("GetBlocksByDistrictID", [district_id])
-
-#     blocks = []
-
-#     for rs in cursor.stored_results():
-#         blocks = rs.fetchall()
-
-#     cursor.close()
-#     connection.close()
-
-#     block_list = []
-
-#     for b in blocks:
-#         block_list.append({
-#             "id": b[0],
-#             "name": b[1]
-#         })
-
-#     return jsonify(block_list)
-
-
-# # ------------------------- 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")
-#     else:
-#         flash(village.resultMessage, "success")
-
-#     return redirect(url_for('village.add_village'))
-
-
-# # ------------------------- Edit Village -------------------------
-# @village_bp.route('/edit_village/<int:village_id>', methods=['GET', 'POST'])
-# @login_required
-# def edit_village(village_id):
-
-#     village = Village()
-
-#     if request.method == 'POST':
-
-#         village.EditVillage(request=request, village_id=village_id)
-
-#         if village.isSuccess:
-#             flash(village.resultMessage, "success")
-#             return redirect(url_for('village.add_village'))
-
-#         else:
-#             flash(village.resultMessage, "error")
-
-#             village_data = village.GetVillageByID(id=village_id)
-#             blocks = village.GetAllBlocks()
-
-#             return render_template(
-#                 'edit_village.html',
-#                 village_data=village_data,
-#                 blocks=blocks
-#             )
-
-#     else:
-
-#         village_data = village.GetVillageByID(request=request, 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 = []
-
-#         return render_template(
-#             'edit_village.html',
-#             village_data=village_data,
-#             blocks=blocks
-#         )



@@ -249,17 +83,29 @@ def check_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)

-    flash(village.resultMessage, "success" if village.isSuccess else "error")
-    return redirect(url_for('village.add_village'))
+    # ✅ 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:
+        # 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'])
--- 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,76 +1,5 @@
-# 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)
-#         self.fetchData()
-
-#     def fetchData(self):
-#         try:
-#             connection = config.get_db_connection()
-#             cursor = connection.cursor(dictionary=True, buffered=True)
-#             print("here", flush=True)
-            
-#             cursor.callproc('GetContractorInfoById', [self.ID])
-#             for result in cursor.stored_results():
-#                 self.contInfo = result.fetchone() 
-            
-#             print(self.contInfo,flush=True)
-#         finally:
-#             cursor.close()
-#             connection.close()
-
-#     def fetchalldata(self):
-
-#         try:
-#             connection = config.get_db_connection()
-#             cursor = connection.cursor(dictionary=True, buffered=True)
-#             print("here", flush=True)
-            
-
-#                # ---------------- Hold Types ----------------
-#             cursor = connection.cursor(dictionary=True)
-
-#             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
-
-#         finally:
-#             cursor.close()
-#             connection.close()
-

 from mysql.connector import Error
 import config
--- 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)
+    
+    # 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']
+            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
+            float(g[3])  # Basic_Amount at index 3
+            for g in gst_rows
+            if g[3] is not None
        }

+        # Filter unreleased invoices
        unreleased = []
-
        for inv in invoices:
-
            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
+            match_by_gst_amount = inv['GST_SD_Amount'] in gst_basic_amounts

            if not (match_by_invoice or match_by_gst_amount):
                unreleased.append(inv)

        return unreleased
-
-        finally:
-            cursor.close()
-            connection.close()
-            
--- a/model/ItemCRUD.py
+++ b/model/ItemCRUD.py
@@ -6,7 +6,6 @@ import config
 import re
 import mysql.connector

-
 # ----------------------------------------------------------
 # Mapping Class
 # ----------------------------------------------------------
@@ -21,10 +20,13 @@ class itemCRUDMapping:
            self.name = "State"
        elif itemType is ItemCRUDType.HoldType:
            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
 # ----------------------------------------------------------
@@ -54,12 +56,16 @@ class ItemCRUD:
            connection.commit()

            self.isSuccess = True
-            self.resultMessage = ResponseHandler.delete_success(self.itemCRUDMapping.name)['message']
+            self.resultMessage = HtmlHelper.json_response(
+                ResponseHandler.delete_success(self.itemCRUDMapping.name), 200
+            )

        except mysql.connector.Error as e:
            print(f"Error deleting {self.itemCRUDMapping.name}: {e}")
            self.isSuccess = False
-            self.resultMessage = ResponseHandler.delete_failure(self.itemCRUDMapping.name)['message']
+            self.resultMessage = HtmlHelper.json_response(
+                ResponseHandler.delete_failure(self.itemCRUDMapping.name), 500
+            )

        finally:
            cursor.close()
@@ -68,7 +74,7 @@ class ItemCRUD:
    # ----------------------------------------------------------
    # ADD
    # ----------------------------------------------------------
-    def AddItem(self, request, parentid, childname, storedprocfetch, storedprocadd):
+    def AddItem(self, request, parentid=None, childname=None, storedprocfetch=None, storedprocadd=None, data=None):

        connection = config.get_db_connection()
        if not connection:
@@ -82,31 +88,21 @@ class ItemCRUD:

        LogHelper.log_action(
            f"Add {self.itemCRUDMapping.name}",
-            f"User {current_user.id} adding '{childname}'"
+            f"User {current_user.id} adding '{childname if childname else (data.get('Contractor_Name') if data else '')}'"
        )

-        # Validation
-        if not re.match(RegEx.patternAlphabetOnly, childname):
-            self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(
-                ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
-            )
-            return
-
        try:
-            # Call check procedure
-            if parentid is None:
-                cursor.callproc(storedprocfetch, (childname,))
-            else:
-                cursor.callproc(storedprocfetch, (childname, parentid))
+            # ======================================================
+            # GSTRelease MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "GSTRelease" and data:

-            # ✅ FIX: initialize variable
+                # 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()
-
-            # Check duplicate
                    if existing_item:
                        self.isSuccess = False
                        self.resultMessage = HtmlHelper.json_response(
@@ -114,14 +110,92 @@ class ItemCRUD:
                        )
                        return

-            # Insert
+                # 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:
+
+                cursor.callproc(storedprocfetch, (data['Contractor_Name'],))
+                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
+
+                cursor.callproc(storedprocadd, (
+                    data['Contractor_Name'],
+                    data['Address'],
+                    data['Mobile_No'],
+                    data['PAN_No'],
+                    data['Email'],
+                    data['Gender'],
+                    data['GST_Registration_Type'],
+                    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 SINGLE-FIELD (Village / Block / State)
+            # ======================================================
+            if not re.match(RegEx.allPattern, childname):
+                self.isSuccess = False
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
+                )
+                return
+
+            if parentid is None:
+                cursor.callproc(storedprocfetch, (childname,))
+            else:
+                cursor.callproc(storedprocfetch, (childname, parentid))
+
+            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
+
            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
@@ -141,7 +215,7 @@ class ItemCRUD:
    # ----------------------------------------------------------
    # EDIT
    # ----------------------------------------------------------
-    def EditItem(self, request, childid, parentid, childname, storedprocupdate):
+    def EditItem(self, request, childid, parentid=None, childname=None, storedprocupdate=None, data=None):

        connection = config.get_db_connection()
        cursor = connection.cursor()
@@ -151,19 +225,67 @@ class ItemCRUD:
            f"User {current_user.id} edited '{childid}'"
        )

-        if not re.match(RegEx.patternAlphabetOnly, childname):
+        try:
+            # ======================================================
+            # GSTRelease MULTI-FIELD
+            # ======================================================
+            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'],
+                    data['Address'],
+                    data['Mobile_No'],
+                    data['PAN_No'],
+                    data['Email'],
+                    data['Gender'],
+                    data['GST_Registration_Type'],
+                    data['GST_No'],
+                    data['Contractor_password']
+                ))
+                connection.commit()
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.update_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # NORMAL SINGLE-FIELD
+            # ======================================================
+            if not re.match(RegEx.allPattern, childname):
                self.isSuccess = False
                self.resultMessage = ResponseHandler.update_failure(self.itemCRUDMapping.name)['message']
                return

-        try:
            if parentid is None:
                cursor.callproc(storedprocupdate, (childid, childname))
            else:
                cursor.callproc(storedprocupdate, (childid, parentid, childname))

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

@@ -185,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
@@ -206,7 +323,6 @@ class ItemCRUD:
                ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
            )
            return []
-
        finally:
            cursor.close()
            connection.close()
@@ -224,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()
@@ -250,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
            )
@@ -261,9 +374,7 @@ class ItemCRUD:
            else:
                cursor.callproc(storedprocfetch, (childname, parentid))

-            # ✅ FIX
            existing_item = None
-
            for rs in cursor.stored_results():
                existing_item = rs.fetchone()

@@ -281,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,16 +69,13 @@ 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:
--- a/model/PmcReport.py
+++ b/model/PmcReport.py
@@ -1,11 +1,12 @@
-import os
 import openpyxl
 from openpyxl.styles import Font, PatternFill
-from decimal import Decimal
-from datetime import datetime
 import config
 from flask_login import current_user
 from model.Log import LogHelper
+
+from model.Report import ReportHelper
+from model.FolderAndFile import FolderAndFile
+
 class PmcReport:

    @staticmethod
@@ -16,8 +17,9 @@ class PmcReport:

        try:

-            cursor.callproc("GetContractorInfoByPmcNo", (pmc_no,))
-            pmc_info = next(cursor.stored_results()).fetchone()
+            # cursor.callproc("GetContractorInfoByPmcNo", (pmc_no,))
+            # pmc_info = next(cursor.stored_results()).fetchone()
+            pmc_info = ReportHelper.execute_sp(cursor, 'GetContractorInfoByPmcNo', [pmc_no], True)

            if not pmc_info:
                return None
@@ -31,15 +33,12 @@ class PmcReport:
            invoices = []
            hold_amount_total = 0
            if hold_type_ids:
-
                    hold_type_ids_str = ",".join(map(str, hold_type_ids))
-
                    cursor.callproc(
                        'GetInvoices_WithHold',
                        [pmc_no, pmc_info["Contractor_Id"], hold_type_ids_str]
                    )
            else:
-
                    cursor.callproc(
                        'GetInvoices_NoHold',
                        [pmc_no, pmc_info["Contractor_Id"]]
@@ -54,33 +53,42 @@ class PmcReport:


            # GST RELEASE
-            cursor.callproc('GetGSTReleaseByPMC', [pmc_no])
-            gst_rel = []
-            for result in cursor.stored_results():
-                gst_rel = result.fetchall()
+            # cursor.callproc('GetGSTReleaseByPMC', [pmc_no])
+            # gst_rel = []
+            # for result in cursor.stored_results():
+            #     gst_rel = result.fetchall()
+            
+            gst_rel = ReportHelper.execute_sp(cursor, 'GetGSTReleaseByPMC', [pmc_no])

            total_gst_basic = sum(row.get('basic_amount', 0) or 0 for row in gst_rel)
            total_gst_final = sum(row.get('final_amount', 0) or 0 for row in gst_rel)

            # ---------------- HOLD RELEASE ----------------
-            cursor.callproc('GetHoldReleaseByPMC', [pmc_no])
-            hold_release = []
-            for result in cursor.stored_results():
-                hold_release = result.fetchall()
+            # cursor.callproc('GetHoldReleaseByPMC', [pmc_no])
+            # hold_release = []
+            # for result in cursor.stored_results():
+            #     hold_release = result.fetchall()

+            hold_release = ReportHelper.execute_sp(cursor, 'GetHoldReleaseByPMC', [pmc_no])

            # ---------------- CREDIT NOTE ----------------
-            cursor.callproc('GetCreditNoteByPMC', [pmc_no])
-            credit_note = []
-            for result in cursor.stored_results():
-                credit_note = result.fetchall()
+            # cursor.callproc('GetCreditNoteByPMC', [pmc_no])
+            # credit_note = []
+            # for result in cursor.stored_results():
+            #     credit_note = result.fetchall()
+            
+            credit_note = ReportHelper.execute_sp(cursor, 'GetCreditNoteByPMC', [pmc_no])
+
+            payments = ReportHelper.execute_sp(cursor, 'GetPaymentsByPMC', [pmc_no])


            # ---------------- PAYMENTS ----------------
-            cursor.callproc('GetPaymentsByPMC', [pmc_no])
-            payments = []
-            for result in cursor.stored_results():
-                payments = result.fetchall()
+            # cursor.callproc('GetPaymentsByPMC', [pmc_no])
+            # payments = []
+            # for result in cursor.stored_results():
+            #     payments = result.fetchall()
+
+            

            total_pay_amount = sum(row.get('Payment_Amount', 0) or 0 for row in payments)
            total_pay_total = sum(row.get('Total_amount', 0) or 0 for row in payments)
@@ -125,109 +133,73 @@ class PmcReport:
    def download_pmc_report(pmc_no):

        connection = config.get_db_connection()
-        output_folder = "static/download"
-        output_file = os.path.join(output_folder, f"PMC_Report_{pmc_no}.xlsx")
-
-        if not os.path.exists(output_folder):
-            os.makedirs(output_folder)
+        if not connection:
+            return None

        cursor = connection.cursor(dictionary=True)

        try:
+            # filename
+            filename = f"PMC_Report_{pmc_no}.xlsx"

-            cursor.callproc('GetContractorDetailsByPMC', [pmc_no])
-            contractor_info = next(cursor.stored_results()).fetchone()
+            output_folder = FolderAndFile.get_download_folder()
+            output_file = FolderAndFile.get_download_path(filename)
+
+            # ================= DATA FETCH =================
+
+            contractor_info = ReportHelper.execute_sp(cursor, 'GetContractorDetailsByPMC', [pmc_no], "one")

            if not contractor_info:
                return None

-            cursor.callproc('GetHoldTypesByContractor', [contractor_info["Contractor_Id"]])
-            hold_types = next(cursor.stored_results()).fetchall()
+            hold_types = ReportHelper.execute_sp(cursor, 'GetHoldTypesByContractor', [contractor_info["Contractor_Id"]])

            hold_type_map = {ht['hold_type_id']: ht['hold_type'] for ht in hold_types}

-            cursor.callproc('GetInvoicesAndGstReleaseByPmcNo', [pmc_no])
-            invoices = next(cursor.stored_results()).fetchall()
+            invoices = ReportHelper.execute_sp(cursor, 'GetInvoicesAndGstReleaseByPmcNo', [pmc_no])

-            cursor.callproc('GetCreditNoteByContractor',[contractor_info["Contractor_Id"]])
+            credit_notes = ReportHelper.execute_sp(cursor, 'GetCreditNoteByContractor', [contractor_info["Contractor_Id"]])

-            credit_notes = []
-            for result in cursor.stored_results():
-                credit_notes = result.fetchall()
+            hold_amounts = ReportHelper.execute_sp(cursor, 'GetHoldAmountsByContractor', [contractor_info["Contractor_Id"]])

-            credit_note_map = {}
-            for cn in credit_notes:
-                key = (cn["PMC_No"], cn["Invoice_No"])
-                credit_note_map.setdefault(key, []).append(cn)
+            all_payments = ReportHelper.execute_sp(cursor, 'GetAllPaymentsByPMC', [pmc_no])

-            cursor.callproc('GetHoldAmountsByContractor', [contractor_info["Contractor_Id"]])
-            hold_amounts = next(cursor.stored_results()).fetchall()
+            gst_releases = ReportHelper.execute_sp(cursor, 'GetGSTReleaseDetailsByPMC', [pmc_no])
+
+            # ================= DATA MAPPING =================

            hold_data = {}
            for h in hold_amounts:
                hold_data.setdefault(h['Invoice_Id'], {})[h['hold_type_id']] = h['hold_amount']

-            cursor.callproc('GetAllPaymentsByPMC', [pmc_no])
-            all_payments = next(cursor.stored_results()).fetchall()
-
            payments_map = {}
-            extra_payments = []
-
            for pay in all_payments:
                if pay['invoice_no']:
                    payments_map.setdefault(pay['invoice_no'], []).append(pay)
-                else:
-                    extra_payments.append(pay)
-
-          # ---------------- GST RELEASE DETAILS ----------------
-            cursor.callproc('GetGSTReleaseDetailsByPMC', [pmc_no])
-
-            gst_releases = []
-            for result in cursor.stored_results():
-                gst_releases = result.fetchall()
-
-            gst_release_map = {}
-
-            for gr in gst_releases:
-
-                invoice_nos = []
-
-                if gr['Invoice_No']:
-
-                    cleaned = gr['Invoice_No'].replace(' ', '')
-
-                    if '&' in cleaned:
-                        invoice_nos = cleaned.split('&')
-
-                    elif ',' in cleaned:
-                        invoice_nos = cleaned.split(',')
-
-                    else:
-                        invoice_nos = [cleaned]
-
-                for inv_no in invoice_nos:
-                    gst_release_map.setdefault(inv_no, []).append(gr)

+            # ================= LOG =================
            LogHelper.log_action(
                "Download PMC Report",
                f"User {current_user.id} Download PMC Report '{pmc_no}'"
            )

+            # ================= EXCEL =================
            workbook = openpyxl.Workbook()
            sheet = workbook.active
            sheet.title = "PMC Report"

+            # HEADER INFO
            sheet.append(["", "", "Laxmi Civil Engineering Services PVT. LTD."])
-            sheet.append(["Contractor Name", contractor_info["Contractor_Name"], "", "GST No", contractor_info["GST_No"], "", "GST Type", contractor_info["GST_Registration_Type"]])
-            sheet.append(["State", contractor_info["State_Name"], "", "PAN No", contractor_info["PAN_No"], "", "Address", contractor_info["Address"]])
-            sheet.append(["District", contractor_info["District_Name"], "", "Mobile No", contractor_info["Mobile_No"]])
-            sheet.append(["Block", contractor_info["Block_Name"], "", "Email", contractor_info["Email"]])
+            sheet.append(["Contractor Name", contractor_info["Contractor_Name"]])
+            sheet.append(["State", contractor_info["State_Name"]])
+            sheet.append(["District", contractor_info["District_Name"]])
+            sheet.append(["Block", contractor_info["Block_Name"]])
            sheet.append([])

            base_headers = [
                "PMC No","Village","Work Type","Invoice Details","Invoice Date","Invoice No",
-                "Basic Amount","Debit","After Debit Amount","GST (18%)","Amount","TDS (1%)",
-                "SD (5%)","On Commission","Hydro Testing","GST SD Amount"
+                "Basic Amount","Debit","After Debit Amount","GST","Amount","TDS",
+                "SD","On Commission","Hydro Testing","GST SD Amount"
            ]

            hold_headers = [ht['hold_type'] for ht in hold_types]
@@ -236,42 +208,53 @@ class PmcReport:
                "Final Amount","Payment Amount","TDS Payment","Total Paid","UTR"
            ]

-            sheet.append(base_headers + hold_headers + payment_headers)
-
-            header_fill = PatternFill(start_color="ADD8E6",end_color="ADD8E6",fill_type="solid")
-            header_font = Font(bold=True)
+            headers = base_headers + hold_headers + payment_headers
+            sheet.append(headers)

+            # STYLE
            for cell in sheet[sheet.max_row]:
-                cell.font = header_font
-                cell.fill = header_fill
+                cell.font = Font(bold=True)

+            # DATA
            seen_invoices = set()
-            processed_payments = set()

            for inv in invoices:

                invoice_no = inv["Invoice_No"]
                payments = payments_map.get(invoice_no, [])

-                if invoice_no not in seen_invoices:
+                if invoice_no in seen_invoices:
+                    continue

                seen_invoices.add(invoice_no)
+
                first_payment = payments[0] if payments else None

                row = [
-                        pmc_no, inv["Village_Name"], inv["Work_Type"],
-                        inv["Invoice_Details"], inv["Invoice_Date"], invoice_no,
-                        inv["Basic_Amount"], inv["Debit_Amount"],
-                        inv["After_Debit_Amount"], inv["GST_Amount"],
-                        inv["Amount"], inv["TDS_Amount"], inv["SD_Amount"],
-                        inv["On_Commission"], inv["Hydro_Testing"], inv["GST_SD_Amount"]
+                    pmc_no,
+                    inv["Village_Name"],
+                    inv["Work_Type"],
+                    inv["Invoice_Details"],
+                    inv["Invoice_Date"],
+                    invoice_no,
+                    inv["Basic_Amount"],
+                    inv["Debit_Amount"],
+                    inv["After_Debit_Amount"],
+                    inv["GST_Amount"],
+                    inv["Amount"],
+                    inv["TDS_Amount"],
+                    inv["SD_Amount"],
+                    inv["On_Commission"],
+                    inv["Hydro_Testing"],
+                    inv["GST_SD_Amount"]
                ]

+                # HOLD DATA
                invoice_holds = hold_data.get(inv["Invoice_Id"], {})
-
                for ht_id in hold_type_map.keys():
                    row.append(invoice_holds.get(ht_id, ""))

+                # PAYMENT DATA
                row += [
                    inv["Final_Amount"],
                    first_payment["Payment_Amount"] if first_payment else "",
@@ -282,12 +265,192 @@ class PmcReport:

                sheet.append(row)

+            # AUTO WIDTH
+            for col in sheet.columns:
+                max_len = max((len(str(cell.value)) for cell in col if cell.value), default=0)
+                sheet.column_dimensions[col[0].column_letter].width = max_len + 2
+
+            # SAVE
            workbook.save(output_file)
            workbook.close()

-            return output_folder, f"PMC_Report_{pmc_no}.xlsx"
+            return output_folder, filename
+
+        except Exception as e:
+            print(f"Error generating PMC report: {e}")
+            return None

        finally:
-
            cursor.close()
            connection.close()
+
+    # @staticmethod
+    # def download_pmc_report(pmc_no):
+
+    #     connection = config.get_db_connection()
+    #     cursor = connection.cursor(dictionary=True)
+
+    #     # output_folder = "static/download"
+    #     # output_file = os.path.join(output_folder, f"PMC_Report_{pmc_no}.xlsx")
+    #     output_folder = FolderAndFile.get_download_folder
+    #     filename = f"PMC_Report_{pmc_no}.xlsx"
+    #     output_file = FolderAndFile.get_download_path(filename)
+
+    #     try:
+
+    #         cursor.callproc('GetContractorDetailsByPMC', [pmc_no])
+    #         contractor_info = next(cursor.stored_results()).fetchone()
+
+    #         if not contractor_info:
+    #             return None
+
+    #         cursor.callproc('GetHoldTypesByContractor', [contractor_info["Contractor_Id"]])
+    #         hold_types = next(cursor.stored_results()).fetchall()
+
+    #         hold_type_map = {ht['hold_type_id']: ht['hold_type'] for ht in hold_types}
+
+    #         cursor.callproc('GetInvoicesAndGstReleaseByPmcNo', [pmc_no])
+    #         invoices = next(cursor.stored_results()).fetchall()
+
+    #         cursor.callproc('GetCreditNoteByContractor',[contractor_info["Contractor_Id"]])
+
+    #         credit_notes = []
+    #         for result in cursor.stored_results():
+    #             credit_notes = result.fetchall()
+
+    #         credit_note_map = {}
+    #         for cn in credit_notes:
+    #             key = (cn["PMC_No"], cn["Invoice_No"])
+    #             credit_note_map.setdefault(key, []).append(cn)
+
+    #         cursor.callproc('GetHoldAmountsByContractor', [contractor_info["Contractor_Id"]])
+    #         hold_amounts = next(cursor.stored_results()).fetchall()
+
+    #         hold_data = {}
+    #         for h in hold_amounts:
+    #             hold_data.setdefault(h['Invoice_Id'], {})[h['hold_type_id']] = h['hold_amount']
+
+    #         cursor.callproc('GetAllPaymentsByPMC', [pmc_no])
+    #         all_payments = next(cursor.stored_results()).fetchall()
+
+    #         payments_map = {}
+    #         extra_payments = []
+
+    #         for pay in all_payments:
+    #             if pay['invoice_no']:
+    #                 payments_map.setdefault(pay['invoice_no'], []).append(pay)
+    #             else:
+    #                 extra_payments.append(pay)
+
+    #       # ---------------- GST RELEASE DETAILS ----------------
+    #         cursor.callproc('GetGSTReleaseDetailsByPMC', [pmc_no])
+
+    #         gst_releases = []
+    #         for result in cursor.stored_results():
+    #             gst_releases = result.fetchall()
+
+    #         gst_release_map = {}
+
+    #         for gr in gst_releases:
+
+    #             invoice_nos = []
+
+    #             if gr['Invoice_No']:
+
+    #                 cleaned = gr['Invoice_No'].replace(' ', '')
+
+    #                 if '&' in cleaned:
+    #                     invoice_nos = cleaned.split('&')
+
+    #                 elif ',' in cleaned:
+    #                     invoice_nos = cleaned.split(',')
+
+    #                 else:
+    #                     invoice_nos = [cleaned]
+
+    #             for inv_no in invoice_nos:
+    #                 gst_release_map.setdefault(inv_no, []).append(gr)
+
+    #         LogHelper.log_action(
+    #             "Download PMC Report",
+    #             f"User {current_user.id} Download PMC Report '{pmc_no}'"
+    #         )
+
+    #         workbook = openpyxl.Workbook()
+    #         sheet = workbook.active
+    #         sheet.title = "PMC Report"
+
+    #         sheet.append(["", "", "Laxmi Civil Engineering Services PVT. LTD."])
+    #         sheet.append(["Contractor Name", contractor_info["Contractor_Name"], "", "GST No", contractor_info["GST_No"], "", "GST Type", contractor_info["GST_Registration_Type"]])
+    #         sheet.append(["State", contractor_info["State_Name"], "", "PAN No", contractor_info["PAN_No"], "", "Address", contractor_info["Address"]])
+    #         sheet.append(["District", contractor_info["District_Name"], "", "Mobile No", contractor_info["Mobile_No"]])
+    #         sheet.append(["Block", contractor_info["Block_Name"], "", "Email", contractor_info["Email"]])
+    #         sheet.append([])
+
+    #         base_headers = [
+    #             "PMC No","Village","Work Type","Invoice Details","Invoice Date","Invoice No",
+    #             "Basic Amount","Debit","After Debit Amount","GST (18%)","Amount","TDS (1%)",
+    #             "SD (5%)","On Commission","Hydro Testing","GST SD Amount"
+    #         ]
+
+    #         hold_headers = [ht['hold_type'] for ht in hold_types]
+
+    #         payment_headers = [
+    #             "Final Amount","Payment Amount","TDS Payment","Total Paid","UTR"
+    #         ]
+
+    #         sheet.append(base_headers + hold_headers + payment_headers)
+
+    #         header_fill = PatternFill(start_color="ADD8E6",end_color="ADD8E6",fill_type="solid")
+    #         header_font = Font(bold=True)
+
+    #         for cell in sheet[sheet.max_row]:
+    #             cell.font = header_font
+    #             cell.fill = header_fill
+
+    #         seen_invoices = set()
+    #         processed_payments = set()
+
+    #         for inv in invoices:
+
+    #             invoice_no = inv["Invoice_No"]
+    #             payments = payments_map.get(invoice_no, [])
+
+    #             if invoice_no not in seen_invoices:
+
+    #                 seen_invoices.add(invoice_no)
+    #                 first_payment = payments[0] if payments else None
+
+    #                 row = [
+    #                     pmc_no, inv["Village_Name"], inv["Work_Type"],
+    #                     inv["Invoice_Details"], inv["Invoice_Date"], invoice_no,
+    #                     inv["Basic_Amount"], inv["Debit_Amount"],
+    #                     inv["After_Debit_Amount"], inv["GST_Amount"],
+    #                     inv["Amount"], inv["TDS_Amount"], inv["SD_Amount"],
+    #                     inv["On_Commission"], inv["Hydro_Testing"], inv["GST_SD_Amount"]
+    #                 ]
+
+    #                 invoice_holds = hold_data.get(inv["Invoice_Id"], {})
+
+    #                 for ht_id in hold_type_map.keys():
+    #                     row.append(invoice_holds.get(ht_id, ""))
+
+    #                 row += [
+    #                     inv["Final_Amount"],
+    #                     first_payment["Payment_Amount"] if first_payment else "",
+    #                     first_payment["TDS_Payment_Amount"] if first_payment else "",
+    #                     first_payment["Total_amount"] if first_payment else "",
+    #                     first_payment["UTR"] if first_payment else ""
+    #                 ]
+
+    #                 sheet.append(row)
+
+    #         workbook.save(output_file)
+    #         workbook.close()
+
+    #         return output_folder, filename
+
+    #     finally:
+
+    #         cursor.close()
+    #         connection.close()
--- a/model/Report.py
+++ b/model/Report.py
@@ -1,15 +1,68 @@
 import config
 from datetime import datetime
+from flask import send_file
+import openpyxl
+from openpyxl.styles import Font
+
+from model.FolderAndFile import FolderAndFile

 class ReportHelper:
+    isSuccess = False
+    resultMessage = ""
+    data=[]
+
+    def __init__(self):
+        self.isSuccess = False
+        self.resultMessage = ""
+        self.data = []

    @staticmethod
-    def search_contractor(subcontractor_name, pmc_no, state, district, block, village, year_from, year_to):
+    def execute_sp(cursor, proc_name, params=[], fetch_one=False):
+        cursor.callproc(proc_name, params)
+        return (
+            ReportHelper.fetch_one_result(cursor)
+            if fetch_one else
+            ReportHelper.fetch_all_results(cursor)
+        )
+
+    @staticmethod
+    def fetch_all_results(cursor):
+        data = []
+        for result in cursor.stored_results():
+            data = result.fetchall()
+        return data
+
+
+    @staticmethod
+    def fetch_one_result(cursor):
+        data = None
+        for result in cursor.stored_results():
+            data = result.fetchone()
+        return data
+
+
+    @staticmethod
+    def search_contractor(request):
+        subcontractor_name = request.form.get("subcontractor_name")
+        pmc_no = request.form.get("pmc_no")
+        state = request.form.get("state")
+        district = request.form.get("district")
+        block = request.form.get("block")
+        village = request.form.get("village")
+        year_from = request.form.get("year_from")
+        year_to = request.form.get("year_to")

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

-        cursor.callproc("search_contractor_info", [
+        try:
+            data = ReportHelper.execute_sp(
+                cursor,
+                "search_contractor_info",
+                [
                    subcontractor_name or None,
                    pmc_no or None,
                    state or None,
@@ -18,12 +71,14 @@ class ReportHelper:
                    village or None,
                    year_from or None,
                    year_to or None
-        ])
+                ]
+            )

+        except Exception as e:
+            print(f"Error in search_contractor: {e}")
            data = []
-        for result in cursor.stored_results():
-            data = result.fetchall()

+        finally:
            cursor.close()
            connection.close()

@@ -32,47 +87,24 @@ class ReportHelper:
    
    @staticmethod
    def get_contractor_report(contractor_id):
-
            connection = config.get_db_connection()
            cursor = connection.cursor(dictionary=True, buffered=True)
        
-
            try:
-                # Contractor Info
-                cursor.callproc('GetContractorInfo', [contractor_id])
-                for result in cursor.stored_results():
-                    contInfo = result.fetchone()
-
+                # Contractor Info (only one fetch)
+                contInfo = ReportHelper.execute_sp(cursor, 'GetContractorInfo', [contractor_id], True)
                # Hold Types
-                cursor.callproc('GetContractorHoldTypes', [contractor_id])
-                for result in cursor.stored_results():
-                    hold_types = result.fetchall()
-
+                hold_types = ReportHelper.execute_sp(cursor, 'GetContractorHoldTypes', [contractor_id])
                # Invoices
-                cursor.callproc('GetContractorInvoices', [contractor_id])
-                for result in cursor.stored_results():
-                    invoices = result.fetchall()
-
+                invoices = ReportHelper.execute_sp(cursor, 'GetContractorInvoices', [contractor_id])
                # GST Release
-                cursor.callproc('GetGSTRelease', [contractor_id])
-                for result in cursor.stored_results():
-                    gst_rel = result.fetchall()
-
+                gst_rel = ReportHelper.execute_sp(cursor, 'GetGSTRelease', [contractor_id])
                # Hold Release
-                cursor.callproc('GetHoldRelease', [contractor_id])
-                for result in cursor.stored_results():
-                    hold_release = result.fetchall()
-
+                hold_release = ReportHelper.execute_sp(cursor, 'GetHoldRelease', [contractor_id])
                # Credit Note
-                cursor.callproc('GetCreditNote', [contractor_id])
-                for result in cursor.stored_results():
-                    credit_note = result.fetchall()
-
+                credit_note = ReportHelper.execute_sp(cursor, 'GetCreditNote', [contractor_id])
                # Payments
-                cursor.callproc('GetPayments', [contractor_id])
-                for result in cursor.stored_results():
-                    payments = result.fetchall()
-
+                payments = ReportHelper.execute_sp(cursor, 'GetPayments', [contractor_id])

                # Totals
                total = {
@@ -114,3 +146,130 @@ class ReportHelper:
                "total": total,
                "current_date": current_date
            }
+
+    @staticmethod
+    def download_report(contractor_id):
+        try:
+            connection = config.get_db_connection()
+            cursor = connection.cursor(dictionary=True)
+
+            # -------- Contractor Info --------
+            contInfo = ReportHelper.execute_sp(cursor, 'GetContractorInfo', [contractor_id], True)
+
+            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 =================
+            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/model/ReportGenerator.py
+++ b/model/ReportGenerator.py
--- a/model/State.py
+++ b/model/State.py
@@ -1,246 +1,156 @@
-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 flask import request, redirect, url_for
+
+from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
+from model.ItemCRUD import ItemCRUD  
+

 class State:

-    isSuccess = False
-    resultMessage = ""
-
    def __init__(self):
        self.isSuccess = False
        self.resultMessage = ""

+    # ----------------------------------------------------------
+    # ADD STATE (USING ITEM CRUD)
+    # ----------------------------------------------------------
    def AddState(self, request):
-        """Log user actions with timestamp, user, action, and details."""
-        statedata = []
-        
-        connection = config.get_db_connection()
-
-        if connection:
-            cursor = connection.cursor()
        state_name = request.form['state_Name'].strip()
-            LogHelper.log_action("Add State", f"User {current_user.id} added state '{state_name}'")

-            if not re.match(RegEx.patternAlphabetOnly, state_name):
-                self.isSuccess = False
-                self.resultMessage = HtmlHelper.json_response(ResponseHandler.invalid_name("state"), 400)
-                return
+        crud = ItemCRUD(ItemCRUDType.State)

-            try:
+        crud.AddItem(
+            request=request,
+            childname=state_name,
+            storedprocfetch="CheckStateExists",
+            storedprocadd="SaveState"
+        )

-                cursor.callproc("CheckStateExists", (state_name,))
-                for data in cursor.stored_results():
-                    existing_state = data.fetchone()
+        self.isSuccess = crud.isSuccess
+        self.resultMessage = crud.resultMessage

-                if existing_state:
-                    self.isSuccess = False
-                    self.resultMessage = HtmlHelper.json_response(ResponseHandler.already_exists("state"), 409)
-                    return
-
-                # cursor.execute("call SaveState (%s)", (state_name,))
-                cursor.callproc("SaveState", (state_name,))
-                connection.commit()
-                self.isSuccess = True
-                self.resultMessage = HtmlHelper.json_response(ResponseHandler.add_success("state"), 200)
-                return
-
-            except mysql.connector.Error as e:
-                print(f"Error inserting state: {e}")
-                self.isSuccess = False
-                self.resultMessage = HtmlHelper.json_response(ResponseHandler.add_failure("state"), 500)
-                return
-
-            #Need to make this seperate
-
-
-
-    def GetAllStates(self, request):
-        """Log user actions with timestamp, user, action, and details."""
-        statedata = []
-        connection = config.get_db_connection()
-    
-        self.isSuccess = False
-        self.resultMessage = ""
-
-        if not connection:
-            return []
-        
-        cursor = connection.cursor()
-
-        try:
-            cursor.callproc("GetAllStates")
-            for res in cursor.stored_results():
-                statedata = res.fetchall()
-            self.isSuccess = True
-
-        
-        except mysql.connector.Error as e:
-            print(f"Error fetching states: {e}")
-            self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(ResponseHandler.fetch_failure("state"), 500)
-            return []    
-
-        finally:
-            cursor.close()
-            connection.close()
-
-        return statedata
-
-
-
-    def CheckState(self, request):
-        self.isSuccess = False
-        self.resultMessage = ""
-
-        connection = config.get_db_connection()
-        #connection closing needs to be verified
-        if connection:
-            cursor = connection.cursor()
-            state_name = request.json.get('state_Name', '').strip()
-            LogHelper.log_action("Check State", f"User {current_user.id} Checked state '{state_name}'")
-            if not re.match(RegEx.patternAlphabetOnly, state_name):
-                self.isSuccess = False
-                self.resultMessage = HtmlHelper.json_response(ResponseHandler.invalid_name("state"), 400)
-                return HtmlHelper.json_response(ResponseHandler.invalid_name("state"), 400)
-
-            try:
-                # cursor.execute("SELECT * FROM states WHERE State_Name = %s", (state_name,))
-                # existing_state = cursor.fetchone()
-
-                cursor.callproc("CheckStateExists", (state_name,))
-                for data in cursor.stored_results():
-                    existing_state = data.fetchone()
-
-                if existing_state:
-                    self.isSuccess = False
-                    self.resultMessage = HtmlHelper.json_response(ResponseHandler.already_exists("state"), 409)
-                    return HtmlHelper.json_response(ResponseHandler.already_exists("state"), 409)
-                else:
-                    self.isSuccess = True
-                    self.resultMessage = HtmlHelper.json_response(ResponseHandler.is_available("state"), 200)
-                    return HtmlHelper.json_response(ResponseHandler.is_available("state"), 200)
-
-            except mysql.connector.Error as e:
-                self.isSuccess = False
-                self.resultMessage = HtmlHelper.json_response(ResponseHandler.add_failure("state"), 500)
-
-                print(f"Error checking state: {e}")
-                return HtmlHelper.json_response(ResponseHandler.add_failure("state"), 500)
-            finally:
-                cursor.close()
-                connection.close()
-
-
-
-    def DeleteState(self, request, id):
-        self.isSuccess = False
-        self.resultMessage = ""
-
-        connection = config.get_db_connection()
-        cursor = connection.cursor()
-        LogHelper.log_action("Delete State", f"User {current_user.id} Deleted state '{id}'")
-        try:
-            cursor.callproc('DeleteState', (id,))
-            connection.commit()
-
-            self.resultMessage = "Successfully Deleted"
-            self.isSuccess = True
-        except mysql.connector.Error as e:
-            print(f"Error deleting data: {e}")
-            self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(ResponseHandler.delete_failure("state"), 500)
-            return HtmlHelper.json_response(ResponseHandler.delete_failure("state"), 500)
-
-        finally:
-            cursor.close()
-            connection.close()
        return self.resultMessage


-    def EditState(self, request, id):
-        self.isSuccess = False
-        self.resultMessage = ""
-
+    # ----------------------------------------------------------
+    # GET ALL STATES (NO CHANGE - THIS IS CORRECT)
+    # ----------------------------------------------------------
+    def GetAllStates(self, request):
        connection = config.get_db_connection()
-        cursor = connection.cursor()
-        # str_pattern_reg = r"^[A-Za-z\s]+$"
+        data = []

-        state_name = request.form['state_Name'].strip()
-        LogHelper.log_action("Edit State", f"User {current_user.id} Edited state '{state_name}'")
-        if not re.match(RegEx.patternAlphabetOnly, state_name):
-            self.isSuccess = False
-            self.resultMessage = ResponseHandler.invalid_name("state"), 400
-            return ResponseHandler.invalid_name("state"), 400
-
-        try:
-            # cursor.execute("UPDATE states SET State_Name = %s WHERE State_ID = %s", (state_name, id))
-            cursor.callproc("UpdateStateById", (id, state_name))
-            connection.commit()
-            self.isSuccess = True
-            self.resultMessage = "Successfully Edited"
-            return redirect(url_for('state.add_state'))
-        except mysql.connector.Error as e:
-            print(f"Error updating data: {e}")
-            self.isSuccess = True
-            self.resultMessage = ResponseHandler.add_failure("state"), 500
-
-            return ResponseHandler.add_failure("state"), 500
-        finally:
-            cursor.close()
-            connection.close()
-
-
-
-
-
-    def GetStateByID(self, request, id):
-        """Log user actions with timestamp, user, action, and details."""
-        statedata = []
-    
-        self.isSuccess = False
-        self.resultMessage = ""
-
-        connection = config.get_db_connection()
        if not connection:
            return []
-        cursor = connection.cursor()

        try:
-            cursor.callproc("GetStateByID", (id,))
+            cursor = connection.cursor()
+            cursor.callproc("GetAllStates")
            for res in cursor.stored_results():
-                statedata = res.fetchone()
+                data = res.fetchall()

-            if statedata:
            self.isSuccess = True
-                self.resultMessage = "Success in Fetching"
-            else:
-                self.isSuccess = False
-                self.resultMessage = "State Not Found"
-

        except mysql.connector.Error as e:
            print(f"Error fetching states: {e}")
            self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(ResponseHandler.fetch_failure("state"), 500)
+            self.resultMessage = HtmlHelper.json_response(
+                ResponseHandler.fetch_failure("state"), 500
+            )
            return []

        finally:
            cursor.close()
            connection.close()

-        return statedata
+        return data


+    # ----------------------------------------------------------
+    # CHECK STATE (USING ITEM CRUD)
+    # ----------------------------------------------------------
+    def CheckState(self, request):
+        state_name = request.json.get('state_Name', '').strip()
+
+        crud = ItemCRUD(ItemCRUDType.State)
+
+        return crud.CheckItem(
+            request=request,
+            parentid=None,
+            childname=state_name,
+            storedprocfetch="CheckStateExists"
+        )
+
+
+    # ----------------------------------------------------------
+    # DELETE STATE (USING ITEM CRUD)
+    # ----------------------------------------------------------
+    def DeleteState(self, request, id):
+        crud = ItemCRUD(ItemCRUDType.State)
+
+        crud.DeleteItem(
+            request=request,
+            itemID=id,
+            storedprocDelete="DeleteState"
+        )
+
+        self.isSuccess = crud.isSuccess
+        self.resultMessage = crud.resultMessage
+
+        return self.resultMessage
+
+
+    # ----------------------------------------------------------
+    # EDIT STATE (USING ITEM CRUD)
+    # ----------------------------------------------------------
+    def EditState(self, request, id):
+        state_name = request.form['state_Name'].strip()
+
+        crud = ItemCRUD(ItemCRUDType.State)
+
+        crud.EditItem(
+            request=request,
+            childid=id,
+            parentid=None,
+            childname=state_name,
+            storedprocupdate="UpdateStateById"
+        )
+
+        self.isSuccess = crud.isSuccess
+        self.resultMessage = crud.resultMessage
+
+        return redirect(url_for('state.add_state'))
+
+
+    # ----------------------------------------------------------
+    # GET STATE BY ID (KEEP SAME)
+    # ----------------------------------------------------------
+    def GetStateByID(self, request, id):
+        connection = config.get_db_connection()
+        data = None
+
+        if not connection:
+            return None
+
+        try:
+            cursor = connection.cursor()
+            cursor.callproc("GetStateByID", (id,))
+            for res in cursor.stored_results():
+                data = res.fetchone()
+
+            if data:
+                self.isSuccess = True
+                self.resultMessage = "Success"
+            else:
+                self.isSuccess = False
+                self.resultMessage = "Not Found"
+
+        except mysql.connector.Error as e:
+            print(f"Error fetching state: {e}")
+            self.isSuccess = False
+
+        finally:
+            cursor.close()
+            connection.close()
+
+        return data
--- a/model/Subcontractor.py
+++ b/model/Subcontractor.py
@@ -1,131 +1,140 @@
-# model/Subcontractor.py
+from model.Utilities import ItemCRUDType
+from model.ItemCRUD import ItemCRUD

-import config
-from model.Log import LogHelper 
-from mysql.connector import Error

 class Subcontractor:
+    def __init__(self):
+        self.isSuccess = False
+        self.resultMessage = ""

-    @staticmethod
-    def get_connection():
-        return config.get_db_connection()
+    # ----------------------------------------------------------
+    # ADD
+    # ----------------------------------------------------------
+    def AddSubcontractor(self, request):

-    @staticmethod
-    def get_all_subcontractors():
-        connection = Subcontractor.get_connection()
-        subcontractors = []
-        if not connection:
-            return None, "Database connection failed"
-        try:
-            cursor = connection.cursor()
-            cursor.callproc('GetAllSubcontractors')
-            for result in cursor.stored_results():
-                subcontractors = result.fetchall()
-        except Error as e:
-            print(f"Error fetching subcontractors: {e}")
-            return None, str(e)
-        finally:
-            cursor.close()
-            connection.close()
-        return subcontractors, None
+        subcontractor = ItemCRUD(itemType=ItemCRUDType.Subcontractor)

-    @staticmethod
-    def get_subcontractor_by_id(id):
-        connection = Subcontractor.get_connection()
-        subcontractor = None
-        if not connection:
-            return None, "Database connection failed"
-        try:
-            cursor = connection.cursor()
-            cursor.callproc("GetSubcontractorById", (id,))
-            for result in cursor.stored_results():
-                subcontractor = result.fetchone()
-        except Error as e:
-            print(f"Error fetching subcontractor: {e}")
-            return None, str(e)
-        finally:
-            cursor.close()
-            connection.close()
-        return subcontractor, None
+        data = {
+            "Contractor_Name": request.form.get('Contractor_Name', '').strip(),
+            "Address": request.form.get('Address', '').strip(),
+            "Mobile_No": request.form.get('Mobile_No', '').strip(),
+            "PAN_No": request.form.get('PAN_No', '').strip(),
+            "Email": request.form.get('Email', '').strip(),
+            "Gender": request.form.get('Gender', '').strip(),
+            "GST_Registration_Type": request.form.get('GST_Registration_Type', '').strip(),
+            "GST_No": request.form.get('GST_No', '').strip(),
+            "Contractor_password": request.form.get('Contractor_password', '').strip()
+        }

-    @staticmethod
-    def save_subcontractor(data):
-        connection = Subcontractor.get_connection()
-        if not connection:
-            return "Database connection failed"
-        try:
-            cursor = connection.cursor()
-            cursor.callproc('SaveContractor', (
-                data['Contractor_Name'],
-                data['Address'],
-                data['Mobile_No'],
-                data['PAN_No'],
-                data['Email'],
-                data['Gender'],
-                data['GST_Registration_Type'],
-                data['GST_No'],
-                data['Contractor_password']
-            ))
-            connection.commit()
-            # Active log
-            LogHelper.log_action("Add Subcontractor", f"Added subcontractor '{data['Contractor_Name']}'")
-        except Error as e:
-            print(f"Error inserting subcontractor: {e}")
-            return str(e)
-        finally:
-            cursor.close()
-            connection.close()
-        return None
+        subcontractor.AddItem(
+            request=request,
+            data=data,
+            storedprocfetch="GetSubcontractorByName",
+            storedprocadd="SaveContractor"
+        )

-    @staticmethod
-    def update_subcontractor(id, data):
-        connection = Subcontractor.get_connection()
-        if not connection:
-            return "Database connection failed"
-        try:
-            cursor = connection.cursor()
-            cursor.callproc('UpdateSubcontractor', (
-                id,
-                data['Contractor_Name'],
-                data['Address'],
-                data['Mobile_No'],
-                data['PAN_No'],
-                data['Email'],
-                data['Gender'],
-                data['GST_Registration_Type'],
-                data['GST_No'],
-                data['Contractor_password']
-            ))
-            connection.commit()
-            # Active log
-            LogHelper.log_action("Edit Subcontractor", f"Edited subcontractor '{id}'")
-        except Error as e:
-            print(f"Error updating subcontractor: {e}")
-            return str(e)
-        finally:
-            cursor.close()
-            connection.close()
-        return None
+        self.isSuccess = subcontractor.isSuccess
+        self.resultMessage = subcontractor.resultMessage
+        return

-    @staticmethod
-    def delete_subcontractor(id):
-        connection = Subcontractor.get_connection()
-        if not connection:
-            return "Database connection failed", 0
-        affected_rows = 0
-        try:
-            cursor = connection.cursor()
-            cursor.callproc('DeleteSubcontractor', (id,))
-            connection.commit()
-            for result in cursor.stored_results():
-                row = result.fetchone()
-                affected_rows = row[0] if row else 0
-            # Active log
-            LogHelper.log_action("Delete Subcontractor", f"Deleted subcontractor '{id}'")
-        except Error as e:
-            print(f"Error deleting subcontractor: {e}")
-            return str(e), 0
-        finally:
-            cursor.close()
-            connection.close()
-        return None, affected_rows
+    # ----------------------------------------------------------
+    # GET ALL
+    # ----------------------------------------------------------
+    def GetAllSubcontractors(self, request):
+
+        subcontractor = ItemCRUD(itemType=ItemCRUDType.Subcontractor)
+
+        data = subcontractor.GetAllData(
+            request=request,
+            storedproc="GetAllSubcontractors"
+        )
+
+        self.isSuccess = subcontractor.isSuccess
+        self.resultMessage = subcontractor.resultMessage
+        return data
+
+    # ----------------------------------------------------------
+    # GET BY ID
+    # ----------------------------------------------------------
+    def GetSubcontractorByID(self, id):
+
+        subcontractor = ItemCRUD(itemType=ItemCRUDType.Subcontractor)
+
+        data = subcontractor.GetDataByID(
+            id=id,
+            storedproc="GetSubcontractorById"
+        )
+
+        if data:
+            self.isSuccess = True
+        else:
+            self.isSuccess = False
+            self.resultMessage = "Subcontractor not found"
+
+        return data
+
+    # ----------------------------------------------------------
+    # CHECK (Duplicate)
+    # ----------------------------------------------------------
+    def CheckSubcontractor(self, request):
+
+        subcontractor = ItemCRUD(itemType=ItemCRUDType.Subcontractor)
+
+        name = request.form.get('Contractor_Name', '').strip()
+
+        result = subcontractor.CheckItem(
+            request=request,
+            childname=name,
+            storedprocfetch="GetSubcontractorByName"
+        )
+
+        self.isSuccess = subcontractor.isSuccess
+        self.resultMessage = subcontractor.resultMessage
+        return result
+
+    # ----------------------------------------------------------
+    # EDIT
+    # ----------------------------------------------------------
+    def EditSubcontractor(self, request, subcontractor_id):
+
+        subcontractor = ItemCRUD(itemType=ItemCRUDType.Subcontractor)
+
+        data = {
+            "Contractor_Name": request.form.get('Contractor_Name', '').strip(),
+            "Address": request.form.get('Address', '').strip(),
+            "Mobile_No": request.form.get('Mobile_No', '').strip(),
+            "PAN_No": request.form.get('PAN_No', '').strip(),
+            "Email": request.form.get('Email', '').strip(),
+            "Gender": request.form.get('Gender', '').strip(),
+            "GST_Registration_Type": request.form.get('GST_Registration_Type', '').strip(),
+            "GST_No": request.form.get('GST_No', '').strip(),
+            "Contractor_password": request.form.get('Contractor_password', '').strip()
+        }
+
+        subcontractor.EditItem(
+            request=request,
+            childid=subcontractor_id,
+            data=data,
+            storedprocupdate="UpdateSubcontractor"
+        )
+
+        self.isSuccess = subcontractor.isSuccess
+        self.resultMessage = subcontractor.resultMessage
+        return
+
+    # ----------------------------------------------------------
+    # DELETE
+    # ----------------------------------------------------------
+    def DeleteSubcontractor(self, request, subcontractor_id):
+
+        subcontractor = ItemCRUD(itemType=ItemCRUDType.Subcontractor)
+
+        subcontractor.DeleteItem(
+            request=request,
+            itemID=subcontractor_id,
+            storedprocDelete="DeleteSubcontractor"
+        )
+
+        self.isSuccess = subcontractor.isSuccess
+        self.resultMessage = subcontractor.resultMessage
+        return
--- a/model/Utilities.py
+++ b/model/Utilities.py
@@ -7,9 +7,12 @@ class ItemCRUDType(Enum):
    District = 3
    State = 4
    HoldType = 5
+    Subcontractor = 6
+    GSTRelease = 7

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


 class ResponseHandler:
@@ -60,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,4 +1,5 @@
-#         return blocks
+
+
 from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
 import config
 import mysql.connector
@@ -12,11 +13,18 @@ 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
@@ -29,8 +37,9 @@ class Village:
        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
-            self.resultMessage = "Village name cannot be empty"
            return

        try:
@@ -66,8 +75,9 @@ class Village:
        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
-            self.resultMessage = "Village name cannot be empty"
            return None

        try:
@@ -103,8 +113,9 @@ class Village:
        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
-            self.resultMessage = "Village name cannot be empty"
            return

        try:
@@ -164,9 +175,11 @@ class Village:
        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
-            )
+
+            # ✅ FIXED (removed jsonify response)
+            self.response = ResponseHandler.fetch_failure("block")
+            self.resultMessage = self.response["message"]
+
            return []

        finally:
--- 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/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