Merge pull request 'pankaj-dev' (#20) from pankaj-dev into main

Reviewed-on: #20

controllers/auth_controller.py

@@ -6,7 +6,6 @@ from model.Log import LogHelper
 
 auth_bp = Blueprint('auth', __name__)
 
-
 @auth_bp.route('/login', methods=['GET', 'POST'])
 def login():
 

controllers/block_controller.py

@@ -1,36 +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
+from model.State import State
-
 from model.Block import Block
 from model.Utilities import HtmlHelper
 
 block_bp = Blueprint('block', __name__)
-
+block = Block()
-# 
+# --- Add Block page -------
 @block_bp.route('/add_block', methods=['GET', 'POST'])
 @login_required
 def add_block():
-
+    # block = Block()
-    block = Block()
 
     if request.method == 'POST':
         block.AddBlock(request)
         return block.resultMessage
     
-    connection = config.get_db_connection()
+    state = State()
-    cursor = connection.cursor()
+    states = state.GetAllStates(request=request)
-
-    cursor.callproc("GetAllStates")
-    for rs in cursor.stored_results():
-        states = rs.fetchall()
 
     block_data = block.GetAllBlocks(request)
 
-    cursor.close()
-    connection.close()
-
     return render_template(
         'add_block.html',
         states=states,
@@ -70,7 +62,7 @@ def get_districts(state_id):
 @login_required
 def check_block():
 
-    block = Block()
+    # block = Block()
     return block.CheckBlock(request)
 
 
@@ -78,11 +70,18 @@ def check_block():
 @login_required
 def edit_block(block_id):
 
-    block = Block()
     
+#   block = Block()
     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()
@@ -91,7 +90,10 @@ def edit_block(block_id):
     for rs in cursor.stored_results():
         states = rs.fetchall()
 
-    cursor.callproc("GetAllDistrictsData")
+    # cursor.callproc("GetAllDistrictsData")
+    # for rs in cursor.stored_results():
+    #     districts = rs.fetchall()
+    cursor.callproc("GetAllDistricts")
     for rs in cursor.stored_results():
         districts = rs.fetchall()
 
@@ -112,7 +114,7 @@ def edit_block(block_id):
 @login_required
 def delete_block(block_id):
 
-    block = Block()
+    # block = Block()
     block.DeleteBlock(request, block_id)
 
     return redirect(url_for('block.add_block'))

controllers/district_controller.py

@@ -5,13 +5,13 @@ from model.District import District
 from model.State import State
 
 district_bp = Blueprint('district', __name__)
+district = District()
 
-
+# ------- District page --------
 @district_bp.route('/add_district', methods=['GET', 'POST'])
 @login_required
 def add_district():
-
+    # district = District()
-    district = District()
 
     if request.method == 'POST':
         district.AddDistrict(request=request)
@@ -28,21 +28,21 @@ def add_district():
         states=states
     )
 
-
+# ------- District check --------
 @district_bp.route('/check_district', methods=['POST'])
 @login_required
 def check_district():
 
-    district = District()
+    # district = 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):
 
-    district = District()
+    # district = District()
 
     district.DeleteDistrict(request=request, district_id=district_id)
 
@@ -52,11 +52,12 @@ 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):
 
-    district = District()
+    # district = District()
     state = State()
 
     if request.method == 'POST':

controllers/excel_upload_controller.py

@@ -27,8 +27,6 @@ def upload():
                 f"User {current_user.id} Upload Excel File '{file.filename}'"
             )
             return redirect(url_for('excel.show_table', filename=file.filename))
-    else:
-        return redirect(url_for('upload_excel_file'))
     
     return render_template('uploadExcelFile.html')
 
@@ -61,21 +59,21 @@ def show_table(filename):
             try:
                 cursor = connection.cursor(dictionary=True)
 
-                cursor.callproc('GetStateByName', [file_info['State']])
+                cursor.callproc('CheckStateExists', [file_info['State']])
                 for result in cursor.stored_results():
                     state_data = result.fetchone()
                 if not state_data:
                     errors.append(f"State '{file_info['State']}' is not valid. Please add it.")
 
                 if state_data:
-                    cursor.callproc('GetDistrictByNameAndStates', [file_info['District'], state_data['State_ID']])
+                    cursor.callproc('GetDistrictByNameAndState', [file_info['District'], state_data['State_Id']])     # Change GetDistrictByNameAndStates to GetDistrictByNameAndState
                     for result in cursor.stored_results():
                         district_data = result.fetchone()
                     if not district_data:
                         errors.append(f"District '{file_info['District']}' is not valid under state '{file_info['State']}'.")
 
                 if district_data:
-                    cursor.callproc('GetBlockByNameAndDistricts', [file_info['Block'], district_data['District_ID']])
+                    cursor.callproc('GetBlockByNameAndDistrict', [file_info['Block'], district_data['District_id']])       #Change District_ID to District_id  and GetBlockByNameAndDistricts to GetBlockByNameAndDistrict
                     for result in cursor.stored_results():
                         block_data = result.fetchone()
                     if not block_data:
@@ -86,7 +84,9 @@ def show_table(filename):
                     subcontractor_data = result.fetchone()
 
                 if not subcontractor_data:
-                    cursor.callproc('InsertSubcontractor', [file_info['Subcontractor']])
+                    # cursor.callproc('InsertSubcontractor', [file_info['Subcontractor']])
+                    # connection.commit()
+                    cursor.callproc('SaveContractor', [file_info.get('Subcontractor'),None,None,None,None,None,None,None,None])
                     connection.commit()
                     cursor.callproc('GetSubcontractorByName', [file_info['Subcontractor']])
                     for result in cursor.stored_results():
@@ -231,7 +231,7 @@ def save_data():
                         else:
                             work_type = " ".join(words[:work_pos + 1])
                     if Invoice_Details and 'village' in Invoice_Details.lower() and 'work' in Invoice_Details.lower():
-                        print("village_name ::", village_name, "|| work_type ::", work_type)
+                        # print("village_name ::", village_name, "|| work_type ::", work_type)
                         if block_id and village_name:
                             village_id = None
                             cursor.callproc("GetVillageId", (block_id, village_name))
@@ -244,11 +244,11 @@ def save_data():
                                 for result in cursor.stored_results():
                                     result = result.fetchone()
                                 village_id = result[0] if result else None
-                        print("village_id :", village_id)
+                        # print("village_id :", village_id)
-                        print("block_id :", block_id)
+                        # print("block_id :", block_id)
-                        print("invoice :", PMC_No, village_id, work_type, Invoice_Details, Invoice_Date, Invoice_No,
+                        # print("invoice :", PMC_No, village_id, work_type, Invoice_Details, Invoice_Date, Invoice_No,
-                              Basic_Amount, Debit_Amount, After_Debit_Amount, Amount, GST_Amount, TDS_Amount,
+                        #       Basic_Amount, Debit_Amount, After_Debit_Amount, Amount, GST_Amount, TDS_Amount,
-                              SD_Amount, On_Commission, Hydro_Testing, GST_SD_Amount, Final_Amount)
+                            #   SD_Amount, On_Commission, Hydro_Testing, GST_SD_Amount, Final_Amount)
 
                         args = (
                             PMC_No, village_id, work_type, Invoice_Details, Invoice_Date, Invoice_No,
@@ -257,22 +257,39 @@ def save_data():
                             subcontractor_id, 0
                         )
 
-                        print("All invoice Details ",args)
+                        # print("All invoice Details ",args)
+                        # add subcontarctor id in invoice table
                         results = cursor.callproc('SaveInvoice', args)
                         invoice_id = results[-1]
-                        print("invoice id from the excel ", invoice_id)
+                        print("**************************************************************")
+                        print(invoice_id)
+                        print("**************************************************************")
+                        cursor.callproc(
+                            "SavePayment",
+                            (
+                                PMC_No,
+                                Invoice_No,            # required
+                                Payment_Amount,
+                                TDS_Payment_Amount,
+                                Total_Amount,
+                                UTR,
+                                invoice_id             # last
+                            )
+                        )
+                        
+                        # print("invoice id from the excel ", invoice_id)
                         if isinstance(hold_columns, str):
                             hold_columns = ast.literal_eval(hold_columns)
                         if isinstance(hold_columns, list) and all(isinstance(hold, dict) for hold in hold_columns):
                             for hold in hold_columns:
-                                print(f"Processing hold: {hold}")
+                                # print(f"Processing hold: {hold}")
                                 hold_column_name = hold.get('column_name')  # Get column name
                                 hold_type_id = hold.get('hold_type_id')  # Get hold_type_id
                                 if hold_column_name:
                                     hold_amount = entry.get(
                                         hold_column_name)  # Get the value for that specific hold column
                                     if hold_amount is not None:
-                                        print(f"Processing hold type: {hold_column_name}, Hold Amount: {hold_amount}")
+                                        # print(f"Processing hold type: {hold_column_name}, Hold Amount: {hold_amount}")
                                         hold_join_data = {
                                             "Contractor_Id": subcontractor_id,
                                             "Invoice_Id": invoice_id,
@@ -291,8 +308,8 @@ def save_data():
                             print("Hold columns data is not a valid list of dictionaries.")
 #---------------------------------------------Credit Note---------------------------------------------------------------------------
                     elif any(keyword in Invoice_Details.lower() for keyword in ['credit note','logging report']):
-                        print("Credit note found:", PMC_No, Invoice_No, Basic_Amount, Debit_Amount, Final_Amount,
+                        # print("Credit note found:", PMC_No, Invoice_No, Basic_Amount, Debit_Amount, Final_Amount,
-                              After_Debit_Amount, GST_Amount, Amount, Final_Amount, Payment_Amount, Total_Amount, UTR, Invoice_No)
+                        #       After_Debit_Amount, GST_Amount, Amount, Final_Amount, Payment_Amount, Total_Amount, UTR, Invoice_No)
                         cursor.callproc(
                             'AddCreditNoteFromExcel',
                             [
@@ -317,52 +334,108 @@ def save_data():
                     ]
                     # Step 3: Matching condition
                     if any(kw in normalized_details for kw in keywords):
-                        print("✅ Match found. Inserting hold release for:", Invoice_Details)
+                        # print("✅ Match found. Inserting hold release for:", Invoice_Details)
                         cursor.callproc(
                             'AddHoldReleaseFromExcel',
                             [PMC_No, Invoice_No, Invoice_Details, Basic_Amount, Final_Amount, UTR, subcontractor_id]
 )
                         connection.commit() 
-                        print("✅ Hold release inserted for:", PMC_No, Invoice_Details)
+                        # print("✅ Hold release inserted for:", PMC_No, Invoice_Details)
                     #------------------------------------------------------------------------------------------------------------------
                     elif Invoice_Details and any(
-                            keyword in Invoice_Details.lower() for keyword in ['gst', 'release', 'note']):
+                            keyword in Invoice_Details.lower() for keyword in ['gst', 'release', 'gst release note']):
-                        print("Gst rels :", PMC_No, Invoice_No, Basic_Amount, Final_Amount,Total_Amount,UTR, subcontractor_id)
+                        # print("Gst rels :", PMC_No, Invoice_No, Basic_Amount, Final_Amount,Total_Amount,UTR, subcontractor_id)
                         cursor.callproc(
                             'AddGSTReleaseFromExcel',
                             [PMC_No, Invoice_No, Basic_Amount, Final_Amount, Total_Amount, UTR, subcontractor_id]
                         )
 
-                if PMC_No and Total_Amount and UTR:
+# --------------------------------------
-                    print("Payment :", PMC_No, Invoice_No, Payment_Amount, TDS_Payment_Amount, Total_Amount, UTR )
+# If no village/work detected, only PMC/Payment
-                    cursor.callproc("SavePayment",(PMC_No, Invoice_No, Payment_Amount, TDS_Payment_Amount, Total_Amount, UTR ))
+                if not (Invoice_Details and 'village' in Invoice_Details.lower() and 'work' in Invoice_Details.lower()):
-                if not village_id:
+                # if not (Invoice_Details and 'village' in Invoice_Details.lower() and 'work' in Invoice_Details.lower() and 'gst' in Invoice_Details.lower() and 'gst release note' in Invoice_Details.lower() and 'release' in Invoice_Details.lower()):
-                    village_id = None
+                        
-                cursor.callproc('InsertOrUpdateInPayment', (
+                    # ---------- Only PMC / Payment rows ----------
+                    if PMC_No and  not Invoice_No and  UTR :
+                        # print("No village/work, using PMC only :", PMC_No)
+
+                        # check invoice exists
+                        # cursor.execute(
+                        #     "SELECT invoice_id FROM invoice WHERE PMC_No=%s ORDER BY invoice_id DESC LIMIT 1",
+                        #     (PMC_No,)
+                        # )
+                        # row = cursor.fetchone()
+                        # invoice_id = row[0] if row else None
+
+                        # # insert invoice if not exists
+
+                        # if not invoice_id:
+                        print(" extra payment :", PMC_No,Total_Amount,UTR, subcontractor_id)
+                        
+                        # cursor.execute(
+                        #     """
+                        #     INSERT INTO invoice (PMC_No,Contractor_Id) VALUES (%s, %s);
+                        #     """,
+                        #     (PMC_No, subcontractor_id)
+                        # )
+                        # connection.commit()
+
+                        # cursor.execute(
+                        #     "SELECT invoice_id FROM invoice WHERE PMC_No=%s AND Contractor_Id =%s ORDER BY invoice_id DESC LIMIT 1",
+                        #     (PMC_No, subcontractor_id)
+                        # )
+                        # row = cursor.fetchone()
+                        cursor.callproc("insertExtrapaymet",(PMC_No, subcontractor_id))
+                        for result in cursor.stored_results():
+                            row = result.fetchone()
+                            invoice_id = row[0] if row else None
+                        # insert payment
+                        cursor.callproc(
+                            "SavePayment",
+                            (
                                 PMC_No,
-                        village_id,
+                                Invoice_No,            # required
-                        work_type,
-                        Invoice_Details,
-                        Invoice_Date,
-                        Invoice_No,
-                        Basic_Amount,
-                        Debit_Amount,
-                        After_Debit_Amount,
-                        Amount,
-                        GST_Amount,
-                        TDS_Amount,
-                        SD_Amount,
-                        On_Commission,
-                        Hydro_Testing,
-                        0,
-                        GST_SD_Amount,
-                        Final_Amount,
                                 Payment_Amount,
                                 TDS_Payment_Amount,
                                 Total_Amount,
                                 UTR,
-                        subcontractor_id
+                                invoice_id 
-                    ))
+                            )
+                        )
+                   
+                # if PMC_No and Total_Amount and UTR:
+                #     print("Payment :", PMC_No, Invoice_No, Payment_Amount, TDS_Payment_Amount, Total_Amount, UTR )
+
+                    # Add  inoice id in payment table
+                    # cursor.callproc("SavePayment",(PMC_No, Invoice_No, Payment_Amount, TDS_Payment_Amount, Total_Amount, UTR, invoice_id))
+
+                # if not village_id:
+                #     village_id = None
+                # cursor.callproc('InsertOrUpdateInPayment', (
+                #         PMC_No,
+                #         village_id,
+                #         work_type,
+                #         Invoice_Details,
+                #         Invoice_Date,
+                #         Invoice_No,
+                #         Basic_Amount,
+                #         Debit_Amount,
+                #         After_Debit_Amount,
+                #         Amount,
+                #         GST_Amount,
+                #         TDS_Amount,
+                #         SD_Amount,
+                #         On_Commission,
+                #         Hydro_Testing,
+                #         0,
+                #         GST_SD_Amount,
+                #         Final_Amount,
+                #         Payment_Amount,
+                #         TDS_Payment_Amount,
+                #         Total_Amount,
+                #         UTR,f
+                #         subcontractor_id
+                #     ))
             connection.commit()
             return jsonify({"success": "Data saved successfully!"}), 200
         except Exception as e:

controllers/gst_release_controller.py

@@ -1,70 +1,46 @@
-from flask import Blueprint, render_template, request, redirect, url_for, jsonify
+# routes/gst_release_routes.py
-from flask_login import login_required, current_user
+from flask import Blueprint, render_template, request, redirect, url_for, flash
-from model.gst_release import GSTReleasemodel
+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']
+        gst_service.AddGSTRelease(request)
-        invoice_no = request.form['invoice_No']
+        LogHelper.log_action("Add GST Release", "User added GST release")
-        basic_amount = request.form['basic_amount']
+        flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
-        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)
-
         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)
+    gst_data = gst_service.GetGSTReleaseByID(gst_release_id)
-    if not gst_release_data:
+    if not gst_data:
         return "GST Release not found", 404
 
     if request.method == 'POST':
-        pmc_no = request.form['PMC_No']
+        gst_service.EditGSTRelease(request, gst_release_id)
-        invoice_no = request.form['invoice_No']
+        LogHelper.log_action("Edit GST Release", "User edited GST release")
-        basic_amount = request.form['basic_amount']
+        flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
-        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)
-
         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)
+    gst_service.DeleteGSTRelease(gst_release_id)
-    if not success:
+    LogHelper.log_action("Delete GST Release", "User deleted GST release")
-        return jsonify({"message": "GST Release not found or failed to delete", "status": "error"}), 404
+    flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
-
+    return redirect(url_for('gst_release_bp.add_gst_release'))
-    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

controllers/hold_types_controller.py

@@ -5,32 +5,32 @@ from model.GST import GST
 
 hold_bp = Blueprint("hold_types", __name__)
 
-
+hold = HoldTypes()
 # ---------------- ADD HOLD TYPE ----------------
 @hold_bp.route('/add_hold_type', methods=['GET','POST'])
 @login_required
 def add_hold_type():
-
+    # hold = HoldTypes()
-    hold = HoldTypes()   
 
     if request.method == 'POST':
-        hold.AddHoldType(request)   # ✅
+        hold.AddHoldType(request)
-        return hold.resultMessage
+        # ✅ 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
 def check_hold_type():
 
-    hold = HoldTypes()
+    # hold = HoldTypes()
     return hold.CheckHoldType(request)   # if exists
 
 
@@ -39,7 +39,7 @@ def check_hold_type():
 @login_required
 def edit_hold_type(id):
 
-    hold = HoldTypes()
+    # hold = HoldTypes()
 
     if request.method == 'POST':
         hold.EditHoldType(request, id)   # ✅
@@ -58,7 +58,7 @@ def edit_hold_type(id):
 @login_required
 def delete_hold_type(id):
 
-    hold = HoldTypes()
+    # hold = HoldTypes()
     hold.DeleteHoldType(request, id)   # ✅
 
     return redirect(url_for("hold_types.add_hold_type"))

controllers/invoice_controller.py

@@ -7,92 +7,96 @@ from model.Log import LogHelper
 
 invoice_bp = Blueprint('invoice', __name__)
 
-# -------------------------------- Add Invoice ---------------------------------
+# ------------------------------- Helpers -------------------------------
+def handle_exception(func):
+    """Decorator to handle exceptions and return JSON error responses."""
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except Exception as e:
+            return jsonify({"status": "error", "message": str(e)}), 500
+    wrapper.__name__ = func.__name__
+    return wrapper
+
+def log_action(action: str, detail: str):
+    LogHelper.log_action(action, f"User {current_user.id} {detail}")
+
+
+# ------------------------------- Add Invoice -------------------------------
 @invoice_bp.route('/add_invoice', methods=['GET', 'POST'])
 @login_required
+@handle_exception
 def add_invoice():
     if request.method == 'POST':
-        try:
+        data = request.form
-            village_name = request.form.get('village')
+        village_name = data.get('village')
         village_result = get_village_id(village_name)
 
         if not village_result:
             return jsonify({"status": "error", "message": f"Village '{village_name}' not found"}), 400
 
         village_id = village_result['Village_Id']
-            data = request.form
-
         invoice_id = insert_invoice(data, village_id)
-            assign_subcontractor(data, village_id)
+        # assign_subcontractor(data, village_id)
+        print("********************************************************************")
+        print("Manully added invoice id :",invoice_id)
+        print("********************************************************************")
+
         insert_hold_types(data, invoice_id)
 
-            LogHelper.log_action("Add invoice", f"User {current_user.id} Added invoice '{data.get('pmc_no')}'")
+        log_action("Add invoice", f"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 -------------------
+# ------------------------------- Search Subcontractor -------------------------------
 @invoice_bp.route('/search_subcontractor', methods=['POST'])
 @login_required
+@handle_exception
 def search_subcontractor():
-    sub_query = request.form.get("query")
+    query = request.form.get("query", "").strip()
-    results = search_contractors(sub_query)
+    results = search_contractors(query)
 
     if not results:
         return "<li>No subcontractor found</li>"
 
-    output = "".join(
+    return "".join(f"<li data-id='{r['Contractor_Id']}'>{r['Contractor_Name']}</li>" for r in results)
-        f"<li data-id='{row['Contractor_Id']}'>{row['Contractor_Name']}</li>"
-        for row in results
-    )
-    return output
 
 
-# ------------------- Get Hold Types -------------------
+# ------------------------------- Get Hold Types -------------------------------
 @invoice_bp.route('/get_hold_types', methods=['GET'])
 @login_required
+@handle_exception
 def get_hold_types():
     hold_types = get_all_hold_types()
-    LogHelper.log_action("Get hold type", f"User {current_user.id} Get hold type '{hold_types}'")
+    log_action("Get hold type", f"retrieved hold types '{hold_types}'")
     return jsonify(hold_types)
 
 
-# ------------------- Edit Invoice -------------------
+# ------------------------------- Edit Invoice -------------------------------
 @invoice_bp.route('/edit_invoice/<int:invoice_id>', methods=['GET', 'POST'])
 @login_required
+@handle_exception
 def edit_invoice(invoice_id):
     if request.method == 'POST':
         data = request.form
         update_invoice(data, invoice_id)
-        update_inpayment(data)
+        # update_inpayment(data)
-
+        log_action("Edit invoice", f"edited invoice '{invoice_id}'")
-        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 -------------------
+# ------------------------------- Delete Invoice -------------------------------
 @invoice_bp.route('/delete_invoice/<int:invoice_id>', methods=['GET'])
 @login_required
+@handle_exception
 def delete_invoice_route(invoice_id):
-    try:
     delete_invoice_data(invoice_id, current_user.id)
-        LogHelper.log_action("Delete Invoice", f"User {current_user.id} deleted Invoice '{invoice_id}'")
+    log_action("Delete invoice", f"deleted invoice '{invoice_id}'")
-        return jsonify({
+    return jsonify({"status": "success", "message": f"Invoice {invoice_id} deleted successfully."})
-            "message": f"Invoice {invoice_id} deleted successfully.",
-            "status": "success"
-        })
-    except Exception as e:
-        return jsonify({
-            "message": str(e),
-            "status": "error"
-        }), 500

controllers/log_controller.py

@@ -21,7 +21,6 @@ def activity_log():
         end_date,
         user_name
     )
-
     return render_template(
         "activity_log.html",
         logs=filtered_logs,

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
@@ -28,8 +28,8 @@ def add_payment():
         utr = request.form['utr']
 
         LogHelper.log_action("Add Payment", f"User {current_user.id} Add Payment '{pmc_no}'")
-        Paymentmodel.insert_payment(pmc_no, invoice_no, amount, tds_amount, total_amount, utr)
+        Paymentmodel.insert_payment(subcontractor_id,pmc_no, invoice_no, amount, tds_amount, total_amount, utr)
-        Paymentmodel.update_inpayment(subcontractor_id, pmc_no, invoice_no, amount, tds_amount, total_amount, utr)
+        # Paymentmodel.update_inpayment(subcontractor_id, pmc_no, invoice_no, amount, tds_amount, total_amount, utr)
 
         return redirect(url_for('payment_bp.add_payment'))
 
@@ -72,32 +72,28 @@ def edit_payment(payment_id):
         Paymentmodel.call_update_payment_proc(payment_id, pmc_no, invoice_no, amount, tds_amount, total_amount, utr)
 
         # Update inpayment
-        connection = Paymentmodel.get_connection()
+        # connection = Paymentmodel.get_connection()
-        cursor = connection.cursor()
+        # cursor = connection.cursor()
-        cursor.callproc(
+        # cursor.callproc('UpdateInpaymentByPMCInvoiceUTR',[amount, tds_amount, total_amount, pmc_no, invoice_no, utr])
-        'UpdateInpaymentByPMCInvoiceUTR',
+
-        [amount, tds_amount, total_amount, pmc_no, invoice_no, utr]
+        # connection.commit()
-)
+        # cursor.close()
-        connection.commit()
+        # connection.close()
-        cursor.close()
-        connection.close()
 
         return redirect(url_for('payment_bp.add_payment'))
 
     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({
+    return redirect(url_for('payment_bp.add_payment'))
-        "message": f"Payment ID {payment_id} deleted successfully.",
-        "status": "success"
-    }), 200

controllers/pmc_report_controller.py

@@ -1,40 +1,40 @@
-from flask import Blueprint, render_template, send_from_directory
+# from flask import Blueprint, render_template, send_from_directory
-from flask_login import login_required
+# from flask_login import login_required
+# from model.PmcReport import PmcReport
 
-from model.PmcReport import PmcReport
+# pmc_report_bp = Blueprint("pmc_report", __name__)
 
-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
 
-# ---------------- Contractor Report by pmc no ----------------
+#     return render_template(
-@pmc_report_bp.route("/pmc_report/<pmc_no>")
+#         "pmc_report.html",
-@login_required
+#         info=data["info"],
-def pmc_report(pmc_no):
+#         invoices=data["invoices"],
-    data = PmcReport.get_pmc_report(pmc_no)
+#         hold_types=data["hold_types"],
-    if not data:
+#         gst_rel=data["gst_rel"],
-        return "No PMC found with this number", 404
+#         payments=data["payments"],
+#         credit_note=data["credit_note"],
+#         hold_release=data["hold_release"],
+#         total=data["total"]
+#     )
 
-    return render_template(
+# # ---------------- Contractor Download Report by pmc no ----------------
-        "pmc_report.html",
+# @pmc_report_bp.route("/download_pmc_report/<pmc_no>")
-        info=data["info"],
+# @login_required
-        invoices=data["invoices"],
+# def download_pmc_report(pmc_no):
-        hold_types=data["hold_types"],
-        gst_rel=data["gst_rel"],
-        payments=data["payments"],
-        credit_note=data["credit_note"],
-        hold_release=data["hold_release"],
-        total=data["total"]
-    )
 
-# ---------------- Contractor Download Report by pmc no ----------------
+#     result = PmcReport.download_pmc_report(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)
+#     if not result:
+#         return "No contractor found for this PMC No", 404
 
-    if not result:
+#     output_folder, file_name = result
-        return "No contractor found for this PMC No", 404
 
-    output_folder, file_name = result
+#     return send_from_directory(output_folder, file_name, as_attachment=True)
 
-    return send_from_directory(output_folder, file_name, as_attachment=True)

controllers/report_controller.py

@@ -1,13 +1,10 @@
-from flask import Blueprint, render_template, request, jsonify
+from flask import Blueprint, render_template, request, jsonify, send_file
 from flask_login import login_required, current_user
-
+from services.ReportService import ReportService
 from model.Report import ReportHelper
-from model.Log import LogHelper
-
 
 report_bp = Blueprint("report", __name__)
 
-
 # ---------------- Report Page ----------------
 @report_bp.route("/report")
 @login_required
@@ -20,28 +17,45 @@ def report_page():
 @login_required
 def search_contractor():
 
-    subcontractor_name = request.form.get("subcontractor_name")
-
-    LogHelper.log_action(
-        "Search Contractor",
-        f"User {current_user.id} searched contractor '{subcontractor_name}'"
-    )
-
     data = ReportHelper.search_contractor(request)
 
-    return jsonify(data)
+    # Pagination (basic)
+    page = int(request.form.get("page", 1))
+    per_page = 20
+
+    start = (page - 1) * per_page
+    end = start + per_page
+
+    paginated_data = data[start:end]
+
+    return jsonify({
+        "data": paginated_data,
+        "total": len(data)
+    })
 
 # ---------------- Contractor Report by contractor id ----------------
 @report_bp.route('/contractor_report/<int:contractor_id>')
 @login_required
 def contractor_report(contractor_id):
 
-    data = ReportHelper.get_contractor_report(contractor_id)
+    service = ReportService(contractor_id=contractor_id).load_data()
 
     return render_template(
         'subcontractor_report.html',
         contractor_id=contractor_id,
-        **data
+        **service.get_web_data()
+    )
+
+# ---------------- Contractor Report by pmc no ----------------
+@report_bp.route("/pmc_report/<pmc_no>")
+@login_required
+def pmc_report(pmc_no):
+
+    service = ReportService(pmc_no=pmc_no).load_data()
+
+    return render_template(
+        "pmc_report.html",
+        **service.get_web_data()
     )
 
 # ---------------- Contractor Download Report by contractor id ----------------
@@ -49,5 +63,24 @@ def contractor_report(contractor_id):
 @login_required
 def download_report(contractor_id):
 
-    return ReportHelper().download_report(contractor_id=contractor_id)
+    service = ReportService(contractor_id=contractor_id).load_data()
 
+    file, error = service.download_excel()
+
+    if error:
+        return error, 404
+
+    return send_file(file, as_attachment=True)
+
+# ---------------- Contractor Download Report by pmc no ----------------
+@report_bp.route("/download_pmc_report/<pmc_no>")
+@login_required
+def download_pmc_report(pmc_no):
+
+    service = ReportService(pmc_no=pmc_no).load_data()
+
+    file, error = service.download_excel()
+    if error:
+        return error, 404
+
+    return send_file(file, as_attachment=True)

controllers/state_controller.py

@@ -3,13 +3,13 @@ from flask_login import login_required
 from model.State import State
 
 state_bp = Blueprint('state', __name__)
-
+state = State()
-
+# ----- State page ------
 @state_bp.route('/add_state', methods=['GET', 'POST'])
 @login_required
 def add_state():
 
-    state = State()
+    # state = State()
 
     if request.method == 'POST':
         state.AddState(request=request)
@@ -19,35 +19,35 @@ 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():
 
-    state = State()
+    # state = 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()
+    # 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):
 
-    state = State()
+    # state = State()
 
     if request.method == 'POST':
 

controllers/subcontractor_controller.py

@@ -1,34 +1,11 @@
 from flask import Blueprint, render_template, request, redirect, url_for, jsonify
 from flask_login import login_required
 from model.Subcontractor import Subcontractor
+from model.Utilities import HtmlHelper, ResponseHandler
+
 
 subcontractor_bp = Blueprint('subcontractor', __name__)
 
-# ----------------------------------------------------------
-# Helpers (unchanged)
-# ----------------------------------------------------------
-class HtmlHelper:
-    @staticmethod
-    def json_response(data, status=200):
-        return jsonify(data), status
-
-class ResponseHandler:
-    @staticmethod
-    def fetch_failure(entity):
-        return {"status": "error", "message": f"Failed to fetch {entity}"}
-
-    @staticmethod
-    def add_failure(entity):
-        return {"status": "error", "message": f"Failed to add {entity}"}
-
-    @staticmethod
-    def update_failure(entity):
-        return {"status": "error", "message": f"Failed to update {entity}"}
-
-    @staticmethod
-    def delete_failure(entity):
-        return {"status": "error", "message": f"Failed to delete {entity}"}
-
 
 # ----------------------------------------------------------
 # LIST + ADD

controllers/village_controller.py

@@ -1,21 +1,24 @@
+
+
+
+
 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__)
-
+village = Village()
 
 # ------------------------- Add Village -------------------------
 @village_bp.route('/add_village', methods=['GET', 'POST'])
 @login_required
 def add_village():
 
-    village = Village()
+    # village = Village()
  
     if request.method == 'POST':
         village.AddVillage(request=request)
@@ -23,7 +26,6 @@ def add_village():
 
     state = State()
     states = state.GetAllStates(request=request)
-
     villages = village.GetAllVillages(request=request)
 
     return render_template(
@@ -42,7 +44,6 @@ def get_districts(state_id):
     cursor = connection.cursor()
 
     cursor.callproc("GetDistrictByStateID", [state_id])
-
     districts = []
 
     for rs in cursor.stored_results():
@@ -51,15 +52,7 @@ def get_districts(state_id):
     cursor.close()
     connection.close()
 
-    district_list = []
+    return jsonify([{"id": d[0], "name": d[1]} for d in districts])
-
-    for d in districts:
-        district_list.append({
-            "id": d[0],
-            "name": d[1]
-        })
-
-    return jsonify(district_list)
 
 
 # ------------------------- Fetch Blocks -------------------------
@@ -71,7 +64,6 @@ def get_blocks(district_id):
     cursor = connection.cursor()
 
     cursor.callproc("GetBlocksByDistrictID", [district_id])
-
     blocks = []
 
     for rs in cursor.stored_results():
@@ -80,49 +72,47 @@ def get_blocks(district_id):
     cursor.close()
     connection.close()
 
-    block_list = []
+    return jsonify([{"id": b[0], "name": b[1]} for b in blocks])
-
-    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()
-    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 = Village()
-
     village.DeleteVillage(request=request, village_id=village_id)
 
-    if not village.isSuccess:
+    # ✅ Convert resultMessage to string if it's a Response or tuple
-        flash(village.resultMessage, "error")
+    raw_msg = village.resultMessage
+
+    if isinstance(raw_msg, tuple):
+        # e.g., (<Response ...>, 200)
+        msg = "Village deleted successfully!"
+    elif hasattr(raw_msg, 'get_data'):
+        # Flask Response object
+        msg = raw_msg.get_data(as_text=True)  # get raw text
     else:
-        flash(village.resultMessage, "success")
+        # fallback
-
+        msg = str(raw_msg) if raw_msg else "Village deleted successfully!"
-    return redirect(url_for('village.add_village'))
 
+    return jsonify({
+        "status": "success" if village.isSuccess else "error",
+        "message": msg
+    })
 
 # ------------------------- Edit Village -------------------------
 @village_bp.route('/edit_village/<int:village_id>', methods=['GET', 'POST'])
 @login_required
 def edit_village(village_id):
 
-    village = Village()
+    # village = Village()
 
     if request.method == 'POST':
 
@@ -135,8 +125,8 @@ def edit_village(village_id):
         else:
             flash(village.resultMessage, "error")
 
-            village_data = village.GetVillageByID(request=request, id=village_id)
+            village_data = village.GetVillageByID(id=village_id) or []
-            blocks = village.GetAllBlocks(request=request)
+            blocks = village.GetAllBlocks() or []
 
             return render_template(
                 'edit_village.html',
@@ -145,23 +135,17 @@ def edit_village(village_id):
             )
 
     else:
-
+        # ✅ FIXED HERE (removed request)
-        village_data = village.GetVillageByID(request=request, id=village_id)
+        village_data = village.GetVillageByID(id=village_id)
 
         if not village.isSuccess:
             flash(village.resultMessage, "error")
             return redirect(url_for('village.add_village'))
 
-        blocks = village.GetAllBlocks(request=request)
+        blocks = village.GetAllBlocks() or []
-
-        if village_data is None:
-            village_data = []
-
-        if blocks is None:
-            blocks = []
 
         return render_template(
             'edit_village.html',
-            village_data=village_data,
+            village_data=village_data or [],
             blocks=blocks
         )

main.py

@@ -16,7 +16,7 @@ from controllers.payment_controller import payment_bp
 from controllers.gst_release_controller import gst_release_bp
 from controllers.excel_upload_controller import excel_bp 
 from controllers.report_controller import report_bp
-from controllers.pmc_report_controller import pmc_report_bp
+# from controllers.pmc_report_controller import pmc_report_bp
 
 from controllers.hold_types_controller import hold_bp
 from dotenv import load_dotenv
@@ -57,7 +57,7 @@ app.register_blueprint(payment_bp)
 app.register_blueprint(gst_release_bp)
 app.register_blueprint(excel_bp) 
 app.register_blueprint(report_bp)
-app.register_blueprint(pmc_report_bp)
+# app.register_blueprint(pmc_report_bp)
 app.register_blueprint(hold_bp)
 
 # ---------------- Run App ----------------

model/Block.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
-
+from model.ItemCRUD import ItemCRUD
-import os
-import config
-import re
-
-import mysql.connector
-from mysql.connector import Error
-
-from model.ItemCRUD import ItemCRUD, itemCRUDMapping
 
 
 class Block:
@@ -26,9 +12,7 @@ class Block:
         self.isSuccess = False
         self.resultMessage = ""
 
-    # ----------------------------------------------------------
     # Add Block
-    # ----------------------------------------------------------
     def AddBlock(self, request):
 
        block = ItemCRUD(itemType=ItemCRUDType.Block)
@@ -41,17 +25,7 @@ class Block:
        self.resultMessage = block.resultMessage
        return
 
-    # ----------------------------------------------------------
     # Get All Blocks     
-    # ----------------------------------------------------------
-    # def GetAllBlocks(self):
-
-    #     block = ItemCRUD(itemType=ItemCRUDType.Block)
-    #     blocksdata = block.GetAllData(request=request, storedproc="GetAllBlock")
-    #     self.isSuccess = block.isSuccess
-    #     self.resultMessage = block.resultMessage
-    #     return blocksdata
-            
     def GetAllBlocks(self, request):
 
         block = ItemCRUD(itemType=ItemCRUDType.Block)
@@ -61,18 +35,8 @@ class Block:
         self.resultMessage = block.resultMessage
         return blocksdata
 
-    # ----------------------------------------------------------
-    # Check Block Exists
-    # ----------------------------------------------------------
     
-    # def CheckBlock(self, request):
+    # Check Block Exists
-    #     block = ItemCRUD(itemType=ItemCRUDType.Block)
-    #     block_name = request.json.get('block_Name', '').strip()
-    #     district_id = request.json.get('district_Id')
-    #     result = block.CheckItem(request=request, parentid=district_id, childname=block_name, storedprocfetch="GetBlockByNameAndDistrict")
-    #     self.isSuccess = block.isSuccess
-    #     self.resultMessage = block.resultMessage
-    #     return result
     def CheckBlock(self, request):
         block = ItemCRUD(itemType=ItemCRUDType.Block)
         data = request.get_json(silent=True) or request.form
@@ -89,24 +53,7 @@ class Block:
         self.resultMessage = block.resultMessage
         return result
 
-    # ----------------------------------------------------------
     # Get Block By ID
-    # ----------------------------------------------------------
-    # def GetBlockByID(self, id):
-
-    #     block = ItemCRUD(itemType=ItemCRUDType.Village)
-    #     blockdata = block.GetAllData(id=id,storedproc="GetBlockDataByID")
-    #     self.isSuccess = block.isSuccess
-    #     self.resultMessage = block.resultMessage
-    #     print("akash"+blockdata)
-    #     return blockdata
-
-    # def GetBlockByID(self,request,id):
-    #     block = ItemCRUD(itemType=ItemCRUDType.Block)
-    #     blockdata = block.GetDataByID(request=request,id=id,storedproc="GetBlockDataByID")
-    #     self.isSuccess = block.isSuccess
-    #     self.resultMessage = block.resultMessage
-    #     return blockdata
     def GetBlockByID(self, id):
 
         block = ItemCRUD(itemType=ItemCRUDType.Block)
@@ -120,20 +67,8 @@ class Block:
         self.resultMessage = block.resultMessage
 
         return blockdata
-    # ----------------------------------------------------------
+    
     # Update Block
-    # ----------------------------------------------------------
-    # def EditBlock(self, request, block_id):
-
-    #     block = ItemCRUD(itemType=ItemCRUDType.Block)
-
-    #     district_id = request.form.get('district_Id')
-    #     block_name = request.form.get('block_Name', '').strip()
-
-    #     block.EditItem(request=request, childid=block_id, parentid=district_id, childname=block_name,  storedprocadd="UpdateBlockById" )
-    #     self.isSuccess = block.isSuccess
-    #     self.resultMessage = block.resultMessage
-    #     return
     def EditBlock(self, request, block_id):
 
         block = ItemCRUD(itemType=ItemCRUDType.Block)
@@ -151,11 +86,10 @@ class Block:
 
         self.isSuccess = block.isSuccess
         self.resultMessage = block.resultMessage
-        return render_template('add_block.html')
+        return 
+  
     
-    # ----------------------------------------------------------
     # Delete Block  
-    # ---------------------------------------------------------       
     def DeleteBlock(self,request, id):
         block = ItemCRUD(itemType=ItemCRUDType.Block)
 

model/ContractorInfo.py

@@ -1,72 +1,60 @@
-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 = ""
+    def __init__(self, contractor_id):
-    contInfo = None
+        self.ID = contractor_id
-    def __init__(self, id):
+        self.contInfo = None
-        self.ID = id
-        print(id)
         self.fetchData()
 
     def fetchData(self):
+        """Fetch basic contractor info by ID."""
         try:
             connection = config.get_db_connection()
-            cursor = connection.cursor(dictionary=True, buffered=True)        
+            with connection.cursor(dictionary=True, buffered=True) as cursor:
                 cursor.callproc('GetContractorInfoById', [self.ID])
+                # Get the first result set
                 for result in cursor.stored_results():
                     self.contInfo = result.fetchone()
-            
+        except Error as e:
-            print(self.contInfo,flush=True)
+            print(f"Error fetching contractor info: {e}")
         finally:
-            cursor.close()
+            if connection.is_connected():
                 connection.close()
 
     def fetchalldata(self):
-
+        """Fetch hold types and invoices for contractor."""
+        data = {}
         try:
             connection = config.get_db_connection()
-            cursor = connection.cursor(dictionary=True, buffered=True)
+            with connection.cursor(dictionary=True, buffered=True) as cursor:
-            print("here", flush=True)
+                # Fetch Hold Types
-            
-
-               # ---------------- 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}
+                data['hold_types'] = hold_type_map
 
-            # ---------------- Invoices ----------------
+                # Fetch 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()
+                seen_ids = set()
                 unique_invoices = []
                 for inv in invoices:
-                if inv["Invoice_Id"] not in invoice_ids_seen:
+                    if inv['Invoice_Id'] not in seen_ids:
-                    invoice_ids_seen.add(inv["Invoice_Id"])
+                        seen_ids.add(inv['Invoice_Id'])
                         unique_invoices.append(inv)
-            invoices = unique_invoices
+                data['invoices'] = unique_invoices
 
+        except Error as e:
+            print(f"Error fetching contractor data: {e}")
         finally:
-            cursor.close()
+            if connection.is_connected():
                 connection.close()
 
- 
+        return data

model/District.py

@@ -1,20 +1,6 @@
-from flask import Flask, render_template, request, redirect, url_for, send_from_directory, flash, jsonify, json
+from model.Utilities import ItemCRUDType
-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.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
 
-
+    # get district by district id
-    # 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
     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")

model/FolderAndFile.py

@@ -27,13 +27,27 @@ class FolderAndFile:
         os.makedirs(folder, exist_ok=True)
         return folder
 
-    # -----------------------------
+    @staticmethod
-    # FILE PATH METHODS
+    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)

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()
+        if not invoice_crud.isSuccess:
-        cursor = connection.cursor(dictionary=True)
+            return []  # Could also log invoice_crud.resultMessage
 
-        try:
+        invoices = [
-            # ----------- Invoices -----------
+            dict(
-            cursor.callproc('GetAllInvoicesBasic')
+                Invoice_No=row[1],
-            invoices = []
+                GST_SD_Amount=float(row[2]) if row[2] is not None else 0
-            for result in cursor.stored_results():
+            )
-                invoices = result.fetchall()
+            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 -----------
+        if not gst_crud.isSuccess:
-            cursor.callproc('GetAllGSTReleasesBasic')
+            return []  # Could also log gst_crud.resultMessage
-            gst_releases = []
-            for result in cursor.stored_results():
-                gst_releases = result.fetchall()
 
         gst_invoice_nos = {
-                g['Invoice_No']
+            g[2]  # Invoice_No is at index 2
-                for g in gst_releases
+            for g in gst_rows
-                if g['Invoice_No']
+            if g[2]
         }
 
         gst_basic_amounts = {
-                float(g['Basic_Amount'])
+            float(g[3])  # Basic_Amount at index 3
-                for g in gst_releases
+            for g in gst_rows
-                if g['Basic_Amount'] is not None
+            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 = inv['GST_SD_Amount'] in gst_basic_amounts
-                match_by_gst_amount = float(
-                    inv.get('GST_SD_Amount') or 0
-                ) in gst_basic_amounts
 
             if not (match_by_invoice or match_by_gst_amount):
                 unreleased.append(inv)
 
         return unreleased
-
-        finally:
-            cursor.close()
-            connection.close()
-            

model/HoldTypes.py

@@ -3,7 +3,6 @@ from model.ItemCRUD import ItemCRUD
 from model.Utilities import ItemCRUDType
 
 class HoldTypes:
-    """CRUD operations for Hold Types using ItemCRUD"""
 
     def __init__(self):
         self.isSuccess = False
@@ -33,7 +32,7 @@ class HoldTypes:
         self.isSuccess = hold.isSuccess
         self.resultMessage = hold.resultMessage
 
-        # ✅ Convert tuple → dictionary
+        #  Convert tuple → dictionary
         data = []
         for row in rows:
             data.append({
@@ -51,7 +50,7 @@ class HoldTypes:
         self.isSuccess = hold.isSuccess
         self.resultMessage = hold.resultMessage
 
-        # ✅ Convert tuple → dictionary
+        #  Convert tuple → dictionary
         if row:
             return {
                 "hold_type_id": row[0],

model/Invoice.py

@@ -1,274 +1,29 @@
+
 import config
 import mysql.connector
 
-# ------------------- Helper -------------------
+# ------------------- Helper Functions -------------------
 def clear_results(cursor):
+    """Consume all stored results to prevent cursor issues."""
     for r in cursor.stored_results():
         r.fetchall()
 
-
+def fetch_one(cursor):
-# ------------------- Get Village Id -------------------
+    """Fetch first row from stored results."""
-def get_village_id(village_name):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc("GetVillageIdByName", (village_name,))
-    village_result = None
-
-    for rs in cursor.stored_results():
-        village_result = rs.fetchone()
-
-    cursor.close()
-    connection.close()
-    return village_result
-
-
-# ------------------- Insert Invoice -------------------
-def insert_invoice(data, village_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        # 1. Insert Invoice
-        cursor.callproc('InsertInvoice', [
-            data.get('pmc_no'),
-            village_id,
-            data.get('work_type'),
-            data.get('invoice_details'),
-            data.get('invoice_date'),
-            data.get('invoice_no'),
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0)
-        ])
-
-        invoice_id = None
     for result in cursor.stored_results():
-            row = result.fetchone()
+        return result.fetchone()
-            if row:
+    return None
-                invoice_id = row.get('invoice_id')
-
-        if not invoice_id:
-            raise Exception("Invoice ID not returned")
-
-        # 2. Insert Inpayment
-        cursor.callproc('InsertInpayment', [
-            data.get('pmc_no'),
-            village_id,
-            data.get('work_type'),
-            data.get('invoice_details'),
-            data.get('invoice_date'),
-            data.get('invoice_no'),
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0),
-            data.get('subcontractor_id')
-        ])
-        clear_results(cursor)
-
-        connection.commit()
-        return invoice_id
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Assign Subcontractor -------------------
-def assign_subcontractor(data, village_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        cursor.callproc('AssignSubcontractor', [
-            data.get('pmc_no'),
-            data.get('subcontractor_id'),
-            village_id
-        ])
-        clear_results(cursor)
-
-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Insert Hold Types -------------------
-def insert_hold_types(data, invoice_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        hold_types = data.getlist('hold_type[]')
-        hold_amounts = data.getlist('hold_amount[]')
-
-        for hold_type, hold_amount in zip(hold_types, hold_amounts):
-            if not hold_type:
-                continue
-
-            cursor.callproc('GetHoldTypeIdByName', [hold_type])
-            hold_type_result = None
 
+def fetch_all(cursor):
+    """Fetch all rows from stored results."""
+    data = []
     for result in cursor.stored_results():
-                hold_type_result = result.fetchone()
+        data.extend(result.fetchall())
+    return data
 
-            if not hold_type_result:
+def get_numeric_values(data):
-                cursor.callproc('InsertHoldType', [hold_type, 0])
+    """Return numeric fields for invoices safely."""
-                cursor.execute("SELECT @_InsertHoldType_1")
+    return [
-                hold_type_id = cursor.fetchone()[0]
-            else:
-                hold_type_id = hold_type_result['hold_type_id']
-
-            hold_amount = float(hold_amount or 0)
-
-            cursor.callproc('InsertInvoiceSubcontractorHold', [
-                data.get('subcontractor_id'),
-                invoice_id,
-                hold_type_id,
-                hold_amount
-            ])
-            clear_results(cursor)
-
-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Get All Invoices -------------------
-def get_all_invoice_details():
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc('GetAllInvoiceDetails')
-    invoices = []
-
-    for result in cursor.stored_results():
-        invoices = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return invoices
-
-
-# ------------------- Get All Villages -------------------
-def get_all_villages():
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc("GetAllVillages")
-    villages = []
-
-    for result in cursor.stored_results():
-        villages = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return villages
-
-
-# ------------------- Search Contractors -------------------
-def search_contractors(sub_query):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc('SearchContractorsByName', [sub_query])
-    results = []
-
-    for result in cursor.stored_results():
-        results = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return results
-
-
-# ------------------- Get All Hold Types -------------------
-def get_all_hold_types():
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc("GetAllHoldTypes")
-    hold_types = []
-
-    for result in cursor.stored_results():
-        hold_types = result.fetchall()
-
-    cursor.close()
-    connection.close()
-    return hold_types
-
-
-# ------------------- Get Invoice By Id -------------------
-def get_invoice_by_id(invoice_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    cursor.callproc('GetInvoiceDetailsById', [invoice_id])
-    invoice = None
-
-    for result in cursor.stored_results():
-        invoice = result.fetchone()
-
-    cursor.callproc('GetHoldAmountsByInvoiceId', [invoice_id])
-    hold_amounts = []
-
-    for result in cursor.stored_results():
-        hold_amounts = result.fetchall()
-
-    if invoice:
-        invoice["hold_amounts"] = hold_amounts
-
-    cursor.close()
-    connection.close()
-    return invoice
-
-
-# ------------------- Update Invoice -------------------
-def update_invoice(data, invoice_id):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        cursor.callproc("GetVillageIdByName", (data.get('village'),))
-        village = None
-
-        for rs in cursor.stored_results():
-            village = rs.fetchone()
-
-        village_id = village['Village_Id']
-
-        numeric = [
         float(data.get('basic_amount') or 0),
         float(data.get('debit_amount') or 0),
         float(data.get('after_debit_amount') or 0),
@@ -282,6 +37,115 @@ def update_invoice(data, invoice_id):
         float(data.get('final_amount') or 0),
     ]
 
+def execute_db_operation(operation_func):
+    """General DB operation wrapper with commit/rollback."""
+    connection = config.get_db_connection()
+    cursor = connection.cursor(dictionary=True)
+    try:
+        result = operation_func(cursor)
+        connection.commit()
+        return result
+    except Exception:
+        connection.rollback()
+        raise
+    finally:
+        cursor.close()
+        connection.close()
+
+
+# ------------------- Village Functions -------------------
+def get_village_id(village_name):
+    def operation(cursor):
+        cursor.callproc("GetVillageIdByName", (village_name,))
+        return fetch_one(cursor)
+    return execute_db_operation(operation)
+
+def get_all_villages():
+    def operation(cursor):
+        cursor.callproc("GetAllVillages")
+        return fetch_all(cursor)
+    return execute_db_operation(operation)
+
+ 
+# ------------------- Invoice Functions -------------------
+def insert_invoice(data, village_id):
+    def operation(cursor):
+        # Insert invoice
+        # cursor.callproc('InsertInvoice', [
+        #     data.get('pmc_no'),
+        #     village_id,
+        #     data.get('work_type'),
+        #     data.get('invoice_details'),
+        #     data.get('invoice_date'),
+        #     data.get('invoice_no'),
+        #     *get_numeric_values(data),
+        #     data.get('subcontractor_id')
+
+        # ])
+        # invoice_row = fetch_one(cursor)
+        # if not invoice_row:
+        #     raise Exception("Invoice ID not returned")
+        # invoice_id = invoice_row.get('invoice_id')
+        cursor.callproc('SaveInvoice', [
+            data.get('pmc_no'),
+            village_id,
+            data.get('work_type'),
+            data.get('invoice_details'),
+            data.get('invoice_date'),
+            data.get('invoice_no'),
+            *get_numeric_values(data),
+            data.get('subcontractor_id'),
+            0
+        ])
+        invoice_id = None
+        for result in cursor.stored_results():
+            row = result.fetchone()
+            if row:
+                invoice_id = row['invoice_id']
+
+        # # Insert inpayment
+        # cursor.callproc('InsertInpayment', [
+        #     data.get('pmc_no'),
+        #     village_id,
+        #     data.get('work_type'),
+        #     data.get('invoice_details'),
+        #     data.get('invoice_date'),
+        #     data.get('invoice_no'),
+        #     *get_numeric_values(data),
+        #     data.get('subcontractor_id')
+        # ])
+        # clear_results(cursor)
+        return invoice_id
+
+    return execute_db_operation(operation)
+
+def get_all_invoice_details():
+    def operation(cursor):
+        cursor.callproc('GetAllInvoiceDetails')
+        return fetch_all(cursor)
+    return execute_db_operation(operation)
+
+def get_invoice_by_id(invoice_id):
+    def operation(cursor):
+        cursor.callproc('GetInvoiceDetailsById', [invoice_id])
+        invoice = fetch_one(cursor)
+
+        cursor.callproc('GetHoldAmountsByInvoiceId', [invoice_id])
+        hold_amounts = fetch_all(cursor)
+
+        if invoice:
+            invoice["hold_amounts"] = hold_amounts
+        return invoice
+    return execute_db_operation(operation)
+
+def update_invoice(data, invoice_id):
+    def operation(cursor):
+        cursor.callproc("GetVillageIdByName", (data.get('village'),))
+        village = fetch_one(cursor)
+        if not village:
+            raise Exception("Village not found")
+        village_id = village['Village_Id']
+
         cursor.callproc('UpdateInvoice', [
             data.get('pmc_no'),
             village_id,
@@ -289,91 +153,101 @@ def update_invoice(data, invoice_id):
             data.get('invoice_details'),
             data.get('invoice_date'),
             data.get('invoice_no'),
-            *numeric,
+            *get_numeric_values(data),
             invoice_id
         ])
         clear_results(cursor)
+    execute_db_operation(operation)
 
-        connection.commit()
+# def update_inpayment(data):
+#     def operation(cursor):
+#         cursor.callproc('UpdateInpayment', [
+#             data.get('work_type'),
+#             data.get('invoice_details'),
+#             data.get('invoice_date'),
+#             *get_numeric_values(data),
+#             data.get('pmc_no'),
+#             data.get('invoice_no')
+#         ])
+#         clear_results(cursor)
+#     execute_db_operation(operation)
 
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Update Inpayment -------------------
-def update_inpayment(data):
-    connection = config.get_db_connection()
-    cursor = connection.cursor(dictionary=True)
-
-    try:
-        numeric = [
-            float(data.get('basic_amount') or 0),
-            float(data.get('debit_amount') or 0),
-            float(data.get('after_debit_amount') or 0),
-            float(data.get('amount') or 0),
-            float(data.get('gst_amount') or 0),
-            float(data.get('tds_amount') or 0),
-            float(data.get('sd_amount') or 0),
-            float(data.get('on_commission') or 0),
-            float(data.get('hydro_testing') or 0),
-            float(data.get('gst_sd_amount') or 0),
-            float(data.get('final_amount') or 0),
-        ]
-
-        cursor.callproc('UpdateInpayment', [
-            data.get('work_type'),
-            data.get('invoice_details'),
-            data.get('invoice_date'),
-            *numeric,
-            data.get('pmc_no'),
-            data.get('invoice_no')
-        ])
-        clear_results(cursor)
-
-        connection.commit()
-
-    except Exception as e:
-        connection.rollback()
-        raise e
-
-    finally:
-        cursor.close()
-        connection.close()
-
-
-# ------------------- Delete Invoice -------------------
 def delete_invoice_data(invoice_id, user_id):
-    connection = config.get_db_connection()
+    def operation(cursor):
-    cursor = connection.cursor(dictionary=True)
+        # Fetch PMC and Invoice_No from DB
-
+        cursor.callproc('GetInvoicePMCById', (invoice_id,))
-    try:
-        cursor.callproc('GetInvoicePMCById', [invoice_id])
-
         record = {}
         for result in cursor.stored_results():
             record = result.fetchone() or {}
         if not record:
             raise Exception("Invoice not found")
 
+        # Use exact DB keys
+        pmc_no = record['PMC_No']
+        invoice_no = record['Invoice_No']
+
+        # Delete invoice
         cursor.callproc("DeleteInvoice", (invoice_id,))
         clear_results(cursor)
 
-        cursor.callproc(
+        # Delete inpayment
-            'DeleteInpaymentByPMCInvoice',
+        # cursor.callproc('DeleteInpaymentByPMCInvoice', (pmc_no, invoice_no))
-            [record['PMC_No'], record['invoice_no']]
+        # clear_results(cursor)
-        )
 
-        connection.commit()
+    execute_db_operation(operation)
 
-    except Exception as e:
-        connection.rollback()
-        raise e
 
-    finally:
+# ------------------- Subcontractor Functions -------------------
-        cursor.close()
+# def assign_subcontractor(data, village_id):
-        connection.close()
+#     def operation(cursor):
+#         cursor.callproc('AssignSubcontractor', [
+#             data.get('pmc_no'),
+#             data.get('subcontractor_id'),
+#             village_id
+#         ])
+#         clear_results(cursor)
+#     execute_db_operation(operation)
+
+
+# ------------------- Hold Types Functions -------------------
+def insert_hold_types(data, invoice_id):
+    def operation(cursor):
+        hold_types = data.getlist('hold_type[]')
+        hold_amounts = data.getlist('hold_amount[]')
+
+        for hold_type, hold_amount in zip(hold_types, hold_amounts):
+            if not hold_type:
+                continue
+
+            cursor.callproc('GetHoldTypeIdByName', [hold_type])
+            hold_type_result = fetch_one(cursor)
+
+            if not hold_type_result:
+                cursor.callproc('InsertHoldType', [hold_type, 0])
+                cursor.execute("SELECT @_InsertHoldType_1")
+                hold_type_id = cursor.fetchone()[0]
+            else:
+                hold_type_id = hold_type_result['hold_type_id']
+
+            cursor.callproc('InsertInvoiceSubcontractorHold', [
+                data.get('subcontractor_id'),
+                invoice_id,
+                hold_type_id,
+                float(hold_amount or 0)
+            ])
+            clear_results(cursor)
+    execute_db_operation(operation)
+
+def get_all_hold_types():
+    def operation(cursor):
+        cursor.callproc("GetAllHoldTypes")
+        return fetch_all(cursor)
+    return execute_db_operation(operation)
+
+
+# ------------------- Contractor Functions -------------------
+def search_contractors(sub_query):
+    def operation(cursor):
+        cursor.callproc('SearchContractorsByName', [sub_query])
+        return fetch_all(cursor)
+    return execute_db_operation(operation)

model/ItemCRUD.py

@@ -6,7 +6,6 @@ import config
 import re
 import mysql.connector
 
-
 # ----------------------------------------------------------
 # Mapping Class
 # ----------------------------------------------------------
@@ -23,10 +22,11 @@ class itemCRUDMapping:
             self.name = "Hold Type"
         elif itemType is ItemCRUDType.Subcontractor:
             self.name = "Subcontractor"
+        elif itemType.name == "GSTRelease":
+            self.name = "GSTRelease"
         else:
             self.name = "Item"
 
-
 # ----------------------------------------------------------
 # Generic CRUD Class
 # ----------------------------------------------------------
@@ -93,13 +93,47 @@ class ItemCRUD:
 
         try:
             # ======================================================
-            # SUBCONTRACTOR (MULTI-FIELD)
+            # GSTRelease MULTI-FIELD
             # ======================================================
-            if data:
+            if self.itemCRUDType.name == "GSTRelease" and data:
+
+                # Duplicate check (PMC_No + Invoice_No)
+                if storedprocfetch:
+                    cursor.callproc(storedprocfetch, (data['PMC_No'], data['Invoice_No']))
+                    existing_item = None
+                    for rs in cursor.stored_results():
+                        existing_item = rs.fetchone()
+                    if existing_item:
+                        self.isSuccess = False
+                        self.resultMessage = HtmlHelper.json_response(
+                            ResponseHandler.already_exists(self.itemCRUDMapping.name), 409
+                        )
+                        return
+
+                # Insert GSTRelease
+                cursor.callproc(storedprocadd, (
+                    data['PMC_No'],
+                    data['Invoice_No'],
+                    data['Basic_Amount'],
+                    data['Final_Amount'],
+                    data['Total_Amount'],
+                    data['UTR'],
+                    data['Contractor_ID']
+                ))
+                connection.commit()
+
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.add_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # SUBCONTRACTOR MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "Subcontractor" and data:
 
-                # Duplicate check
                 cursor.callproc(storedprocfetch, (data['Contractor_Name'],))
-
                 existing_item = None
                 for rs in cursor.stored_results():
                     existing_item = rs.fetchone()
@@ -111,7 +145,6 @@ class ItemCRUD:
                     )
                     return
 
-                # Insert
                 cursor.callproc(storedprocadd, (
                     data['Contractor_Name'],
                     data['Address'],
@@ -123,26 +156,24 @@ class ItemCRUD:
                     data['GST_No'],
                     data['Contractor_password']
                 ))
-
                 connection.commit()
-
                 self.isSuccess = True
                 self.resultMessage = HtmlHelper.json_response(
                     ResponseHandler.add_success(self.itemCRUDMapping.name), 200
                 )
                 return
             
+
             # ======================================================
-            # NORMAL (Village / Block / State)
+            # NORMAL SINGLE-FIELD (Village / Block / State)
             # ======================================================
-            if not re.match(RegEx.patternAlphabetOnly, childname):
+            if not re.match(RegEx.allPattern, childname):
                 self.isSuccess = False
                 self.resultMessage = HtmlHelper.json_response(
                     ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
                 )
                 return
 
-            # Duplicate check
             if parentid is None:
                 cursor.callproc(storedprocfetch, (childname,))
             else:
@@ -159,17 +190,14 @@ class ItemCRUD:
                 )
                 return
 
-            # Insert
             if parentid is None:
                 cursor.callproc(storedprocadd, (childname,))
             else:
                 cursor.callproc(storedprocadd, (childname, parentid))
 
             connection.commit()
-
             self.isSuccess = True
             self.resultMessage = HtmlHelper.json_response(
-              
                 ResponseHandler.add_success(self.itemCRUDMapping.name), 200
             )
 
@@ -199,9 +227,32 @@ class ItemCRUD:
 
         try:
             # ======================================================
-            # SUBCONTRACTOR (MULTI-FIELD)
+            # GSTRelease MULTI-FIELD
             # ======================================================
-            if data:
+            if self.itemCRUDType.name == "GSTRelease" and data:
+
+                cursor.callproc(storedprocupdate, (
+                    data['p_pmc_no'],       # PMC_No
+                    data['p_invoice_no'],   # Invoice_No
+                    data['p_basic_amount'], # Basic_Amount
+                    data['p_final_amount'], # Final_Amount
+                    data['p_total_amount'], # Total_Amount
+                    data['p_utr'],          # UTR
+                    data['p_gst_release_id']# GST_Release_Id
+                ))
+                connection.commit()
+
+                self.isSuccess = True
+                self.resultMessage = HtmlHelper.json_response(
+                    ResponseHandler.update_success(self.itemCRUDMapping.name), 200
+                )
+                return
+
+            # ======================================================
+            # SUBCONTRACTOR MULTI-FIELD
+            # ======================================================
+            if self.itemCRUDType.name == "Subcontractor" and data:
+
                 cursor.callproc(storedprocupdate, (
                     childid,
                     data['Contractor_Name'],
@@ -214,9 +265,7 @@ class ItemCRUD:
                     data['GST_No'],
                     data['Contractor_password']
                 ))
-
                 connection.commit()
-
                 self.isSuccess = True
                 self.resultMessage = HtmlHelper.json_response(
                     ResponseHandler.update_success(self.itemCRUDMapping.name), 200
@@ -224,9 +273,9 @@ class ItemCRUD:
                 return
 
             # ======================================================
-            # NORMAL
+            # NORMAL SINGLE-FIELD
             # ======================================================
-            if not re.match(RegEx.patternAlphabetOnly, childname):
+            if not re.match(RegEx.allPattern, childname):
                 self.isSuccess = False
                 self.resultMessage = ResponseHandler.update_failure(self.itemCRUDMapping.name)['message']
                 return
@@ -237,7 +286,6 @@ class ItemCRUD:
                 cursor.callproc(storedprocupdate, (childid, parentid, childname))
 
             connection.commit()
-
             self.isSuccess = True
             self.resultMessage = ResponseHandler.update_success(self.itemCRUDMapping.name)['message']
 
@@ -259,20 +307,15 @@ class ItemCRUD:
 
         data = []
         connection = config.get_db_connection()
-
         if not connection:
             return []
 
         cursor = connection.cursor()
-
         try:
             cursor.callproc(storedproc)
-
             for result in cursor.stored_results():
                 data = result.fetchall()
-
             self.isSuccess = True
-
         except mysql.connector.Error as e:
             print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
             self.isSuccess = False
@@ -280,7 +323,6 @@ class ItemCRUD:
                 ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
             )
             return []
-
         finally:
             cursor.close()
             connection.close()
@@ -298,13 +340,10 @@ class ItemCRUD:
 
         try:
             cursor.callproc(storedproc, (id,))
-
             for rs in cursor.stored_results():
                 data = rs.fetchone()
-
         except mysql.connector.Error as e:
             print(f"Error fetching {self.itemCRUDMapping.name}: {e}")
-
         finally:
             cursor.close()
             connection.close()
@@ -324,7 +363,7 @@ class ItemCRUD:
             f"User {current_user.id} checked '{childname}'"
         )
 
-        if not re.match(RegEx.patternAlphabetOnly, childname):
+        if not re.match(RegEx.allPattern, childname):
             return HtmlHelper.json_response(
                 ResponseHandler.invalid_name(self.itemCRUDMapping.name), 400
             )
@@ -353,7 +392,6 @@ class ItemCRUD:
             return HtmlHelper.json_response(
                 ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
             )
-
         finally:
             cursor.close()
             connection.close()

model/Log.py

@@ -1,10 +1,9 @@
-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 +13,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
+            return current_user.sAMAccountName
-        else:
+        return "Unknown"
-            self.user = "Unknown"
 
     def WriteLog(self, action, details=""):
         """Log user actions with timestamp, user, action, and details."""
@@ -42,7 +43,6 @@ class LogData:
                 f"Details: {details}\n"
             )
 
-
     def GetActivitiesLog(self):
         logs = []
 
@@ -60,7 +60,6 @@ class LogData:
         return logs
 
     def GetFilteredActivitiesLog(self, startDate, endDate, userName):
-
         filtered_logs = self.GetActivitiesLog()
 
         # Date filter
@@ -69,16 +68,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:

model/PmcReport.py

@@ -1,456 +1,137 @@
-import openpyxl
-from openpyxl.styles import Font, PatternFill
 import config
 from flask_login import current_user
 from model.Log import LogHelper
 
-from model.Report import ReportHelper
+from services.Generalservice import GeneralUse
 from model.FolderAndFile import FolderAndFile
+from model.Report import ReportHelper
 
 class PmcReport:
+    data=[]
 
-    @staticmethod
+    # @staticmethod
-    def get_pmc_report(pmc_no):
+    # def get_pmc_report(pmc_no):
 
-        connection = config.get_db_connection()
+    #     connection = config.get_db_connection()
-        cursor = connection.cursor(dictionary=True, buffered=True)
+    #     cursor = connection.cursor(dictionary=True, buffered=True)
 
-        try:
+    #     try:
+    #         pmc_info = GeneralUse.execute_sp(cursor, 'GetContractorInfoByPmcNo', [pmc_no], True)
+    #         cursor.callproc("Get_pmc_hold_types", (pmc_no, pmc_info["Contractor_Id"]))
+    #         hold_types = next(cursor.stored_results()).fetchall()
 
-            # cursor.callproc("GetContractorInfoByPmcNo", (pmc_no,))
+    #         # Extract hold_type_ids
-            # pmc_info = next(cursor.stored_results()).fetchone()
+    #         hold_type_ids = [ht['hold_type_id'] for ht in hold_types]
-            pmc_info = ReportHelper.execute_sp(cursor, 'GetContractorInfoByPmcNo', [pmc_no], True)
 
-            if not pmc_info:
+    #         invoices = []
-                return None
+    #         hold_type_ids_str = ",".join(map(str, hold_type_ids))
-
+    #         cursor.callproc('GetInvoices_WithHold',[pmc_no, pmc_info["Contractor_Id"], hold_type_ids_str])
-            cursor.callproc("Get_pmc_hold_types", (pmc_no, pmc_info["Contractor_Id"]))
-            hold_types = next(cursor.stored_results()).fetchall()
-
-            # Extract hold_type_ids
-            hold_type_ids = [ht['hold_type_id'] for ht in hold_types]
-
-            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"]]
-                    )
-            for result in cursor.stored_results():
-                    invoices = result.fetchall()
-
-            if hold_type_ids:
-                hold_amount_total = sum(row.get('hold_amount', 0) or 0 for row in invoices)
-
-            total_invo_final = sum(row.get('Final_Amount', 0) or 0 for row in invoices)
-
-
-            # GST RELEASE
-            # cursor.callproc('GetGSTReleaseByPMC', [pmc_no])
-            # gst_rel = []
     #         for result in cursor.stored_results():
-            #     gst_rel = result.fetchall()
+    #                 invoices = result.fetchall()
 
-            gst_rel = ReportHelper.execute_sp(cursor, 'GetGSTReleaseByPMC', [pmc_no])
+    #         gst_rel = GeneralUse.execute_sp(cursor, 'GetGSTReleaseByPMC', [pmc_no])
          
-            total_gst_basic = sum(row.get('basic_amount', 0) or 0 for row in gst_rel)
+    #         hold_release = GeneralUse.execute_sp(cursor, 'GetHoldReleaseByPMC', [pmc_no])
-            total_gst_final = sum(row.get('final_amount', 0) or 0 for row in gst_rel)
             
-            # ---------------- HOLD RELEASE ----------------
+    #         credit_note = GeneralUse.execute_sp(cursor, 'GetCreditNoteByPMC', [pmc_no])
-            # 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])
+    #         payments = GeneralUse.execute_sp(cursor, 'GetPaymentsByPMC', [pmc_no])
           
-            # ---------------- CREDIT NOTE ----------------
+    #         totals = {
-            # cursor.callproc('GetCreditNoteByPMC', [pmc_no])
+    #             "sum_invo_basic_amt": sum(row.get('Basic_Amount', 0) or 0 for row in invoices),
-            # credit_note = []
+    #             "sum_invo_debit_amt": sum(row.get('Debit_Amount', 0) or 0 for row in invoices),
-            # for result in cursor.stored_results():
+    #             "sum_invo_after_debit_amt": sum(row.get('After_Debit_Amount', 0) or 0 for row in invoices),
-            #     credit_note = result.fetchall()
+    #             "sum_invo_amt": sum(row.get('Amount', 0) or 0 for row in invoices),
+    #             "sum_invo_gst_amt": sum(row.get('GST_Amount', 0) or 0 for row in invoices),
+    #             "sum_invo_tds_amt": sum(row.get('TDS_Amount', 0) or 0 for row in invoices),
+    #             "sum_invo_ds_amt": sum(row.get('SD_Amount', 0) or 0 for row in invoices),
+    #             "sum_invo_on_commission": sum(row.get('On_Commission', 0) or 0 for row in invoices),
+    #             "sum_invo_hydro_test": sum(row.get('Hydro_Testing', 0) or 0 for row in invoices),
+    #             "sum_invo_gst_sd_amt": sum(row.get('GST_SD_Amount', 0) or 0 for row in invoices),
+    #             "sum_invo_final_amt": sum(row.get('Final_Amount', 0) or 0 for row in invoices),
+    #             "sum_invo_hold_amt": sum(row.get('hold_amount', 0) or 0 for row in invoices),
+    #             "sum_gst_basic_amt": sum(row.get('basic_amount', 0) or 0 for row in gst_rel),
+    #             "sum_gst_final_amt": sum(row.get('final_amount', 0) or 0 for row in gst_rel),
+    #             "sum_pay_payment_amt": sum(row.get('Payment_Amount', 0) or 0 for row in payments),
+    #             "sum_pay_tds_payment_amt": sum(row.get('TDS_Payment_Amount', 0) or 0 for row in payments),
+    #             "sum_pay_total_amt": sum(row.get('Total_amount', 0) or 0 for row in payments)
+    #         }
 
-            credit_note = ReportHelper.execute_sp(cursor, 'GetCreditNoteByPMC', [pmc_no])
+    #         return {
+    #             "info": pmc_info,
+    #             "invoices": invoices,
+    #             "hold_types": hold_types,
+    #             "gst_rel": gst_rel,
+    #             "payments": payments,
+    #             "credit_note": credit_note,
+    #             "hold_release": hold_release,
+    #             "total": totals
+    #         }
 
-            payments = ReportHelper.execute_sp(cursor, 'GetPaymentsByPMC', [pmc_no])
+    #     finally:
+    #         cursor.close()
+    #         connection.close()
 
 
-            # ---------------- PAYMENTS ----------------
-            # 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)
-
-            totals = {
-                "sum_invo_basic_amt": sum(row.get('Basic_Amount', 0) or 0 for row in invoices),
-                "sum_invo_debit_amt": sum(row.get('Debit_Amount', 0) or 0 for row in invoices),
-                "sum_invo_after_debit_amt": sum(row.get('After_Debit_Amount', 0) or 0 for row in invoices),
-                "sum_invo_amt": sum(row.get('Amount', 0) or 0 for row in invoices),
-                "sum_invo_gst_amt": sum(row.get('GST_Amount', 0) or 0 for row in invoices),
-                "sum_invo_tds_amt": sum(row.get('TDS_Amount', 0) or 0 for row in invoices),
-                "sum_invo_ds_amt": sum(row.get('SD_Amount', 0) or 0 for row in invoices),
-                "sum_invo_on_commission": sum(row.get('On_Commission', 0) or 0 for row in invoices),
-                "sum_invo_hydro_test": sum(row.get('Hydro_Testing', 0) or 0 for row in invoices),
-                "sum_invo_gst_sd_amt": sum(row.get('GST_SD_Amount', 0) or 0 for row in invoices),
-                "sum_invo_final_amt": total_invo_final,
-                "sum_invo_hold_amt": hold_amount_total,
-                "sum_gst_basic_amt": total_gst_basic,
-                "sum_gst_final_amt": total_gst_final,
-                "sum_pay_payment_amt": total_pay_amount,
-                "sum_pay_tds_payment_amt": sum(row.get('TDS_Payment_Amount', 0) or 0 for row in payments),
-                "sum_pay_total_amt": total_pay_total
-            }
-
-            return {
-                "info": pmc_info,
-                "invoices": invoices,
-                "hold_types": hold_types,
-                "gst_rel": gst_rel,
-                "payments": payments,
-                "credit_note": credit_note,
-                "hold_release": hold_release,
-                "total": totals
-            }
-
-        finally:
-            cursor.close()
-            connection.close()
-
-
-    @staticmethod
-    def download_pmc_report(pmc_no):
-
-        connection = config.get_db_connection()
-        if not connection:
-            return None
-
-        cursor = connection.cursor(dictionary=True)
-
-        try:
-            # filename
-            filename = f"PMC_Report_{pmc_no}.xlsx"
-
-            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
-
-            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}
-
-            invoices = ReportHelper.execute_sp(cursor, 'GetInvoicesAndGstReleaseByPmcNo', [pmc_no])
-
-            credit_notes = ReportHelper.execute_sp(cursor, 'GetCreditNoteByContractor', [contractor_info["Contractor_Id"]])
-
-            hold_amounts = ReportHelper.execute_sp(cursor, 'GetHoldAmountsByContractor', [contractor_info["Contractor_Id"]])
-
-            all_payments = ReportHelper.execute_sp(cursor, 'GetAllPaymentsByPMC', [pmc_no])
-
-            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']
-
-            payments_map = {}
-            for pay in all_payments:
-                if pay['invoice_no']:
-                    payments_map.setdefault(pay['invoice_no'], []).append(pay)
-
-            # ================= 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"]])
-            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","Amount","TDS",
-                "SD","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"
-            ]
-
-            headers = base_headers + hold_headers + payment_headers
-            sheet.append(headers)
-
-            # STYLE
-            for cell in sheet[sheet.max_row]:
-                cell.font = Font(bold=True)
-
-            # DATA
-            seen_invoices = set()
-
-            for inv in invoices:
-
-                invoice_no = inv["Invoice_No"]
-                payments = payments_map.get(invoice_no, [])
-
-                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"]
-                ]
-
-                # 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 "",
-                    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)
-
-            # 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, 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()
+    #     if not connection:
+    #         return None
+
     #     cursor = connection.cursor(dictionary=True)
 
-    #     # output_folder = "static/download"
+    #     try:
-    #     # 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_folder = FolderAndFile.get_download_folder()
     #         output_file = FolderAndFile.get_download_path(filename)
 
-    #     try:
+    #         contractor_info = GeneralUse.execute_sp(cursor, 'GetContractorInfoByPmcNo', [pmc_no])
 
-    #         cursor.callproc('GetContractorDetailsByPMC', [pmc_no])
+    #         contractor_info = contractor_info[0] if contractor_info else None
-    #         contractor_info = next(cursor.stored_results()).fetchone()
+    #         print("contractor_info:::",contractor_info)
 
     #         if not contractor_info:
     #             return None
 
-    #         cursor.callproc('GetHoldTypesByContractor', [contractor_info["Contractor_Id"]])
+    #         hold_types = GeneralUse.execute_sp(cursor, '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 = GeneralUse.execute_sp(cursor, 'GetInvoicesByContractorOrPMCNo', [None,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_notes = GeneralUse.execute_sp(cursor, 'NewGetCreditNotesByPMCNo', [pmc_no])
     #         credit_note_map = {}
     #         for cn in credit_notes:
-    #             key = (cn["PMC_No"], cn["Invoice_No"])
+               
+    #             key = (str(cn['PMC_No']).strip())
     #             credit_note_map.setdefault(key, []).append(cn)
 
-    #         cursor.callproc('GetHoldAmountsByContractor', [contractor_info["Contractor_Id"]])
+    #         hold_amounts = GeneralUse.execute_sp(cursor, 'GetHoldAmountsByContractor', [contractor_info["Contractor_Id"]])
-    #         hold_amounts = next(cursor.stored_results()).fetchall()
 
+    #         gst_releases = GeneralUse.execute_sp(cursor, 'GetGSTReleaseDetailsByPMC', [pmc_no])
+    #         gst_release_map = {}
+    #         for gr in gst_releases:
+    #             key = (str(gr['PMC_No']).strip())
+    #             gst_release_map.setdefault(key, []).append(gr)
+
+    #         # ================= 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])
+    #         # ================= LOG =================
-    #         all_payments = next(cursor.stored_results()).fetchall()
+    #         LogHelper.log_action("Download PMC Report",f"User {current_user.id} Download PMC Report '{pmc_no}'")
 
-    #         payments_map = {}
+    #         ReportHelper.generate_excel(
-    #         extra_payments = []
+    #                 0, contractor_info, invoices, hold_types, hold_data,
-
+    #                 credit_note_map,gst_release_map, output_file)
-    #         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()
+

model/Report.py

@@ -2,9 +2,10 @@ import config
 from datetime import datetime
 from flask import send_file
 import openpyxl
-from openpyxl.styles import Font
+from openpyxl.styles import Font, PatternFill
 
 from model.FolderAndFile import FolderAndFile
+from services.Generalservice import GeneralUse
 
 class ReportHelper:
     isSuccess = False
@@ -16,30 +17,6 @@ class ReportHelper:
         self.resultMessage = ""
         self.data = []
 
-    @staticmethod
-    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):
@@ -59,10 +36,7 @@ class ReportHelper:
         cursor = connection.cursor(dictionary=True)
 
         try:
-            data = ReportHelper.execute_sp(
+            data = GeneralUse.execute_sp(cursor,"search_contractor_info",[
-                cursor,
-                "search_contractor_info",
-                [
                     subcontractor_name or None,
                     pmc_no or None,
                     state or None,
@@ -71,8 +45,7 @@ class ReportHelper:
                     village or None,
                     year_from or None,
                     year_to or None
-                ]
+                ])
-            )
 
         except Exception as e:
             print(f"Error in search_contractor: {e}")
@@ -86,190 +59,154 @@ class ReportHelper:
 
 
     @staticmethod
-    def get_contractor_report(contractor_id):
+    def get_contractor_info(contractor_id):
-            connection = config.get_db_connection()
+        from model.ContractorInfo import ContractorInfo
-            cursor = connection.cursor(dictionary=True, buffered=True)
+        contractor = ContractorInfo(contractor_id)
+        return contractor.contInfo if contractor.contInfo else None
 
-            try:
-                # Contractor Info (only one fetch)
-                contInfo = ReportHelper.execute_sp(cursor, 'GetContractorInfo', [contractor_id], True)
-                # Hold Types
-                hold_types = ReportHelper.execute_sp(cursor, 'GetContractorHoldTypes', [contractor_id])
-                # Invoices
-                invoices = ReportHelper.execute_sp(cursor, 'GetContractorInvoices', [contractor_id])
-                # GST Release
-                gst_rel = ReportHelper.execute_sp(cursor, 'GetGSTRelease', [contractor_id])
-                # Hold Release
-                hold_release = ReportHelper.execute_sp(cursor, 'GetHoldRelease', [contractor_id])
-                # Credit Note
-                credit_note = ReportHelper.execute_sp(cursor, 'GetCreditNote', [contractor_id])
-                # Payments
-                payments = ReportHelper.execute_sp(cursor, 'GetPayments', [contractor_id])
-
-                # Totals
-                total = {
-                    "sum_invo_basic_amt": float(sum(row['Basic_Amount'] or 0 for row in invoices)),
-                    "sum_invo_debit_amt": float(sum(row['Debit_Amount'] or 0 for row in invoices)),
-                    "sum_invo_after_debit_amt": float(sum(row['After_Debit_Amount'] or 0 for row in invoices)),
-                    "sum_invo_amt": float(sum(row['Amount'] or 0 for row in invoices)),
-                    "sum_invo_gst_amt": float(sum(row['GST_Amount'] or 0 for row in invoices)),
-                    "sum_invo_tds_amt": float(sum(row['TDS_Amount'] or 0 for row in invoices)),
-                    "sum_invo_ds_amt": float(sum(row['SD_Amount'] or 0 for row in invoices)),
-                    "sum_invo_on_commission": float(sum(row['On_Commission'] or 0 for row in invoices)),
-                    "sum_invo_hydro_test": float(sum(row['Hydro_Testing'] or 0 for row in invoices)),
-                    "sum_invo_gst_sd_amt": float(sum(row['GST_SD_Amount'] or 0 for row in invoices)),
-                    "sum_invo_final_amt": float(sum(row['Final_Amount'] or 0 for row in invoices)),
-                    "sum_invo_hold_amt": float(sum(row['hold_amount'] or 0 for row in invoices)),
-
-                    "sum_gst_basic_amt": float(sum(row['basic_amount'] or 0 for row in gst_rel)),
-                    "sum_gst_final_amt": float(sum(row['final_amount'] or 0 for row in gst_rel)),
-
-                    "sum_pay_payment_amt": float(sum(row['Payment_Amount'] or 0 for row in payments)),
-                    "sum_pay_tds_payment_amt": float(sum(row['TDS_Payment_Amount'] or 0 for row in payments)),
-                    "sum_pay_total_amt": float(sum(row['Total_amount'] or 0 for row in payments))
-                }
-
-                current_date = datetime.now().strftime('%Y-%m-%d')
-
-            finally:
-                cursor.close()
-                connection.close()
-
-            return {
-                "contInfo": contInfo,
-                "invoices": invoices,
-                "hold_types": hold_types,
-                "gst_rel": gst_rel,
-                "payments": payments,
-                "credit_note": credit_note,
-                "hold_release": hold_release,
-                "total": total,
-                "current_date": current_date
-            }
 
+    # call this method for excel formate written 
     @staticmethod
-    def download_report(contractor_id):
+    def generate_excel(contractor_id, contInfo, invoices, hold_types, hold_data,
-        try:
+                 credit_note_map, gst_release_map, output_file):
-            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 =================
+        # Contractor Info
-            sheet.append(["SUB CONTRACTOR DETAILS"])
+        for field, value in contInfo.items():
-            sheet.cell(row=sheet.max_row, column=1).font = Font(bold=True)
+            sheet.append([field.replace("_", " "), value])
         sheet.append([])
 
-            sheet.append(["Name", contInfo.get("Contractor_Name") or ""])
+        # Headers
-            sheet.append(["Mobile No", contInfo.get("Mobile_No") or ""])
+        base_headers = ["PMC No", "Village", "Work Type", "Invoice Details", "Invoice Date", "Invoice No",
-            sheet.append(["Email", contInfo.get("Email") or ""])
+                        "Basic Amount", "Debit", "After Debit Amount", "GST (18%)", "Amount", "TDS (1%)",
-            sheet.append(["Village", contInfo.get("Village_Name") or ""])
+                        "SD (5%)", "On Commission", "Hydro Testing", "GST SD Amount"]
-            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 =================
+        hold_headers = [ht['hold_type'] for ht in hold_types]
-            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 =================
+        payment_headers = ["Final Amount", "Payment Amount", "TDS Payment", "Total Paid", "UTR"]
-            total_final = 0
+
-            total_payment = 0
+        all_headers = base_headers + hold_headers + payment_headers
-            total_amount = 0
+        sheet.append(all_headers)
+
+        for cell in sheet[sheet.max_row]:
+            cell.font = Font(bold=True)
+            cell.fill = PatternFill(start_color="ADD8E6", end_color="ADD8E6", fill_type="solid")
+
+        processed_gst_releases = set()
+        appended_credit_keys = set()
+        previous_pmc_no = None
 
         for inv in invoices:
+            pmc_no = str(inv["PMC_No"]).strip()
+
+            invoice_no = (
+                inv["invoice_no"].replace(" ", "") if inv["invoice_no"] else ""
+                if inv["invoice_no"] not in (None, "", 0)
+                else ""
+            )   
+            key = (pmc_no)
+
+            # Yellow separator
+            if previous_pmc_no and pmc_no != previous_pmc_no:
+                sheet.append([""] * len(all_headers))
+                yellow_fill = PatternFill(start_color="FFFF99", end_color="FFFF99", fill_type="solid")
+                for cell in sheet[sheet.max_row]:
+                    cell.fill = yellow_fill
+
+            previous_pmc_no = pmc_no
+
+            # Invoice Row
             row = [
-                    inv.get("PMC_No"),
+                pmc_no,
-                    inv.get("Village_Name"),
+                inv.get("Village_Name", ""),
-                    inv.get("invoice_no"),
+                inv.get("Work_Type", ""),
-                    inv.get("Invoice_Date"),
+                inv.get("Invoice_Details", ""),
-                    inv.get("Work_Type"),
+                inv.get("Invoice_Date", ""),
-                    inv.get("Invoice_Details"),
+                # inv.get("invoice_no",""),
-                    inv.get("Basic_Amount"),
+                invoice_no,
-                    inv.get("Debit_Amount"),
+                inv.get("Basic_Amount", ""),
-                    inv.get("After_Debit_Amount"),
+                inv.get("Debit_Amount", ""),
-                    inv.get("Amount"),
+                inv.get("After_Debit_Amount", ""),
-                    inv.get("GST_Amount"),
+                inv.get("GST_Amount", ""),
-                    inv.get("TDS_Amount"),
+                inv.get("Amount", ""),
-                    inv.get("SD_Amount"),
+                inv.get("TDS_Amount", ""),
-                    inv.get("On_Commission"),
+                inv.get("SD_Amount", ""),
-                    inv.get("Hydro_Testing"),
+                inv.get("On_Commission", ""),
-                    inv.get("Hold_Amount"),
+                inv.get("Hydro_Testing", ""),
-                    inv.get("GST_SD_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)
+            # Hold values
-                total_payment += float(inv.get("Payment_Amount") or 0)
+            invoice_holds = hold_data.get(inv["Invoice_Id"], {})
-                total_amount += float(inv.get("Total_Amount") or 0)
+            for ht_id in [ht['hold_type_id'] for ht in hold_types]:
+                row.append(invoice_holds.get(ht_id, ""))
+
+            # Payment values
+            row += [
+                inv.get("Final_Amount", ""),
+                inv.get("Payment_Amount", ""),
+                inv.get("TDS_Payment_Amount", ""),
+                inv.get("Total_Amount", ""),
+                inv.get("UTR", "")
+            ]
 
             sheet.append(row)
 
-            # ================= TOTAL ROW =================
+            # GST Releases
-            sheet.append([])
+            if key in gst_release_map and key not in processed_gst_releases:
-            sheet.append([
+                for gr in gst_release_map[key]:
-                "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
+                    gst_row = [
-                "TOTAL",
+                        pmc_no, "", "", "GST Release Note", "", gr.get("Invoice_No", ""),
-                total_final,
+                        gr.get("Basic_Amount", ""), "", "", "", "", "", "", "", "", ""
-                total_payment,
+                    ]
+
+                    gst_row += [""] * len(hold_headers)
+
+                    gst_row += [
+                        gr.get("Final_Amount", ""),
                         "",
-                total_amount,
+                        "",
-                ""
+                        gr.get("Total_Amount", ""),
-            ])
+                        gr.get("UTR", "")
+                    ]
 
-            # ================= AUTO WIDTH =================
+                    sheet.append(gst_row)
-            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 =================
+                processed_gst_releases.add(key)
-            filename = f"Contractor_Report_{contInfo.get('Contractor_Name')}.xlsx"
+
-            output_file = FolderAndFile.get_download_path(filename)
+            # Credit Notes
+            if key in credit_note_map and key not in appended_credit_keys:
+                for cn in credit_note_map[key]:
+                    cn_row = [
+                        pmc_no, "", "", cn.get("Invoice_Details", "Credit Note"), "",
+                        cn.get("Invoice_No", ""),
+                        cn.get("Basic_Amount", ""),
+                        cn.get("Debit_Amount", ""),
+                        cn.get("After_Debit_Amount", ""),
+                        cn.get("GST_Amount", ""),
+                        cn.get("Amount", ""),
+                        "", "", "", "", ""
+                    ]
+
+                    cn_row += [""] * len(hold_headers)
+
+                    cn_row += [
+                        cn.get("Final_Amount", ""),
+                        "",
+                        "",
+                        cn.get("Total_Amount", ""),
+                        cn.get("UTR", "")
+                    ]
+
+                    sheet.append(cn_row)
+
+                appended_credit_keys.add(key)
+
+        # SAVE ONCE AT END
         workbook.save(output_file)
 
-            return send_file(output_file, as_attachment=True)
 
-        except Exception as e:
+
-            return str(e)

model/State.py

@@ -1,13 +1,9 @@
-from flask import request, redirect, url_for
-from flask_login import current_user
-
-from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
-from model.Log import LogHelper
-from model.ItemCRUD import ItemCRUD  
-
 import config
-import re
 import mysql.connector
+from flask import request, redirect, url_for
+
+from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
+from model.ItemCRUD import ItemCRUD  
 
 
 class State:
@@ -20,7 +16,6 @@ class State:
     # ADD STATE (USING ITEM CRUD)
     # ----------------------------------------------------------
     def AddState(self, request):
-
         state_name = request.form['state_Name'].strip()
 
         crud = ItemCRUD(ItemCRUDType.State)
@@ -42,16 +37,14 @@ class State:
     # GET ALL STATES (NO CHANGE - THIS IS CORRECT)
     # ----------------------------------------------------------
     def GetAllStates(self, request):
-
         connection = config.get_db_connection()
         data = []
 
         if not connection:
             return []
 
-        cursor = connection.cursor()
-
         try:
+            cursor = connection.cursor()
             cursor.callproc("GetAllStates")
             for res in cursor.stored_results():
                 data = res.fetchall()
@@ -77,7 +70,6 @@ class State:
     # CHECK STATE (USING ITEM CRUD)
     # ----------------------------------------------------------
     def CheckState(self, request):
-
         state_name = request.json.get('state_Name', '').strip()
 
         crud = ItemCRUD(ItemCRUDType.State)
@@ -94,7 +86,6 @@ class State:
     # DELETE STATE (USING ITEM CRUD)
     # ----------------------------------------------------------
     def DeleteState(self, request, id):
-
         crud = ItemCRUD(ItemCRUDType.State)
 
         crud.DeleteItem(
@@ -113,7 +104,6 @@ class State:
     # EDIT STATE (USING ITEM CRUD)
     # ----------------------------------------------------------
     def EditState(self, request, id):
-
         state_name = request.form['state_Name'].strip()
 
         crud = ItemCRUD(ItemCRUDType.State)
@@ -136,16 +126,14 @@ class State:
     # GET STATE BY ID (KEEP SAME)
     # ----------------------------------------------------------
     def GetStateByID(self, request, id):
-
         connection = config.get_db_connection()
         data = None
 
         if not connection:
             return None
 
-        cursor = connection.cursor()
-
         try:
+            cursor = connection.cursor()
             cursor.callproc("GetStateByID", (id,))
             for res in cursor.stored_results():
                 data = res.fetchone()

model/Subcontractor.py

@@ -1,7 +1,6 @@
 from model.Utilities import ItemCRUDType
 from model.ItemCRUD import ItemCRUD
 
-
 class Subcontractor:
     def __init__(self):
         self.isSuccess = False

model/Utilities.py

@@ -8,10 +8,12 @@ class ItemCRUDType(Enum):
     State = 4
     HoldType = 5
     Subcontractor = 6
-    
+    GSTRelease = 7
+    Invoice = 8
 
 class RegEx:
-    patternAlphabetOnly = "^[A-Za-z ]+$"
+    patternAlphabetOnly = r"^[A-Za-z ]+$"
+    allPattern = r"^(?!\s*$).+"
 
 
 class ResponseHandler:
@@ -62,5 +64,5 @@ class HtmlHelper:
     @staticmethod
     def json_response(message_obj, status_code):
         return jsonify(message_obj), status_code
-    #May need to refactor further
+  
 

model/Village.py

@@ -1,14 +1,8 @@
 
-from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
-
-from model.Utilities import RegEx, ResponseHandler, HtmlHelper, ItemCRUDType
-from model.Log import LogData, LogHelper
 
+from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
 import config
-
 import mysql.connector
-from mysql.connector import Error
-
 from model.ItemCRUD import ItemCRUD
 
  
@@ -19,70 +13,133 @@ class Village:
     def __init__(self):
         self.isSuccess = False
         self.resultMessage = ""
+        self.response = {} 
+        self.village = ItemCRUD(itemType=ItemCRUDType.Village)
+
+    # 🔹 Helper: sync status
+    def _set_status(self, village):
+        self.isSuccess = village.isSuccess
+
+        #  UPDATED (safe handling)
+        if hasattr(village, "response"):
+            self.response = village.response
+            self.resultMessage = village.response.get("message", "")
+        else:
+            self.resultMessage = village.resultMessage
+
+    # 🔹 Helper: get request data
+    def _get_form_data(self, request):
+        block_id = request.form.get('block_Id')
+        village_name = request.form.get('Village_Name', '').strip()
+        return block_id, village_name
 
     def AddVillage(self, request):
-       village = ItemCRUD(itemType=ItemCRUDType.Village)
+        block_id, village_name = self._get_form_data(request)
 
-       block_id = request.form.get('block_Id')
+        if not village_name:
-       village_name = request.form.get('Village_Name', '').strip()
+            self.response = ResponseHandler.invalid_name("village") 
-
+            self.resultMessage = self.response["message"]
-       village.AddItem(request=request, parentid=block_id, childname=village_name,  storedprocfetch="GetVillageByNameAndBlock", storedprocadd="SaveVillage" )
+            self.isSuccess = False
-       self.isSuccess = village.isSuccess
-       self.resultMessage = village.resultMessage
             return
-       #self.isSuccess = False
+
+        try:
+            self.village.AddItem(
+                request=request,
+                parentid=block_id,
+                childname=village_name,
+                storedprocfetch="GetVillageByNameAndBlock",
+                storedprocadd="SaveVillage"
+            )
+            self._set_status(self.village)
+
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
 
     def GetAllVillages(self, request):
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
+
-        villagesdata = village.GetAllData(request=request, storedproc="GetAllVillages")
+        try:
-        self.isSuccess = village.isSuccess
+            villagesdata = self.village.GetAllData(
-        self.resultMessage = village.resultMessage
+                request=request,
+                storedproc="GetAllVillages"
+            )
+            self._set_status(self.village)
             return villagesdata
 
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
+            return []
 
     def CheckVillage(self, request):
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
+        block_id, village_name = self._get_form_data(request)
-        block_id = request.form.get('block_Id')
+
-        village_name = request.form.get('Village_Name', '').strip()
+        if not village_name:
-        result = village.CheckItem(request=request, parentid=block_id, childname=village_name, storedprocfetch="GetVillageByNameAndBlocks")
+            self.response = ResponseHandler.invalid_name("village")
-        self.isSuccess = village.isSuccess
+            self.resultMessage = self.response["message"]
-        self.resultMessage = village.resultMessage
+            self.isSuccess = False
+            return None
+
+        try:
+            result = self.village.CheckItem(
+                request=request,
+                parentid=block_id,
+                childname=village_name,
+                storedprocfetch="GetVillageByNameAndBlocks"
+            )
+            self._set_status(self.village)
             return result
 
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
+            return None
 
     def DeleteVillage(self, request, village_id):
 
-       village = ItemCRUD(itemType=ItemCRUDType.Village)
+        try:
+            self.village.DeleteItem(
+                request=request,
+                itemID=village_id,
+                storedprocDelete="DeleteVillage"
+            )
+            self._set_status(self.village)
 
-       village.DeleteItem(request=request, itemID=village_id, storedprocDelete="DeleteVillage" )
+        except Exception as e:
-       self.isSuccess = village.isSuccess
+            self.isSuccess = False
-       self.resultMessage = village.resultMessage
+            self.resultMessage = str(e)
-       return
 
     def EditVillage(self, request, village_id):
-        corsor=None
+        block_id, village_name = self._get_form_data(request)
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
 
-        block_id = request.form.get('block_Id')
+        if not village_name:
-        village_name = request.form.get('Village_Name', '').strip()
+            self.response = ResponseHandler.invalid_name("village") 
-
+            self.resultMessage = self.response["message"]
-        village.EditItem(request=request,childid=village_id,parentid=block_id,childname=village_name,storedprocupdate="UpdateVillage" )
+            self.isSuccess = False
-
-        self.isSuccess = village.isSuccess
-        self.resultMessage = village.resultMessage
             return
 
-    # def GetVillageByID(self, request, id):
+        try:
+            self.village.EditItem(
+                request=request,
+                childid=village_id,
+                parentid=block_id,
+                childname=village_name,
+                storedprocupdate="UpdateVillage"
+            )
+            self._set_status(self.village)
 
-    #     village = ItemCRUD(itemType=ItemCRUDType.Village)
+        except Exception as e:
-    #     villagedetailsdata = village.GetAllData(request=request, storedproc="GetVillageDetailsById")
+            self.isSuccess = False
-    #     self.isSuccess = village.isSuccess
+            self.resultMessage = str(e)
-    #     self.resultMessage = village.resultMessage
+
-    #     return villagedetailsdata
+    def GetVillageByID(self, id):
+
+        try:
+            villagedetailsdata = self.village.GetDataByID(
+                id=id,
+                storedproc="GetVillageDetailsById"
+            )
 
-    def GetVillageByID(self, request, id):
-        village = ItemCRUD(itemType=ItemCRUDType.Village)
-        villagedetailsdata = village.GetDataByID(id=id,storedproc="GetVillageDetailsById")
             if villagedetailsdata:
                 self.isSuccess = True
             else:
@@ -91,31 +148,39 @@ class Village:
 
             return villagedetailsdata
 
+        except Exception as e:
+            self.isSuccess = False
+            self.resultMessage = str(e)
+            return None
 
-    def GetAllBlocks(self, request):
+    def GetAllBlocks(self):
-
         blocks = []
         self.isSuccess = False
         self.resultMessage = ""
-        connection = config.get_db_connection()
 
+        connection = config.get_db_connection()
         if not connection:
             return []
 
-        cursor = connection.cursor()
-
         try:
+            with connection.cursor() as cursor:
                 cursor.callproc('GetAllBlocks')
+
                 for result in cursor.stored_results():
-                blocks = result.fetchall()
+                    blocks.extend(result.fetchall())
+
             self.isSuccess = True
+            return blocks
 
         except mysql.connector.Error as e:
             print(f"Error fetching blocks: {e}")
             self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(ResponseHandler.fetch_failure("block"), 500)
-        finally:
-            cursor.close()
-            connection.close()
 
-        return blocks
+            # FIXED (removed jsonify response)
+            self.response = ResponseHandler.fetch_failure("block")
+            self.resultMessage = self.response["message"]
+
+            return []
+
+        finally:
+            connection.close()

model/gst_release.py

@@ -1,150 +1,160 @@
-import config
+# model/gst_release.py
-import mysql.connector
+from flask import request, jsonify
+from model.ItemCRUD import ItemCRUD
+from model.Utilities import ItemCRUDType
 
-class GSTReleasemodel:
+class GSTRelease:
 
-    @staticmethod
+    def __init__(self):
-    def get_connection():
+        self.isSuccess = False
-        connection = config.get_db_connection()
+        self.resultMessage = ""
-        if not connection:
-            return None
-        return connection
-
-    @staticmethod
-    def fetch_all_gst_releases():
-        connection = GSTReleasemodel.get_connection()
-        gst_releases = []
-        if connection:
-            cursor = connection.cursor(dictionary=True)
  
+    # ------------------- Add GST Release -------------------
+    def AddGSTRelease(self, request):
         try:
-                cursor.callproc('GetAllGSTReleases')
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
 
-                gst_releases = []
+            # Print the full form data
-                for result in cursor.stored_results():                              # change to procedure
+            print("===== DEBUG: FORM DATA =====")
-                    gst_releases = result.fetchall()
+            for key, value in request.form.items():
+                print(f"{key} : {value}")
+            print("=============================")
 
-            except mysql.connector.Error as e:
+            data = {
-                print(f"Error fetching GST releases: {e}")
+                "PMC_No": request.form.get("PMC_No", "").strip(),
-            finally:
+                "Invoice_No": request.form.get("Invoice_No", "").strip(),
-                cursor.close()
+                "Basic_Amount": float(request.form.get("Basic_Amount", 0) or 0),
-                connection.close()
+                "Final_Amount": float(request.form.get("Final_Amount", 0) or 0),
-        return gst_releases
+                "Total_Amount": float(request.form.get("Total_Amount", 0) or 0),
+                "UTR": request.form.get("UTR", "").strip(),
+                "Contractor_ID": int(request.form.get("Contractor_ID", 0) or 0)
+            }
 
-    @staticmethod
+            print("===== DEBUG: PARSED DATA =====")
-    def insert_gst_release(pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id):
+            print(data)
-        connection = GSTReleasemodel.get_connection()
+            print("==============================")
-        if not connection:
-            return False
-        try:
-            cursor = connection.cursor()
 
-            # Insert into gst_release
+            # Add GST Release
-            cursor.callproc(
+            gst.AddItem(
-                'InsertGSTReleaseOnly',
+                request=request,
-                [pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id]
+                data=data,
+                storedprocfetch="CheckGSTReleaseExists",
+                storedprocadd="AddGSTReleaseFromExcel"
             )
 
-            # Insert into inpayment
+            print(f"AddItem result: isSuccess={gst.isSuccess}, message={gst.resultMessage}")
-            cursor.callproc(
+
-                'InsertInpaymentOnly',
+            self.isSuccess = gst.isSuccess
-                [pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, contractor_id]
+            self.resultMessage = str(gst.resultMessage)
+
+        except Exception as e:
+            print("ERROR in AddGSTRelease:", e)
+            self.isSuccess = False
+            self.resultMessage = str(e)
+
+        return jsonify({"success": self.isSuccess, "message": self.resultMessage})
+
+    def EditGSTRelease(self, request, gst_release_id):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+
+            # Map form inputs to stored procedure parameters
+            data = {
+                "p_pmc_no": request.form.get("PMC_No", "").strip(),
+                "p_invoice_no": request.form.get("invoice_no", "").strip(),
+                "p_basic_amount": float(request.form.get("Basic_Amount", 0) or 0),
+                "p_final_amount": float(request.form.get("Final_Amount", 0) or 0),
+                "p_total_amount": float(request.form.get("Total_Amount", 0) or 0),
+                "p_utr": request.form.get("UTR", "").strip(),
+                "p_gst_release_id": gst_release_id
+            }
+
+            print("===== DEBUG: UPDATE DATA =====")
+            print(data)
+            print("==============================")
+
+            # Call your stored procedure
+            gst.EditItem(
+                request=request,
+                childid=gst_release_id,
+                data=data,
+                storedprocupdate="UpdateGSTRelease"
             )
 
-            connection.commit()
+            self.isSuccess = gst.isSuccess
-            return True
+            self.resultMessage = str(gst.resultMessage)
-        except mysql.connector.Error as e:
-            print(f"Error inserting GST release: {e}")
-            return False
-        finally:
-            cursor.close()
-            connection.close()
 
-    @staticmethod
+        except Exception as e:
-    def fetch_gst_release_by_id(gst_release_id):
+            print("ERROR in EditGSTRelease:", e)
-        connection = GSTReleasemodel.get_connection()
+            self.isSuccess = False
-        if not connection:
+            self.resultMessage = str(e)
-            return None
+
-        data = {}
+    # ------------------- Delete GST Release -------------------
+    def DeleteGSTRelease(self, gst_release_id):
         try:
-            cursor = connection.cursor(dictionary=True)
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
 
-            cursor.callproc('GetGSTReleaseById', [gst_release_id])
+            gst.DeleteItem(
+                request=None,
+                itemID=gst_release_id,
+                storedprocDelete="DeleteGSTReleaseById"
+            )
+
+            self.isSuccess = gst.isSuccess
+            self.resultMessage = str(gst.resultMessage)
+
+        except Exception as e:
+            print("ERROR in DeleteGSTRelease:", e)
+            self.isSuccess = False
+            self.resultMessage = str(e)
+
+        return jsonify({"success": self.isSuccess, "message": self.resultMessage})
+
+    # ------------------- Get All GST Releases -------------------
+    def GetAllGSTReleases(self):
+        try:
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+            rows = gst.GetAllData(None, "GetAllGSTReleases")
+
+            data = []
+            for row in rows:
+                data.append({
+                    "gst_release_id": row[0],
+                    "pmc_no": row[1],
+                    "invoice_no": row[2],
+                    "basic_amount": row[3],
+                    "final_amount": row[4],
+                    "total_amount": row[5],
+                    "utr": row[6],
+                    "contractor_id": row[7]
+                })
 
-            for result in cursor.stored_results():
-                    data = result.fetchone()
-            if data:
-                # Convert to array for template
-                data = [
-                    data.get('GST_Release_Id'),
-                    data.get('PMC_No'),
-                    data.get('Invoice_No'),
-                    data.get('Basic_Amount'),
-                    data.get('Final_Amount'),
-                    data.get('Total_Amount'),
-                    data.get('UTR')
-                ]
-        except mysql.connector.Error as e:
-            print(f"Error fetching GST release by id: {e}")
-        finally:
-            cursor.close()
-            connection.close()
             return data
 
-    @staticmethod
+        except Exception as e:
-    def update_gst_release(gst_release_id, pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr):
+            print("ERROR in GetAllGSTReleases:", e)
-        connection = GSTReleasemodel.get_connection()
+            return []
-        if not connection:
+
-            return False
+    # ------------------- Get GST Release By ID -------------------
+    def GetGSTReleaseByID(self, gst_release_id):
         try:
-            cursor = connection.cursor()
+            gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-            # Update gst_release
+            row = gst.GetDataByID(gst_release_id, "GetGSTReleaseById")
-            cursor.callproc(
-                'UpdateGSTRelease',
-                [pmc_no, invoice_no, basic_amount, final_amount, total_amount, utr, gst_release_id]
-            )
-            # Update inpayment
-            cursor.callproc(
-                'UpdateInpaymentByUTR',
-                [basic_amount, final_amount, total_amount, utr]
-            )
-            connection.commit()
-            return True
-        except mysql.connector.Error as e:
-            print(f"Error updating GST release: {e}")
-            return False
-        finally:
-            cursor.close()
-            connection.close()
 
-    @staticmethod
+            if row:
-    def delete_gst_release(gst_release_id):
+                return {
-        connection = GSTReleasemodel.get_connection()
+                    "gst_release_id": row[0],
-        if not connection:
+                    "pmc_no": row[1],
-            return False, None
+                    "invoice_no": row[2],
-        try:
+                    "basic_amount": row[3],
-            cursor = connection.cursor(dictionary=True)
+                    "final_amount": row[4],
-            cursor.callproc('GetGSTReleaseUTRById', [gst_release_id])
+                    "total_amount": row[5],
-            record = None
+                    "utr": row[6],
-            for result in cursor.stored_results():
+                    "contractor_id": row[7]
-                record = result.fetchone()
+                }
 
-            if not record:
+            return None
-                return False, None
 
-            utr = record['UTR']
+        except Exception as e:
-
+            print("ERROR in GetGSTReleaseByID:", e)
-            # Step 1: Delete gst_release
+            return None
-            cursor.callproc('DeleteGSTReleaseById', [gst_release_id])
-
-            # Step 2: Reset inpayment using UTR
-            cursor.callproc('ResetInpaymentByUTR', [utr])
-            
-            connection.commit()
-            return True, utr
-        except mysql.connector.Error as e:
-            print(f"Error deleting GST release: {e}")
-            return False, None
-        finally:
-            cursor.close()
-            connection.close()

model/payment.py

@@ -1,8 +1,12 @@
 import config
 import mysql.connector
+import config
+import mysql.connector
+from model.Utilities import  ItemCRUDType
 
 class Paymentmodel:
 
+    # ---------------- Database Connection ----------------
     @staticmethod
     def get_connection():
         connection = config.get_db_connection()
@@ -10,6 +14,7 @@ class Paymentmodel:
             return None
         return connection
 
+    # ---------------- Payment Methods ----------------
     @staticmethod
     def fetch_all_payments():
         connection = Paymentmodel.get_connection()
@@ -28,46 +33,44 @@ class Paymentmodel:
         return payments
 
     @staticmethod
-    def insert_payment(pmc_no, invoice_no, amount, tds_amount, total_amount, utr):
+    def insert_payment(subcontractor_id, pmc_no, invoice_no, amount, tds_amount, total_amount, utr):
         connection = Paymentmodel.get_connection()
         if not connection:
             return False
+
+        cursor = None
         try:
             cursor = connection.cursor()
-            cursor.callproc('InsertPayments', [pmc_no, invoice_no, amount, tds_amount, total_amount, utr])
+
+            cursor.callproc('GetInvoiceId', [subcontractor_id, pmc_no, invoice_no])
+
+            invoice_id = None
+            for result in cursor.stored_results():
+                row = result.fetchone()
+                if row:
+                    invoice_id = row[0]
+
+            if not invoice_id:
+                return False
+
+            cursor.callproc(
+                'InsertPayments',
+                [pmc_no, invoice_no, amount, tds_amount, total_amount, utr, invoice_id]
+            )
+
             connection.commit()
             return True
-        except mysql.connector.Error as e:
+
-            print(f"Error inserting payment: {e}")
+        except Exception as e:
+            print(e)
             return False
+
         finally:
+            if cursor:
                 cursor.close()
+            if connection:
                 connection.close()
 
-    @staticmethod
-    def update_inpayment(subcontractor_id, pmc_no, invoice_no, amount, tds_amount, total_amount, utr):
-        connection = Paymentmodel.get_connection()
-        if not connection:
-            return False
-        try:
-            cursor = connection.cursor()
-            cursor.callproc('UpdateInpaymentRecord', [
-                    subcontractor_id,
-                    pmc_no,
-                    invoice_no,
-                    amount,
-                    tds_amount,
-                    total_amount,
-                    utr
-                ])
-            connection.commit()
-            return True
-        except mysql.connector.Error as e:
-            print(f"Error updating inpayment: {e}")
-            return False
-        finally:
-            cursor.close()
-            connection.close()
 
     @staticmethod
     def fetch_payment_by_id(payment_id):
@@ -80,7 +83,6 @@ class Paymentmodel:
             cursor.callproc("GetPaymentById", (payment_id,))
             for result in cursor.stored_results():
                 payment_data = result.fetchone()
-            # Convert to array for template
             if payment_data:
                 payment_data = [
                     payment_data.get('Payment_Id'),
@@ -117,42 +119,97 @@ class Paymentmodel:
 
     @staticmethod
     def delete_payment(payment_id):
-        """
-        Deletes a payment and resets the related inpayment fields in one go.
-        Returns (success, pmc_no, invoice_no)
-        """
         connection = Paymentmodel.get_connection()
         if not connection:
             return False, None, None
-
         try:
             cursor = connection.cursor(dictionary=True)
-
+            # Fetch PMC & Invoice before deleting
             cursor.callproc('GetPaymentPMCInvoiceById', [payment_id])
-
             record = {}
             for result in cursor.stored_results():
                 record = result.fetchone() or {}
             if not record:
                 return False, None, None
-
             pmc_no = record['PMC_No']
             invoice_no = record['Invoice_No']
-
+            # Delete payment
-            # Step 2: Delete the payment using the stored procedure
             cursor.callproc("DeletePayment", (payment_id,))
             connection.commit()
         
-            # Step 3: Reset inpayment fields using the stored procedure
-            cursor.callproc("ResetInpayment", [pmc_no, invoice_no])
-            connection.commit()
-
             return True, pmc_no, invoice_no
-
         except mysql.connector.Error as e:
             print(f"Error deleting payment: {e}")
             return False, None, None
-
+        finally:
+            cursor.close()
+            connection.close()
+
+    # ---------------- Item CRUD Methods ----------------
+    @staticmethod
+    def fetch_items(item_type: ItemCRUDType):
+        connection = Paymentmodel.get_connection()
+        items = []
+        if connection:
+            cursor = connection.cursor(dictionary=True)
+            try:
+                cursor.callproc('GetItemsByType', [item_type.value])
+                for result in cursor.stored_results():
+                    items = result.fetchall()
+            except mysql.connector.Error as e:
+                print(f"Error fetching {item_type.name}: {e}")
+            finally:
+                cursor.close()
+                connection.close()
+        return items
+
+    @staticmethod
+    def insert_item(item_type: ItemCRUDType, name: str):
+        connection = Paymentmodel.get_connection()
+        if not connection:
+            return False
+        try:
+            cursor = connection.cursor()
+            cursor.callproc('InsertItem', [item_type.value, name])
+            connection.commit()
+            return True
+        except mysql.connector.Error as e:
+            print(f"Error inserting {item_type.name}: {e}")
+            return False
+        finally:
+            cursor.close()
+            connection.close()
+
+    @staticmethod
+    def update_item(item_type: ItemCRUDType, item_id: int, new_name: str):
+        connection = Paymentmodel.get_connection()
+        if not connection:
+            return False
+        try:
+            cursor = connection.cursor()
+            cursor.callproc('UpdateItem', [item_type.value, item_id, new_name])
+            connection.commit()
+            return True
+        except mysql.connector.Error as e:
+            print(f"Error updating {item_type.name}: {e}")
+            return False
+        finally:
+            cursor.close()
+            connection.close()
+
+    @staticmethod
+    def delete_item(item_type: ItemCRUDType, item_id: int):
+        connection = Paymentmodel.get_connection()
+        if not connection:
+            return False
+        try:
+            cursor = connection.cursor()
+            cursor.callproc('DeleteItem', [item_type.value, item_id])
+            connection.commit()
+            return True
+        except mysql.connector.Error as e:
+            print(f"Error deleting {item_type.name}: {e}")
+            return False
         finally:
             cursor.close()
             connection.close()

services/Generalservice.py

@@ -0,0 +1,30 @@
+
+
+
+class GeneralUse:
+    data=[]
+
+    @staticmethod
+    def execute_sp(cursor, proc_name, params=[], fetch_one=False):
+        cursor.callproc(proc_name, params)
+        return (
+            GeneralUse.fetch_one_result(cursor)
+            if fetch_one else
+            GeneralUse.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
+

services/ReportService.py

@@ -0,0 +1,177 @@
+import config
+
+from model.FolderAndFile import FolderAndFile
+from services.Generalservice import GeneralUse
+from model.Report import ReportHelper
+
+from decimal import Decimal
+def safe_decimal(value):
+        if value is None:
+            return Decimal(0)
+        return Decimal(value)
+
+
+class ReportService:
+    
+
+    def __init__(self, contractor_id=None, pmc_no=None):
+        self.contractor_id = contractor_id
+        self.pmc_no = pmc_no
+
+        self.contInfo = None
+        self.hold_types = []
+        self.invoices = []
+
+        self.hold_amounts = []
+        self.hold_data = {}
+
+        self.credit_note_raw = []
+        self.credit_note_map = {}
+
+        self.gst_release_raw = []
+        self.gst_release_map = {}
+
+        self.output_file = None
+
+    # ---------------- LOAD DATA ----------------
+    def load_data(self):
+        connection = config.get_db_connection()
+        cursor = connection.cursor(dictionary=True, buffered=True)
+
+        try:
+            # ---------- CONTRACTOR ----------
+            if self.contractor_id:
+                self.contInfo = GeneralUse.execute_sp(cursor, 'GetContractorInfo', [self.contractor_id], True)
+                self.hold_types = GeneralUse.execute_sp(cursor, 'HoldTypesByContractorId', [self.contractor_id])
+                self.invoices = GeneralUse.execute_sp(cursor, 'GetInvoicesByContractorOrPMCNo', [self.contractor_id, None])
+
+            # ---------- PMC ----------
+            elif self.pmc_no:
+                self.contInfo = GeneralUse.execute_sp(cursor, 'GetContractorInfoByPmcNo', [self.pmc_no], True)
+                self.contractor_id = self.contInfo["Contractor_Id"]
+
+                self.hold_types = GeneralUse.execute_sp(cursor, 'GetHoldTypesByContractor', [self.contractor_id])
+                self.invoices = GeneralUse.execute_sp(cursor, 'GetInvoicesByContractorOrPMCNo', [None, self.pmc_no])
+
+            # ---------- COMMON ----------
+            self.hold_amounts = GeneralUse.execute_sp(cursor, 'GetHoldAmountsByContractor', [self.contractor_id])
+            self.credit_note_raw = GeneralUse.execute_sp(cursor, 'GetCreditNotesByContractor', [self.contractor_id])
+            self.gst_release_raw = GeneralUse.execute_sp(cursor, 'GetGSTRelease', [self.contractor_id])
+
+
+            self.prepare_maps()
+            self.total = self.calculate_totals()
+
+        finally:
+            cursor.close()
+            connection.close()
+
+        return self
+
+    # ---------------- MAPS ----------------
+    def prepare_maps(self):
+        # HOLD MAP
+        for h in self.hold_amounts:
+            self.hold_data.setdefault(h['Invoice_Id'], {})[h['hold_type_id']] = h['hold_amount']
+
+        # CREDIT MAP
+        for cn in self.credit_note_raw:
+            key = str(cn.get('PMC_No') or cn.get('pmc_no')).strip()
+            self.credit_note_map.setdefault(key, []).append(cn)
+
+        # GST MAP (FIXED)
+        for gr in self.gst_release_raw:
+            pmc_value = gr.get('PMC_No') or gr.get('pmc_no') or gr.get('PMC_NO')
+
+            if not pmc_value:
+                continue  # skip if missing
+
+            key = str(pmc_value).strip()
+            self.gst_release_map.setdefault(key, []).append(gr)
+
+    # ---------------- calculate total ----------------
+    def calculate_totals(self):
+        total = {
+            "sum_invo_basic_amt": Decimal(0),
+            "sum_invo_debit_amt": Decimal(0),
+            "sum_invo_after_debit_amt": Decimal(0),
+            "sum_invo_gst_amt": Decimal(0),
+            "sum_invo_amt": Decimal(0),
+            "sum_invo_tds_amt": Decimal(0),
+            "sum_invo_ds_amt": Decimal(0),
+            "sum_invo_on_commission": Decimal(0),
+            "sum_invo_hydro_test": Decimal(0),
+            "sum_invo_hold_amt": Decimal(0),
+            "sum_invo_gst_sd_amt": Decimal(0),
+            "sum_invo_final_amt": Decimal(0),
+
+            "sum_gst_basic_amt": Decimal(0),
+            "sum_gst_final_amt": Decimal(0),
+
+            "sum_pay_payment_amt": Decimal(0),
+            "sum_pay_tds_payment_amt": Decimal(0),
+            "sum_pay_total_amt": Decimal(0)
+        }
+
+        # ---------- INVOICE ----------
+        for inv in self.invoices:
+            total["sum_invo_basic_amt"] += safe_decimal(inv.get("Basic_Amount"))
+            total["sum_invo_debit_amt"] += safe_decimal(inv.get("Debit_Amount"))
+            total["sum_invo_after_debit_amt"] += safe_decimal(inv.get("After_Debit_Amount"))
+            total["sum_invo_gst_amt"] += safe_decimal(inv.get("GST_Amount"))
+            total["sum_invo_amt"] += safe_decimal(inv.get("Amount"))
+            total["sum_invo_tds_amt"] += safe_decimal(inv.get("TDS_Amount"))
+            total["sum_invo_ds_amt"] += safe_decimal(inv.get("SD_Amount"))
+            total["sum_invo_on_commission"] += safe_decimal(inv.get("On_Commission"))
+            total["sum_invo_hydro_test"] += safe_decimal(inv.get("Hydro_Testing"))
+            total["sum_invo_gst_sd_amt"] += safe_decimal(inv.get("GST_SD_Amount"))
+            total["sum_invo_final_amt"] += safe_decimal(inv.get("Final_Amount"))
+            total["sum_invo_hold_amt"] += safe_decimal(inv.get("hold_amount"))
+
+        # ---------- GST ----------
+        for gst in self.gst_release_raw:
+            total["sum_gst_basic_amt"] += safe_decimal(gst.get("basic_amount"))
+            total["sum_gst_final_amt"] += safe_decimal(gst.get("final_amount"))
+
+        # ---------- PAYMENTS ----------
+        if hasattr(self, "payments"):
+            for pay in self.payments:
+                total["sum_pay_payment_amt"] += safe_decimal(pay.get("Payment_Amount"))
+                total["sum_pay_tds_payment_amt"] += safe_decimal(pay.get("TDS_Payment_Amount"))
+                total["sum_pay_total_amt"] += safe_decimal(pay.get("Total_amount"))
+
+        return total
+
+
+    # ---------------- WEB DATA ----------------
+    def get_web_data(self):
+        return {
+            "contInfo": self.contInfo,
+            "invoices": self.invoices,
+            "hold_types": self.hold_types,
+            "credit_note": self.credit_note_raw,
+            "gst_rel": self.gst_release_raw,
+            "total": self.total
+        }
+
+    # ---------------- DOWNLOAD ----------------
+    def download_excel(self):
+
+        if not self.contInfo:
+            return None, "No data found"
+
+        filename = f"Report_{self.contractor_id or self.pmc_no}.xlsx"
+        self.output_file = FolderAndFile.get_download_path(filename=filename)
+
+        ReportHelper.generate_excel(
+            self.contractor_id or 0,
+            self.contInfo,
+            self.invoices,
+            self.hold_types,
+            self.hold_data,
+            self.credit_note_map,
+            self.gst_release_map,
+            self.output_file
+        )
+
+        return self.output_file, None

static/js/hold_types.js

@@ -3,7 +3,7 @@ $(document).ready(function () {
         let holdType = $(this).val().replace(/^\s+/, "");
         $(this).val(holdType);
 
-         let reg = /^[A-Za-z]/;
+        let reg = /^.+$/; // all pattern allow
 
         if (!reg.test(holdType)) {
             $("#holdTypeMessage").text("Hold Type must start with a letter.").css("color", "red");

static/js/invoice.js

@@ -1,5 +1,160 @@
-// Subcontractor autocomplete functionality
+// $(document).ready(function () {
-    $(document).ready(function () {
+//     // ===============================
+//     // FORM / TABLE TOGGLE
+//     // ===============================
+//     if ($('#addForm').length && $('#addTable').length) {
+//         $('#addForm').show();
+//         $('#addTable').hide();
+
+//         $('#addButton').click(function () {
+//             $('#addForm').show();
+//             $('#addTable').hide();
+//         });
+
+//         $('#displayButton').click(function () {
+//             $('#addForm').hide();
+//             $('#addTable').show();
+//         });
+//     }
+
+//     // ===============================
+//     // Subcontractor autocomplete
+//     // ===============================
+//     $("#subcontractor").keyup(function () {
+//         let query = $(this).val();
+//         if (query !== "") {
+//             $.ajax({
+//                 url: "/search_subcontractor",
+//                 method: "POST",
+//                 data: { query: query },
+//                 success: function (data) {
+//                     $("#subcontractor_list").fadeIn().html(data);
+//                 }
+//             });
+//         } else {
+//             $("#subcontractor_list").fadeOut();
+//         }
+//     });
+
+//     $(document).on("click", "li", function () {
+//         $("#subcontractor").val($(this).text());
+//         $("#subcontractor_id").val($(this).attr("data-id"));
+//         $("#subcontractor_list").fadeOut();
+//     });
+
+//     // Focus
+//     if (document.getElementById('subcontractor')) {
+//         document.getElementById('subcontractor').focus();
+//     }
+
+//     // ===============================
+//     // ADD INVOICE
+//     // ===============================
+//     if ($('#invoiceForm').length && window.location.href.includes('add_invoice')) {
+//         $("#invoiceForm").on("submit", function (e) {
+//             e.preventDefault();
+//             let formData = $(this).serialize();
+
+//             $.ajax({
+//                 url: '/add_invoice',
+//                 method: 'POST',
+//                 data: formData,
+//                 dataType: 'json',
+//                 success: function (response) {
+//                     if (response.status === "success") {
+//                         alert(response.message || "Invoice added successfully!");
+//                         $('#invoiceForm')[0].reset(); // clear form
+//                         $('#addForm').hide();
+//                         $('#addTable').show(); // switch to table
+//                         location.reload(); // optional refresh
+//                     } else {
+//                         alert(response.message || "Error adding invoice.");
+//                     }
+//                 },
+//                 error: function (xhr) {
+//                     alert(xhr.responseJSON?.message || "Submission failed. Please try again.");
+//                 }
+//             });
+//         });
+//     }
+// // Example AJAX update function
+// function updateInvoice(invoiceId, formElement) {
+//     const formData = $(formElement).serialize();
+
+//     $.ajax({
+//         url: '/update_invoice/' + invoiceId,
+//         method: 'POST',
+//         data: formData,
+//         dataType: 'json',
+//         success: function(response) {
+//             if(response.status === "success") {
+//                 alert(response.message || "Invoice updated successfully!");
+                
+//                 // ✅ Hide Add Form, Show Table
+//                 $('#addForm').hide();
+//                 $('#addTable').show();
+
+//                 // Optional: reload table or refresh page
+//                 location.reload();
+//             } else {
+//                 alert(response.message || "Update failed. Please try again.");
+//             }
+//         },
+//         error: function(xhr) {
+//             alert(xhr.responseJSON?.message || "Error updating invoice.");
+//         }
+//     });
+// }
+
+// // ===============================
+// // DELETE INVOICE
+// // ===============================
+// function deleteInvoice(invoiceId, element) {
+//     if (!confirm("Are you sure you want to delete this invoice?")) return;
+
+//     $.ajax({
+//         url: '/delete_invoice/' + invoiceId,
+//         method: 'GET',
+//         dataType: 'json',
+//         success: function (response) {
+//             alert(response.message || "Invoice deleted successfully!");
+//             if (element) $(element).closest("tr").remove();
+//         },
+//         error: function (xhr) {
+//             alert(xhr.responseJSON?.message || "Error deleting invoice. Please try again.");
+//         }
+//     });
+// }
+
+$(document).ready(function () {
+    // ===============================
+    // FORM / TABLE TOGGLE
+    // ===============================
+    if ($('#addForm').length && $('#addTable').length) {
+        // Default: show form, hide table
+        $('#addForm').show();
+        $('#addTable').hide();
+
+        // ✅ Check URL hash to show table instead
+        if (window.location.hash === "#addTable") {
+            $('#addForm').hide();
+            $('#addTable').show();
+        }
+
+        $('#addButton').click(function () {
+            $('#addForm').show();
+            $('#addTable').hide();
+        });
+
+        $('#displayButton').click(function () {
+            $('#addForm').hide();
+            $('#addTable').show();
+        });
+    }
+
+    // ===============================
+    // Subcontractor autocomplete
+    // ===============================
     $("#subcontractor").keyup(function () {
         let query = $(this).val();
         if (query !== "") {
@@ -21,42 +176,96 @@
         $("#subcontractor_id").val($(this).attr("data-id"));
         $("#subcontractor_list").fadeOut();
     });
-    });
 
-    // Success Alert: show alert and reload after 3 seconds
+    // Focus
-    function showSuccessAlert() {
+    if (document.getElementById('subcontractor')) {
-      const alertBox = document.getElementById("invoiceSuccessAlert");
+        document.getElementById('subcontractor').focus();
-      alertBox.classList.add("show");
-      setTimeout(() => {
-        alertBox.classList.remove("show");
-        // Reload page or redirect after alert hides
-        window.location.href = '/add_invoice';
-      }, 3000);
     }
 
-    // Submit form via AJAX
+    // ===============================
+    // ADD INVOICE
+    // ===============================
+    if ($('#invoiceForm').length && window.location.href.includes('add_invoice')) {
         $("#invoiceForm").on("submit", function (e) {
             e.preventDefault();
             let formData = $(this).serialize();
+
             $.ajax({
                 url: '/add_invoice',
                 method: 'POST',
                 data: formData,
+                dataType: 'json',
                 success: function (response) {
-          if(response.status === "success") {
+                    if (response.status === "success") {
-            showSuccessAlert();
+                        alert(response.message || "Invoice added successfully!");
+                        $('#invoiceForm')[0].reset(); // clear form
+                        $('#addForm').hide();
+                        $('#addTable').show(); // switch to table
+                        location.reload(); // optional refresh
                     } else {
-            alert(response.message);
+                        alert(response.message || "Error adding invoice.");
                     }
                 },
-        error: function (xhr, status, error) {
+                error: function (xhr) {
-          alert("Submission failed: " + error);
+                    let msg = xhr.responseJSON?.message || "Submission failed. Please try again.";
+                    alert(msg);
                 }
             });
         });
+    }
 
+    // ===============================
+    // UPDATE INVOICE
+    // ===============================
+    function updateInvoice(invoiceId, formElement) {
+        const formData = $(formElement).serialize();
 
+        $.ajax({
+            url: '/update_invoice/' + invoiceId,
+            method: 'POST',
+            data: formData,
+            dataType: 'json',
+            success: function(response) {
+                if(response.status === "success") {
+                    alert(response.message || "Invoice updated successfully!");
 
-window.onload = function () {
+                    // Redirect to Add Invoice page's table part
-        document.getElementById('subcontractor').focus();
+                    window.location.href = "/add_invoice#addTable";
-    };
+                } else {
+                    alert(response.message || "Update failed. Please try again.");
+                }
+            },
+            error: function(xhr) {
+                let msg = xhr.responseJSON?.message || "Error updating invoice.";
+                alert(msg);
+            }
+        });
+    }
+    window.updateInvoice = updateInvoice; // make globally accessible
+
+    // ===============================
+    // DELETE INVOICE
+    // ===============================
+    function deleteInvoice(invoiceId, element) {
+        if (!confirm("Are you sure you want to delete this invoice?")) return;
+
+        $.ajax({
+            url: '/delete_invoice/' + invoiceId,
+            method: 'GET',
+            dataType: 'json',
+            success: function (response) {
+                if (response.status === "success") {
+                    alert(response.message || "Invoice deleted successfully!");
+                    if (element) $(element).closest("tr").remove();
+                } else {
+                    alert(response.message || "Error deleting invoice.");
+                }
+            },
+            error: function (xhr) {
+                let msg = xhr.responseJSON?.message || "Error deleting invoice. Please try again.";
+                alert(msg);
+            }
+        });
+    }
+    window.deleteInvoice = deleteInvoice; // make globally accessible
+});

static/js/searchContractor.js

@@ -1,43 +1,57 @@
-$(document).ready(function () {
+document.addEventListener("DOMContentLoaded", function () {
-        function fetchResults() {
-            let formData = $('#search-form').serialize();
 
-            $.ajax({
+    const form = document.getElementById("search-form");
-                type: 'POST',
+    const tableBody = document.querySelector("#result-table tbody");
-                url: '/search_contractor',
-                data: formData,
-                success: function (data) {
-                    let tableBody = $('#result-table tbody');
-                    tableBody.empty();
 
-                    if (data.length === 0) {
+    function fetchData(page = 1) {
-                        tableBody.append('<tr><td colspan="6">No data found</td></tr>');
+        const formData = new FormData(form);
-                    } else {
+        formData.append("page", page);
-                        data.forEach(function (row) {
+
-                            tableBody.append(`
+        fetch("/search_contractor", {
-                                <tr>
+            method: "POST",
-                                    <td><a href="/contractor_report/${row.Contractor_Id}" target="_blank">${row.Contractor_Name}</a></td>
+            body: formData
-                                    <td><a href="/pmc_report/${row.PMC_No}" target="_blank">${row.PMC_No}</a></td>
+        })
+            .then(res => res.json())
+            .then(res => {
+                tableBody.innerHTML = "";
+
+                res.data.forEach(row => {
+
+                    const tr = document.createElement("tr");
+
+                    tr.innerHTML = `
+                    <td class="contractor-link" data-id="${row.Contractor_Id}">
+                        ${row.Contractor_Name}
+                    </td>
+                    <td class="pmc-link" data-pmc="${row.PMC_No}">
+                        ${row.PMC_No}
+                    </td>
                     <td>${row.State_Name}</td>
                     <td>${row.District_Name}</td>
                     <td>${row.Block_Name}</td>
                     <td>${row.Village_Name}</td>
-                                </tr>
+                `;
-                            `);
+
+                    tableBody.appendChild(tr);
                 });
-                    }
-                },
-                error: function (xhr) {
-                    alert(xhr.responseJSON.error);
-                }
             });
     }
 
-        $('#search-form input').on('keyup change', function () {
+    // Auto search
-            fetchResults();
+    form.addEventListener("input", () => fetchData());
-        });
+
+    // Click Contractor
+    document.addEventListener("click", function (e) {
+        if (e.target.classList.contains("contractor-link")) {
+            const id = e.target.dataset.id;
+            window.location.href = `/contractor_report/${id}`;
+        }
+
+        if (e.target.classList.contains("pmc-link")) {
+            const pmc = e.target.dataset.pmc;
+            window.location.href = `/pmc_report/${pmc}`;
+        }
     });
 
-window.onload = function () {
+    fetchData();
-        document.getElementById('subcontractor_name').focus();
+});
-    };

static/js/search_on_table.js

@@ -1,26 +1,23 @@
-
 // Search on table using search inpute options
 function searchTable() {
     let input = document.getElementById("searchBar").value.toLowerCase();
-    let rows = document.querySelectorAll("table tbody tr");
+    let tables = document.querySelectorAll("table");
 
-    rows.forEach(row => {
+    tables.forEach(table => {
-        let blockName = row.cells[1].textContent.toLowerCase();
+        let rows = table.querySelectorAll("tr");
-        let districtName = row.cells[2].textContent.toLowerCase();
-        let villageName = row.cells[3].textContent.toLowerCase();
 
-        if (blockName.includes(input) || districtName.includes(input)|| villageName.includes(input)) {
+        rows.forEach((row, index) => {
-            row.style.display = "";
+            if (index === 0) return; // header skip
-        } else {
+
-            row.style.display = "none";
+            let text = row.textContent.toLowerCase();
-        }
+
+            row.style.display = text.includes(input) ? "" : "none";
+        });
     });
 }
 
 
 
-
-
 // Common Sorting Script for Tables
 function sortTable(n, dir) {
     var table, rows, switching, i, x, y, shouldSwitch;
@@ -57,14 +54,14 @@ function sortTable(n, dir) {
 }
 
 // Attach sorting functionality to all sortable tables
-document.addEventListener("DOMContentLoaded", function() {
+document.addEventListener("DOMContentLoaded", function () {
     // Find all elements with the class "sortable-header"
     var sortableHeaders = document.querySelectorAll(".sortable-header");
 
-    sortableHeaders.forEach(function(header) {
+    sortableHeaders.forEach(function (header) {
         // Attach click event for ascending sort
         if (header.querySelector(".sort-asc")) {
-            header.querySelector(".sort-asc").addEventListener("click", function() {
+            header.querySelector(".sort-asc").addEventListener("click", function () {
                 var columnIndex = Array.from(header.parentNode.children).indexOf(header);
                 sortTable(columnIndex, "asc");
             });
@@ -72,7 +69,7 @@ document.addEventListener("DOMContentLoaded", function() {
 
         // Attach click event for descending sort
         if (header.querySelector(".sort-desc")) {
-            header.querySelector(".sort-desc").addEventListener("click", function() {
+            header.querySelector(".sort-desc").addEventListener("click", function () {
                 var columnIndex = Array.from(header.parentNode.children).indexOf(header);
                 sortTable(columnIndex, "desc");
             });
@@ -106,3 +103,30 @@ document.addEventListener("DOMContentLoaded", function () {
         addButton.classList.remove("active-button");
     });
 });
+
+document.addEventListener("DOMContentLoaded", function () {
+
+    let tables = document.querySelectorAll("table");
+
+    tables.forEach(table => {
+        let header = table.querySelector("tr:first-child");
+
+        if (header) {
+            header.style.position = "sticky";
+            header.style.top = "0";
+            header.style.background = "#fff";
+            header.style.zIndex = "2";
+        }
+
+        if (!table.parentElement.classList.contains("table-wrapper")) {
+            let wrapper = document.createElement("div");
+            wrapper.classList.add("table-wrapper");
+            wrapper.style.maxHeight = "65vh"
+            wrapper.style.overflowY = "auto";
+
+            table.parentNode.insertBefore(wrapper, table);
+            wrapper.appendChild(table);
+        }
+    });
+
+});

static/js/village.js

@@ -1,10 +1,37 @@
 window.onload = function () {
+    if (document.getElementById('Village_Name')) {
         document.getElementById('Village_Name').focus();
+    }
 };
  
 $(document).ready(function () {
 
+    // ✅ RUN ONLY IF THIS PAGE HAS FORM/TABLE
+    if ($('#addForm').length && $('#addTable').length) {
+
+        // ✅ DEFAULT VIEW → SHOW FORM
+        $('#addForm').show();
+        $('#addTable').hide();
+
+
+        // 🔥 BUTTON TOGGLE
+        $('#addButton').click(function () {
+            $('#addForm').show();
+            $('#addTable').hide();
+        });
+
+        $('#displayButton').click(function () {
+            $('#addForm').hide();
+            $('#addTable').show();
+        });
+    }
+
+
+    // ===============================
     // STATE → DISTRICT
+    // ===============================
+    if ($('#state_Id').length) {
+
         $('#state_Id').change(function () {
 
             var stateId = $(this).val();
@@ -23,25 +50,24 @@ $(document).ready(function () {
                         districtDropdown.append('<option value="" disabled selected>Select District</option>');
 
                         data.forEach(function (district) {
-
                             districtDropdown.append(
                                 '<option value="' + district.id + '">' + district.name + '</option>'
                             );
-
                         });
 
                         districtDropdown.prop('disabled', false);
-
+                    }
+                });
+            }
+        });
     }
 
-            });
-
-        }
-
-    });
-
 
+    // ===============================
     // DISTRICT → BLOCK
+    // ===============================
+    if ($('#district_Id').length) {
+
         $('#district_Id').change(function () {
 
             var districtId = $(this).val();
@@ -60,25 +86,24 @@ $(document).ready(function () {
                         blockDropdown.append('<option value="" disabled selected>Select Block</option>');
 
                         data.forEach(function (block) {
-
                             blockDropdown.append(
                                 '<option value="' + block.id + '">' + block.name + '</option>'
                             );
-
                         });
 
                         blockDropdown.prop('disabled', false);
-
+                    }
+                });
+            }
+        });
     }
 
-            });
-
-        }
-
-    });
-
 
+    // ===============================
     // VILLAGE NAME VALIDATION
+    // ===============================
+    if ($('#Village_Name').length) {
+
         $('#Village_Name').on('input', function () {
 
             var villageName = $(this).val();
@@ -96,13 +121,16 @@ $(document).ready(function () {
 
                 $('#villageMessage').text('');
                 $('#submitVillage').prop('disabled', false);
-
+            }
+        });
     }
 
-    });
-
 
+    // ===============================
     // CHECK DUPLICATE VILLAGE
+    // ===============================
+    if ($('#Village_Name').length && $('#block_Id').length) {
+
         $('#Village_Name, #block_Id').on('change keyup', function () {
 
             var blockId = $('#block_Id').val();
@@ -111,7 +139,6 @@ $(document).ready(function () {
             if (blockId && villageName) {
 
                 $.ajax({
-
                     url: '/check_village',
                     type: 'POST',
 
@@ -137,9 +164,7 @@ $(document).ready(function () {
                                 .css('color', 'green');
 
                             $('#submitVillage').prop('disabled', false);
-
                         }
-
                     },
 
                     error: function () {
@@ -149,50 +174,77 @@ $(document).ready(function () {
                             .css('color', 'red');
 
                         $('#submitVillage').prop('disabled', true);
-
+                    }
+                });
+            }
+        });
     }
 
-            });
 
-        }
+    // ===============================
+    // ADD VILLAGE (SAFE SCOPE FIX)
+    // ===============================
+    if ($('#villageForm').length) {
 
-    });
-
-
-    // ADD VILLAGE
         $('#villageForm').submit(function (event) {
 
             event.preventDefault();
 
             $.ajax({
-
                 url: '/add_village',
                 type: 'POST',
                 data: $(this).serialize(),
 
                 success: function (response) {
 
-                if (response.status === 'success') {
+                    if (response && response.status === 'success') {
 
-                    alert('Village added successfully!');
+                        alert(response.message || 'Village added successfully!');
+
+                        // ✅ clear form
+                        $('#villageForm')[0].reset();
+
+                        // ✅ switch to table
+                        $('#addForm').hide();
+                        $('#addTable').show();
+
+                        // optional refresh
                         location.reload();
 
                     } else {
-
+                        alert(response.message || 'Error adding village. Please try again.');
-                    alert('Error adding village. Please try again.');
-
                     }
-
                 },
 
                 error: function () {
-
                     alert('An error occurred. Please try again.');
+                }
+            });
 
+        });
     }
 
-        });
-
-    });
-
 });
+
+
+
+
+// ===============================
+// DELETE FUNCTION (SAFE)
+// ===============================
+function deleteVillage(villageId, element) {
+    if (!confirm("Are you sure you want to delete this village?")) return;
+
+    $.ajax({
+        url: '/delete_village/' + villageId,
+        type: 'GET',
+        dataType: 'json',
+        success: function (response) {
+            alert(response.message); // ✅ now shows "Village deleted successfully!"
+            if (element) $(element).closest("tr").remove();
+        },
+        error: function () {
+            alert("Error deleting village. Please try again.");
+        }
+    });
+}

templates/activity_log.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <title>Activity Logs</title>
@@ -9,54 +10,67 @@
             background-color: #f8f9fa;
             margin: 20px;
         }
+
         h2 {
             text-align: center;
             margin-bottom: 20px;
         }
+
         form {
             display: flex;
             gap: 10px;
             justify-content: center;
             margin-bottom: 20px;
+            flex-wrap: wrap;
         }
-        input, button {
+
+        input,
+        button {
             padding: 8px;
             border-radius: 6px;
             border: 1px solid #ccc;
         }
+
         button {
             background-color: #007bff;
             color: white;
             cursor: pointer;
         }
+
         button:hover {
             background-color: #0056b3;
         }
+
         table {
             width: 90%;
             margin: auto;
             border-collapse: collapse;
             background: white;
-            box-shadow: 0 0 8px rgba(0,0,0,0.1);
+            box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
         }
-        th, td {
+
+        th,
+        td {
             padding: 12px;
             border: 1px solid #ddd;
             text-align: center;
         }
+
         th {
             background-color: #007bff;
             color: white;
         }
+
         tr:nth-child(even) {
             background-color: #f2f2f2;
         }
     </style>
 </head>
+
 <body>
     <h2>Activity Logs</h2>
-<form method="get" action="{{ url_for('activity_log') }}" class="filter-form">
 
+    <form method="get" action="{{ url_for('log.activity_log') }}" class="filter-form">
         <label for="username">Username:</label>
         <input type="text" id="username" name="username" placeholder="Enter username" value="{{ username or '' }}">
 
@@ -66,10 +80,9 @@
         <label for="end_date">End Date:</label>
         <input type="date" id="end_date" name="end_date" value="{{ end_date or '' }}">
 
-
         <button type="submit" class="btn btn-primary">Filter</button>
-    <!-- <button type="button" style="background-color: #6c757d;" onclick="resetFilter()">Reset</button> -->
+        <button type="button" style="background-color: #6c757d;" onclick="resetFilter()">Reset</button>
-</form>
+    </form>
 
     <table>
         <tr>
@@ -95,8 +108,9 @@
 
     <script>
         function resetFilter() {
-        window.location.href = "{{ url_for('activity_log') }}";
+            window.location.href = "{{ url_for('log.activity_log') }}";
         }
-</script>
+    </script>
 </body>
+
 </html>

templates/add_gst_release.html

@@ -22,10 +22,14 @@
         <div class="row1">
            <div>
     <label for="subcontractor">Subcontractor Name:</label>
+    <!-- Text input for user-friendly autocomplete -->
     <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off"/>
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id"/>
+    
+    <!-- Hidden input for backend; must match model's Contractor_ID -->
+    <input type="hidden" id="subcontractor_id" name="Contractor_ID"/>
+    
     <div id="subcontractor_list" class="autocomplete-items"></div>
-            </div>
+</div>
         </div>
 
         <label for="PMC_No">PMC No:</label><br>
@@ -37,19 +41,19 @@
         </select><br><br>
 
         <label for="invoice_No">Invoice No:</label><br>
-        <input type="text" id="invoice_No" name="invoice_No" required><br><br>
+        <input type="text" id="invoice_No" name="Invoice_No" required><br><br>
 
         <label for="basic_amount">Basic Amount:</label><br>
-        <input type="number" step="0.01" id="basic_amount" name="basic_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="basic_amount" name="Basic_Amount" placeholder="₹ - 00.00" required><br><br>
 
         <label for="final_amount">Final Amount:</label><br>
-        <input type="number" step="0.01" id="final_amount" name="final_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="final_amount" name="Final_Amount" placeholder="₹ - 00.00" required><br><br>
 
         <label for="total_amount">Total Amount:</label><br>
-        <input type="number" step="0.01" id="total_amount" name="total_amount" placeholder="₹ - 00.00" required><br><br>
+        <input type="number" step="0.01" id="total_amount" name="Total_Amount" placeholder="₹ - 00.00" required><br><br>
 
         <label for="utr">UTR:</label><br>
-        <input type="text"  id="utr" name="utr"  required><br><br>
+        <input type="text"  id="utr" name="UTR"  required><br><br>
 
         <button type="submit">Submit GST Release</button>
     </form>
@@ -68,10 +72,11 @@
     {% endwith %}
 </div>
 
+<!-- GST Release History Table -->
 <div id="addTable" style="display: none;">
     <div class="search-container">
         <h2>GST Release History</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+        <input type="text" id="searchBar" placeholder="Search..." onkeyup="searchTable()">
     </div>
     <table id="sortableTable" border="1">
         <thead>
@@ -90,24 +95,22 @@
         <tbody>
             {% for gst_rel in gst_releases %}
             <tr>
-            <td>{{ gst_rel[0] }}</td>
+                <td>{{ gst_rel.gst_release_id }}</td>
-            <td>{{ gst_rel[1] }}</td>
+                <td>{{ gst_rel.pmc_no }}</td>
-            <td>{{ gst_rel[2] }}</td>
+                <td>{{ gst_rel.invoice_no }}</td>
-            <td>{{ gst_rel[3] }}</td>
+                <td>{{ gst_rel.basic_amount }}</td>
-            <td>{{ gst_rel[4] }}</td>
+                <td>{{ gst_rel.final_amount }}</td>
-            <td>{{ gst_rel[5] }}</td>
+                <td>{{ gst_rel.total_amount }}</td>
-            <td>{{ gst_rel[6] }}</td>
+                <td>{{ gst_rel.utr }}</td>
                 <td>
-                <a href="/edit_gst_release/{{ gst_rel[0] }}">
+                    <a href="{{ url_for('gst_release_bp.edit_gst_release', gst_release_id=gst_rel.gst_release_id) }}">
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon">
-                         class="icon">
                     </a>
                 </td>
                 <td>
-                <a href="/delete_gst_release/{{ gst_rel[0] }}"
+                    <a href="{{ url_for('gst_release_bp.delete_gst_release', gst_release_id=gst_rel.gst_release_id) }}" 
                        onclick="return confirm('Are you sure you want to delete this GST Release?')">
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon">
-                         class="icon">
                     </a>
                 </td>
             </tr>
@@ -118,46 +121,61 @@
 
 <script>
 document.addEventListener('DOMContentLoaded', function() {
-    // Handle subcontractor autocomplete
+
-    document.getElementById("subcontractor").addEventListener("input", function () {
+    const subcontractorInput = document.getElementById("subcontractor");
+    const subcontractorIdInput = document.getElementById("subcontractor_id");
+    const subcontractorList = document.getElementById("subcontractor_list");
+    const pmcDropdown = document.getElementById("PMC_No");
+    const form = document.querySelector('form');
+
+    // --------------------------
+    // Subcontractor autocomplete
+    // --------------------------
+    subcontractorInput.addEventListener("input", function () {
         const query = this.value;
-        const list = document.getElementById("subcontractor_list");
 
         if (query.length < 2) {
-            list.innerHTML = '';
+            subcontractorList.innerHTML = '';
+            subcontractorIdInput.value = ''; // reset hidden id
+            pmcDropdown.innerHTML = '<option value="">Select PMC No</option>'; // reset PMC dropdown
             return;
         }
 
         fetch(`/search_subcontractor?query=${encodeURIComponent(query)}`)
             .then(response => response.json())
             .then(data => {
-                list.innerHTML = '';
+                subcontractorList.innerHTML = '';
                 data.results.forEach(item => {
                     const div = document.createElement("div");
                     div.setAttribute("data-id", item.id);
                     div.textContent = item.name;
-                    list.appendChild(div);
+                    subcontractorList.appendChild(div);
                 });
             });
     });
 
-    // Handle subcontractor selection
+    // --------------------------
-    document.getElementById("subcontractor_list").addEventListener("click", function (e) {
+    // Subcontractor selection
+    // --------------------------
+    subcontractorList.addEventListener("click", function (e) {
         const selectedId = e.target.getAttribute("data-id");
         const selectedName = e.target.textContent;
 
         if (selectedId) {
-            document.getElementById("subcontractor_id").value = selectedId;
+            // Set hidden field for backend
-            document.getElementById("subcontractor").value = selectedName;
+            subcontractorIdInput.value = selectedId;
-            document.getElementById("subcontractor_list").innerHTML = "";
 
-            // Update PMC dropdown for selected subcontractor
+            // Set text input to selected name
+            subcontractorInput.value = selectedName;
+
+            // Clear the autocomplete list
+            subcontractorList.innerHTML = "";
+
+            // Fetch and populate PMC dropdown
             fetch(`/get_pmc_nos_by_subcontractor/${encodeURIComponent(selectedId)}`)
                 .then(response => response.json())
                 .then(data => {
-                    const pmcDropdown = document.getElementById("PMC_No");
                     pmcDropdown.innerHTML = '<option value="">Select PMC No</option>';
-
                     data.pmc_nos.forEach(pmc => {
                         const option = document.createElement("option");
                         option.value = pmc;
@@ -167,6 +185,22 @@ document.addEventListener('DOMContentLoaded', function() {
                 });
         }
     });
+
+    // --------------------------
+    // Form submit validation
+    // --------------------------
+    form.addEventListener('submit', function(e) {
+        if (!subcontractorIdInput.value) {
+            e.preventDefault();
+            alert("Please select a subcontractor from the list.");
+            subcontractorInput.focus();
+        } else if (!pmcDropdown.value) {
+            e.preventDefault();
+            alert("Please select a PMC No.");
+            pmcDropdown.focus();
+        }
+    });
+
 });
 </script>
 

templates/add_hold_type.html

@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <title>Manage Hold Types</title>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
@@ -7,14 +8,15 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
     <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
+
 <body>
 
-<div class="button-container">
+    <div class="button-container">
         <button id="addButton" class="action-button">Add</button>
         <button id="displayButton" class="action-button">Display</button>
-</div>
+    </div>
 
-<div id="addForm">
+    <div id="addForm">
         <h2>Add Hold Types</h2>
         <form id="holdTypeForm" method="POST" action="{{ url_for('hold_types.add_hold_type') }}">
             <label>Enter Hold Amount Type:</label>
@@ -22,9 +24,9 @@
             <span id="holdTypeMessage"></span>
             <button type="submit" value="Add Hold Type" id="successPopup">Add Hold Type</button>
         </form>
-</div>
+    </div>
 
-<div id="addTable" style="display: none;">
+    <div id="addTable" style="display: none;">
         <div class="search-container">
             <h2>Hold Type List</h2>
             <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
@@ -46,14 +48,26 @@
             <tr>
                 <td>{{ htd['hold_type_id'] }}</td>
                 <td>{{ htd['hold_type'] }}</td>
-            <td><a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">Edit</a></td>
+                <td style="text-align:center;">
-            <td><button class="delete-button" data-id="{{ htd['hold_type_id'] }}">Delete</button></td>
+                    <a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                            class="icon">
+                    </a>
+                </td>
+
+                <td style="text-align:center;">
+                    <a href="{{ url_for('hold_types.delete_hold_type', id=htd['hold_type_id']) }}"
+                        onclick="return confirm('Are you sure you want to delete this hold type?');">
+
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                            class="icon">
+                    </a>
+                </td>
             </tr>
             {% endfor %}
         </table>
 
         <a href="/">Back to Dashboard</a>
-</div>
+    </div>
 </body>
 {% endblock %}
-

templates/add_invoice.html

@@ -1,48 +1,67 @@
-{% extends 'base.html' %}
+{% extends 'base.html' %} {% block content %}
-{% block content %}
 <head xmlns="http://www.w3.org/1999/html">
-    <meta charset="UTF-8"/>
+  <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Add Invoice</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/invoice.css') }}">
+  <link
+    rel="stylesheet"
+    type="text/css"
+    href="{{ url_for('static', filename='css/invoice.css') }}"
+  />
   <script src="{{ url_for('static', filename='js/invoice.js') }}"></script>
   <script src="{{ url_for('static', filename='js/holdAmount.js') }}"></script>
   <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
 <body>
-{% if success == 'true' %}
+  {% if success == 'true' %}
-<div class="alert alert-success alert-dismissible fade show mt-3" role="alert">
+  <div
+    class="alert alert-success alert-dismissible fade show mt-3"
+    role="alert"
+  >
     ✅ Invoice added successfully!
-    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+    <button
-</div>
+      type="button"
-{% endif %}
+      class="btn-close"
+      data-bs-dismiss="alert"
+      aria-label="Close"
+    ></button>
+  </div>
+  {% endif %}
 
-
+  <!-- Flash Messages -->
-<!-- Flash Messages -->
+  {% with messages = get_flashed_messages(with_categories=true) %} {% if
-{% with messages = get_flashed_messages(with_categories=true) %}
+  messages %}
-  {% if messages %}
   <div class="flash-messages">
     {% for category, message in messages %}
     <div class="alert {{ category }}">{{ message }}</div>
     {% endfor %}
   </div>
-  {% endif %}
+  {% endif %} {% endwith %}
-{% endwith %}
 
-<div class="button-container">
+  <div class="button-container">
     <button id="addButton" class="action-button">Add</button>
     <button id="displayButton" class="action-button">Display</button>
-</div>
+  </div>
 
-<div id="addForm" style="display: none;">
+  <div id="addForm" style="display: none">
     <h2>Add Invoice</h2>
 
-    <form id="invoiceForm" action="{{ url_for('invoice.add_invoice') }}" method="POST">
+    <form
+      id="invoiceForm"
+      action="{{ url_for('invoice.add_invoice') }}"
+      method="POST"
+    >
       <div class="row1">
         <div>
           <label for="subcontractor">Subcontractor Name:</label>
-                <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off"/>
+          <input
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id"/>
+            type="text"
+            id="subcontractor"
+            name="subcontractor"
+            required
+            autocomplete="off"
+          />
+          <input type="hidden" id="subcontractor_id" name="subcontractor_id" />
           <div id="subcontractor_list"></div>
         </div>
       </div>
@@ -53,13 +72,15 @@
           <select id="village" name="village" required>
             <option value="">-- Select Village --</option>
             {% for village in villages %}
-                        <option value="{{ village.Village_Name }}">{{ village.Village_Name }}</option>
+            <option value="{{ village.Village_Name }}">
+              {{ village.Village_Name }}
+            </option>
             {% endfor %}
           </select>
         </div>
         <div>
           <label for="pmc_no">PMC No:</label>
-                <input type="text" id="pmc_no" name="pmc_no" required/>
+          <input type="text" id="pmc_no" name="pmc_no" required />
           <div id="pmc_no_list" class="autocomplete-list"></div>
         </div>
       </div>
@@ -67,81 +88,187 @@
       <div class="row2">
         <div>
           <label for="work_type">Work Type:</label>
-                <input type="text" id="work_type" name="work_type" required/>
+          <input type="text" id="work_type" name="work_type" required />
         </div>
         <div>
           <label for="invoice_details">Invoice Details:</label>
-                <textarea id="invoice_details" name="invoice_details" required></textarea>
+          <textarea
+            id="invoice_details"
+            name="invoice_details"
+            required
+          ></textarea>
         </div>
       </div>
 
       <div class="row2">
         <div>
           <label for="invoice_no">Invoice No:</label>
-                <input type="text" id="invoice_no" name="invoice_no" required/>
+          <input type="text" id="invoice_no" name="invoice_no" required />
         </div>
         <div>
           <label for="invoice_date">Invoice Date:</label>
-                <input type="date" id="invoice_date" name="invoice_date" required/>
+          <input type="date" id="invoice_date" name="invoice_date" required />
         </div>
       </div>
 
       <div class="row3">
         <div>
           <label for="basic_amount">Basic Amount:</label>
-        <input type="number" step="0.01" id="basic_amount" name="basic_amount" placeholder="₹ - 00.00" required/>
+          <input
+            type="number"
+            step="0.01"
+            id="basic_amount"
+            name="basic_amount"
+            placeholder="₹ - 00.00"
+            required
+          />
         </div>
         <div>
           <label for="debit_amount">Debit Amount:</label>
-        <input type="number" step="0.01" id="debit_amount" name="debit_amount" placeholder="₹ - 00.00" required/>
+          <input
+            type="number"
+            step="0.01"
+            id="debit_amount"
+            name="debit_amount"
+            placeholder="₹ - 00.00"
+            required
+          />
         </div>
         <div>
           <label for="after_debit_amount">After Debit Amount:</label>
-        <input type="number" step="0.01" id="after_debit_amount" name="after_debit_amount" placeholder="₹ - 00.00" readonly required/>
+          <input
+            type="number"
+            step="0.01"
+            id="after_debit_amount"
+            name="after_debit_amount"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
+        </div>
       </div>
-</div>
 
-<div class="row3">
+      <div class="row3">
         <div class="percentage-field">
           <label for="gst_percentage">GST %:</label>
-        <input type="number" step="0.01" id="gst_percentage" name="gst_percentage" placeholder="%"/>
+          <input
+            type="number"
+            step="0.01"
+            id="gst_percentage"
+            name="gst_percentage"
+            placeholder="%"
+          />
           <label for="gst_amount">GST Amount:</label>
-        <input type="number" step="0.01" id="gst_amount" name="gst_amount" placeholder="₹ - 00.00" readonly required/>
+          <input
+            type="number"
+            step="0.01"
+            id="gst_amount"
+            name="gst_amount"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
         </div>
         <div>
           <label for="amount">Amount:</label>
-        <input type="number" step="0.01" id="amount" name="amount" placeholder="₹ - 00.00" readonly required/>
+          <input
+            type="number"
+            step="0.01"
+            id="amount"
+            name="amount"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
         </div>
         <div class="percentage-field">
           <label for="tds_percentage">TDS %:</label>
-        <input type="number" step="0.01" id="tds_percentage" name="tds_percentage" placeholder="%"/>
+          <input
+            type="number"
+            step="0.01"
+            id="tds_percentage"
+            name="tds_percentage"
+            placeholder="%"
+          />
           <label for="tds_amount">TDS Amount:</label>
-        <input type="number" step="0.01" id="tds_amount" name="tds_amount" placeholder="₹ - 00.00" readonly required/>
+          <input
+            type="number"
+            step="0.01"
+            id="tds_amount"
+            name="tds_amount"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
+        </div>
       </div>
-</div>
 
-<div class="row3">
+      <div class="row3">
         <div class="percentage-field">
           <label for="sd_percentage">SD %:</label>
-        <input type="number" step="0.01" id="sd_percentage" name="sd_percentage" placeholder="%"/>
+          <input
+            type="number"
+            step="0.01"
+            id="sd_percentage"
+            name="sd_percentage"
+            placeholder="%"
+          />
           <label for="sd_amount">SD Amount:</label>
-        <input type="number" step="0.01" id="sd_amount" name="sd_amount" placeholder="₹ - 00.00" readonly required>
+          <input
+            type="number"
+            step="0.01"
+            id="sd_amount"
+            name="sd_amount"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
         </div>
         <div class="percentage-field">
           <label for="commission_percentage">On Commission %:</label>
-        <input type="number" step="0.01" id="commission_percentage" name="commission_percentage" placeholder="%"/>
+          <input
+            type="number"
+            step="0.01"
+            id="commission_percentage"
+            name="commission_percentage"
+            placeholder="%"
+          />
           <label for="on_commission">On Commission:</label>
-        <input type="number" step="0.01" id="on_commission" name="on_commission" placeholder="₹ - 00.00" readonly required>
+          <input
+            type="number"
+            step="0.01"
+            id="on_commission"
+            name="on_commission"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
         </div>
         <div class="percentage-field">
           <label for="hydro_percentage">Hydro Testing %:</label>
-        <input type="number" step="0.01" id="hydro_percentage" name="hydro_percentage" placeholder="%"/>
+          <input
+            type="number"
+            step="0.01"
+            id="hydro_percentage"
+            name="hydro_percentage"
+            placeholder="%"
+          />
           <label for="hydro_testing">Hydro Testing:</label>
-        <input type="number" step="0.01" id="hydro_testing" name="hydro_testing" placeholder="₹ - 00.00" readonly required>
+          <input
+            type="number"
+            step="0.01"
+            id="hydro_testing"
+            name="hydro_testing"
+            placeholder="₹ - 00.00"
+            readonly
+            required
+          />
+        </div>
       </div>
-</div>
       <div class="hold-row">
-            <button type="button" id="add_hold_amount" class="button">+ Add Hold Amount</button>
+        <button type="button" id="add_hold_amount" class="button">
+          + Add Hold Amount
+        </button>
       </div>
 
       <!-- Dynamically added hold amount fields -->
@@ -150,23 +277,42 @@
       <div class="row2">
         <div>
           <label for="gst_sd_amount">GST SD Amount:</label>
-                <input type="number" step="0.01" id="gst_sd_amount" name="gst_sd_amount" placeholder="₹ - 00.00" required/>
+          <input
+            type="number"
+            step="0.01"
+            id="gst_sd_amount"
+            name="gst_sd_amount"
+            placeholder="₹ - 00.00"
+            required
+          />
         </div>
         <div>
           <label for="final_amount">Final Amount:</label>
-                <input type="number" step="0.01" id="final_amount" name="final_amount" placeholder="₹ - 00.00" required/>
+          <input
+            type="number"
+            step="0.01"
+            id="final_amount"
+            name="final_amount"
+            placeholder="₹ - 00.00"
+            required
+          />
         </div>
       </div>
 
       <button type="submit" class="button">Submit</button>
     </form>
-</div>
+  </div>
 
-<div id="addTable" style="display: none;">
+  <div id="addTable" style="display: none">
     <!-- Invoice Table Section -->
     <div class="search-container">
       <h2>Invoice List</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+      <input
+        type="text"
+        id="searchBar"
+        placeholder="Searching..."
+        onkeyup="searchTable()"
+      />
       {% if invoices %}
       <table class="invoice-table">
         <thead>
@@ -218,14 +364,27 @@
             <td>{{ invoice.Final_Amount }}</td>
             <td>
               <!-- Edit -->
-              <a href="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}">
+              <a
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon">
+                href="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}"
+              >
+                <img
+                  src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}"
+                  alt="Edit"
+                  class="icon edit-btn"
+                  data-id="{{ invoice.Invoice_Id }}"
+                />
               </a>
             </td>
             <td>
-                <!-- Delete -->
+              <a
-                <a href="{{ url_for('invoice.delete_invoice_route', invoice_id=invoice.Invoice_Id) }}" onclick="return confirm('Are you sure?')">
+                href="javascript:void(0);"
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon">
+                onclick="deleteInvoice({{ invoice.Invoice_Id }}, this)"
+              >
+                <img
+                  src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}"
+                  alt="Delete"
+                  class="icon"
+                />
               </a>
             </td>
           </tr>
@@ -235,29 +394,31 @@
       {% else %}
       <p>No invoices found.</p>
       {% endif %}
-</div>
+    </div>
 
     <script>
-document.addEventListener('DOMContentLoaded', function() {
+      document.addEventListener("DOMContentLoaded", function () {
         // Get all the input fields
-    const basicAmount = document.getElementById('basic_amount');
+        const basicAmount = document.getElementById("basic_amount");
-    const debitAmount = document.getElementById('debit_amount');
+        const debitAmount = document.getElementById("debit_amount");
-    const afterDebitAmount = document.getElementById('after_debit_amount');
+        const afterDebitAmount = document.getElementById("after_debit_amount");
-    const amount = document.getElementById('amount');
+        const amount = document.getElementById("amount");
 
         // Percentage fields
-    const gstPercentage = document.getElementById('gst_percentage');
+        const gstPercentage = document.getElementById("gst_percentage");
-    const gstAmount = document.getElementById('gst_amount');
+        const gstAmount = document.getElementById("gst_amount");
-    const tdsPercentage = document.getElementById('tds_percentage');
+        const tdsPercentage = document.getElementById("tds_percentage");
-    const tdsAmount = document.getElementById('tds_amount');
+        const tdsAmount = document.getElementById("tds_amount");
-    const sdPercentage = document.getElementById('sd_percentage');
+        const sdPercentage = document.getElementById("sd_percentage");
-    const sdAmountInput = document.getElementById('sd_amount');
+        const sdAmountInput = document.getElementById("sd_amount");
-    const commissionPercentage = document.getElementById('commission_percentage');
+        const commissionPercentage = document.getElementById(
-    const onCommission = document.getElementById('on_commission');
+          "commission_percentage",
-    const hydroPercentage = document.getElementById('hydro_percentage');
+        );
-    const hydroTesting = document.getElementById('hydro_testing');
+        const onCommission = document.getElementById("on_commission");
-    const gstSdAmount = document.getElementById('gst_sd_amount');
+        const hydroPercentage = document.getElementById("hydro_percentage");
-    const finalAmount = document.getElementById('final_amount');
+        const hydroTesting = document.getElementById("hydro_testing");
+        const gstSdAmount = document.getElementById("gst_sd_amount");
+        const finalAmount = document.getElementById("final_amount");
 
         // Calculate after debit amount when basic or debit amount changes
         function calculateAfterDebitAmount() {
@@ -333,7 +494,9 @@ document.addEventListener('DOMContentLoaded', function() {
 
           // Get hold amounts
           let totalHold = 0;
-        document.querySelectorAll('input[name="hold_amount[]"]').forEach(input => {
+          document
+            .querySelectorAll('input[name="hold_amount[]"]')
+            .forEach((input) => {
               totalHold += parseFloat(input.value) || 0;
             });
 
@@ -343,28 +506,31 @@ document.addEventListener('DOMContentLoaded', function() {
         }
 
         // Add event listeners
-    basicAmount.addEventListener('input', calculateAfterDebitAmount);
+        basicAmount.addEventListener("input", calculateAfterDebitAmount);
-    debitAmount.addEventListener('input', calculateAfterDebitAmount);
+        debitAmount.addEventListener("input", calculateAfterDebitAmount);
 
         // Percentage fields
-    gstPercentage.addEventListener('input', calculateGST);
+        gstPercentage.addEventListener("input", calculateGST);
-    tdsPercentage.addEventListener('input', calculateOtherDeductions);
+        tdsPercentage.addEventListener("input", calculateOtherDeductions);
-    sdPercentage.addEventListener('input', calculateOtherDeductions);
+        sdPercentage.addEventListener("input", calculateOtherDeductions);
-    commissionPercentage.addEventListener('input', calculateOtherDeductions);
+        commissionPercentage.addEventListener(
-    hydroPercentage.addEventListener('input', calculateOtherDeductions);
+          "input",
+          calculateOtherDeductions,
+        );
+        hydroPercentage.addEventListener("input", calculateOtherDeductions);
 
         // Listen for changes in hold amounts
-    document.addEventListener('holdAmountChanged', calculateFinalAmount);
+        document.addEventListener("holdAmountChanged", calculateFinalAmount);
-});
+      });
 
-// Optional JS for auto-hiding flash
+      // Optional JS for auto-hiding flash
-setTimeout(() => {
+      setTimeout(() => {
-    document.querySelectorAll('.alert').forEach(el => el.style.display = 'none');
+        document
-}, 5000);
+          .querySelectorAll(".alert")
-</script>
+          .forEach((el) => (el.style.display = "none"));
-
+      }, 5000);
-
+    </script>
-</div>
+  </div>
 </body>
 
 {% endblock %}

templates/add_payment.html

@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -8,22 +9,23 @@
     <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
     <script src="{{ url_for('static', filename='js/invoice.js') }}"></script>
 </head>
+
 <body>
 
-<div class="button-container">
+    <div class="button-container">
         <button id="addButton" class="action-button">Add</button>
         <button id="displayButton" class="action-button">Display</button>
-</div>
+    </div>
 
-<div id="addForm" style="display: none;">
+    <div id="addForm" style="display: none;">
         <h2>Add Payment</h2>
 
         <form action="/add_payment" method="POST" onsubmit="showSuccessAlert(event)">
             <div class="row1">
                 <div>
                     <label for="subcontractor">Subcontractor Name:</label>
-                <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off"/>
+                    <input type="text" id="subcontractor" name="subcontractor" required autocomplete="off" />
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id"/>
+                    <input type="hidden" id="subcontractor_id" name="subcontractor_id" />
                     <div id="subcontractor_list" class="autocomplete-items"></div>
                 </div>
             </div>
@@ -34,19 +36,22 @@
             </select><br><br>
 
             <label for="invoice_No">Invoice No:</label><br>
-        <input type="number" step="0.01" id="invoice_No" name="invoice_No" ><br><br>
+            <input type="number" step="0.01" id="invoice_No" name="invoice_No"><br><br>
 
             <label for="Payment_Amount">Amount:</label><br>
-<input type="number" step="0.01" id="Payment_Amount" name="Payment_Amount" required oninput="calculateTDSAndTotal()"><br><br>
+            <input type="number" step="0.01" id="Payment_Amount" name="Payment_Amount" required
+                oninput="calculateTDSAndTotal()"><br><br>
 
-<label for="TDS_Percentage">TDS Percentage (%):</label><br>
+            <label for="TDS_Percentage">TDS Percentage (%):</label><br>
-<input type="number" step="0.01" id="TDS_Percentage" name="TDS_Percentage" oninput="calculateTDSAndTotal()"><br><br>
+            <input type="number" step="0.01" id="TDS_Percentage" name="TDS_Percentage"
+                oninput="calculateTDSAndTotal()"><br><br>
 
-<label for="TDS_Payment_Amount">TDS Amount:</label><br>
+            <label for="TDS_Payment_Amount">TDS Amount:</label><br>
-<input type="number" step="0.01" id="TDS_Payment_Amount" name="TDS_Payment_Amount" required readonly><br><br>
+            <input type="number" step="0.01" id="TDS_Payment_Amount" name="TDS_Payment_Amount" required
+                readonly><br><br>
 
-<label for="total_amount">Total Amount:</label><br>
+            <label for="total_amount">Total Amount:</label><br>
-<input type="number" step="0.01" id="total_amount" name="total_amount" required readonly><br><br>
+            <input type="number" step="0.01" id="total_amount" name="total_amount" required readonly><br><br>
 
 
             <label for="utr">UTR:</label><br>
@@ -54,13 +59,13 @@
 
             <button type="submit">Submit Payment</button>
         </form>
-</div>
+    </div>
 
-<div id="successPopup" class="success-popup">
+    <div id="successPopup" class="success-popup">
         <i>&#10004;</i> Payment added successfully!
-</div>
+    </div>
 
-<div id="addTable" style="display: none;">
+    <div id="addTable" style="display: none;">
         <div class="search-container">
             <h2>Payment History</h2>
             <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
@@ -89,8 +94,17 @@
                     <td>{{ payment[4] }}</td>
                     <td>{{ payment[5] }}</td>
                     <td>{{ payment[6] }}</td>
-            <td><a href="/edit_payment/{{ payment[0] }}"><img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon"></a></td>
+                    <td><a href="/edit_payment/{{ payment[0] }}"><img
-            <td><a href="/delete_payment/{{ payment[0] }}" onclick="return confirm('Are you sure you want to delete this payment?')"><img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon"></a></td>
+                                src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                                class="icon"></a></td>
+
+                    <td>
+                        <a href="{{ url_for('payment_bp.delete_payment', payment_id=payment[0]) }}"
+                            onclick="return confirm('Are you sure you want to delete this Payment?')">
+                            <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                                class="icon">
+                        </a>
+                    </td>
                 </tr>
                 <!-- <tr>
             <td>{{ payment['Payment_Id'] }}</td>
@@ -106,10 +120,10 @@
                 {% endfor %}
             </tbody>
         </table>
-</div>
+    </div>
 
-<script>
+    <script>
-document.getElementById("subcontractor").addEventListener("input", function () {
+        document.getElementById("subcontractor").addEventListener("input", function () {
             const query = this.value;
             const list = document.getElementById("subcontractor_list");
 
@@ -129,9 +143,9 @@ document.getElementById("subcontractor").addEventListener("input", function () {
                         list.appendChild(div);
                     });
                 });
-});
+        });
 
-document.getElementById("subcontractor_list").addEventListener("click", function (e) {
+        document.getElementById("subcontractor_list").addEventListener("click", function (e) {
             const selectedId = e.target.getAttribute("data-id");
             const selectedName = e.target.textContent;
 
@@ -171,11 +185,11 @@ document.getElementById("subcontractor_list").addEventListener("click", function
                         alert("Failed to fetch PMC numbers.");
                     });
             }
-});
+        });
-</script>
+    </script>
 
-<script>
+    <script>
-function calculateTDSAndTotal() {
+        function calculateTDSAndTotal() {
             const amount = parseFloat(document.getElementById("Payment_Amount").value) || 0;
             const tdsPercent = parseFloat(document.getElementById("TDS_Percentage").value) || 0;
 
@@ -184,10 +198,10 @@ function calculateTDSAndTotal() {
 
             document.getElementById("TDS_Payment_Amount").value = tdsAmount;
             document.getElementById("total_amount").value = totalAmount;
-}
+        }
-</script>
+    </script>
 
 
-<script src="{{ url_for('static', filename='js/showSuccessAlert.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/showSuccessAlert.js') }}"></script>
 </body>
 {% endblock %}

templates/add_village.html

@@ -1,22 +1,24 @@
-{% extends 'base.html' %}
+{% extends 'base.html' %} {% block content %}
-{% block content %}
 <head>
-    <meta charset="UTF-8">
+  <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Village Management</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
+  <link
+    rel="stylesheet"
+    type="text/css"
+    href="{{ url_for('static', filename='css/style.css') }}"
+  />
   <script src="{{ url_for('static', filename='js/village.js') }}"></script>
   <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
 <body>
-
+  <!-- Button Container to Center Buttons -->
-<!-- Button Container to Center Buttons -->
+  <div class="button-container">
-<div class="button-container">
     <button id="addButton" class="action-button">Add</button>
     <button id="displayButton" class="action-button">Display</button>
-</div>
+  </div>
 
-<div id="addForm" style="display: none;">
+  <div id="addForm" style="display: none">
     <div class="container">
       <div class="form-block">
         <h2>Add a New Village</h2>
@@ -40,19 +42,30 @@
           </select>
 
           <label for="Village_Name">Village Name:</label>
-                <input type="text" id="Village_Name" name="Village_Name" placeholder="Enter Village Name" required>
+          <input
+            type="text"
+            id="Village_Name"
+            name="Village_Name"
+            placeholder="Enter Village Name"
+            required
+          />
           <span id="villageMessage"></span>
 
           <button type="submit" id="submitVillage" disabled>Add Village</button>
         </form>
       </div>
     </div>
-</div>
+  </div>
 
-<div id="addTable" style="display: none;">
+  <div id="addTable" style="display: none">
     <div class="search-container">
       <h2>Display Villages</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+      <input
+        type="text"
+        id="searchBar"
+        placeholder="Searching..."
+        onkeyup="searchTable()"
+      />
     </div>
 
     <table id="sortableTable" border="1">
@@ -63,12 +76,15 @@
           <span class="sort-buttons">
             <span class="sort-asc">⬆️</span>
             <span class="sort-desc">⬇️</span>
-                    </span></th>
+          </span>
-            <th class="sortable-header">Block Name
+        </th>
+        <th class="sortable-header">
+          Block Name
           <span class="sort-buttons">
             <span class="sort-asc">⬆️</span>
             <span class="sort-desc">⬇️</span>
-                    </span></th>
+          </span>
+        </th>
         <th>Update</th>
         <th>Delete</th>
       </tr>
@@ -78,22 +94,36 @@
         <td>{{ village[1] }}</td>
         <td>{{ village[2] }}</td>
         <td>
-                <a href="{{ url_for('village.edit_village', village_id=village[0]) }}">
+          <a
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+            href="{{ url_for('village.edit_village', village_id=village[0]) }}"
-                         class="icon">
+          >
+            <img
+              src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}"
+              alt="Edit"
+              class="icon"
+            />
           </a>
         </td>
         <td>
-                <a href="{{ url_for('village.delete_village', village_id=village[0]) }}"
+       <a href="javascript:void(0);" 
-                   onclick="return confirm('Are you sure you want to delete this village?');">
+   onclick="deleteVillage({{ village[0] }}, this)">
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" 
          class="icon">
-                </a>
+</a>
         </td>
       </tr>
       {% endfor %}
     </table>
-</div>
+  </div>
-
+  <!-- Flash Alerts -->
+{% with messages = get_flashed_messages(with_categories=true) %}
+    {% if messages %}
+        <script>
+            {% for category, message in messages %}
+                alert("{{ message }}");
+            {% endfor %}
+        </script>
+    {% endif %}
+{% endwith %}
 </body>
 {% endblock %}

templates/edit_gst_release.html

@@ -9,37 +9,37 @@
 <body>
 <h2>Edit GST Release</h2>
 
-<form action="/edit_gst_release/{{ gst_release_data[0] }}" method="POST">
+<form action="/edit_gst_release/{{ gst_release_data.gst_release_id }}" method="POST">
-    <!--    <label for="invoice_id">Invoice Id:</label><br>-->
-    <!--    <input type="number" id="invoice_id" name="invoice_id" value="{{ gst_release_data[0] }}" required><br><br>-->
 
+    <!-- PMC Number -->
     <label for="PMC_No">PMC No :</label><br>
-    <input type="number" id="PMC_No" name="PMC_No" value="{{ gst_release_data[1] }}" required><br><br>
+    <input type="text" id="PMC_No" name="PMC_No" value="{{ gst_release_data.pmc_no }}" required><br><br>
 
-    <label for="invoice_No">Invoice No:</label><br>
+    <!-- Invoice Number -->
-    <input type="number" step="0.01" id="invoice_No" name="invoice_No" value="{{ gst_release_data[2] }}"
+    <label for="invoice_no">Invoice No:</label><br>
-           required><br><br>
+    <input type="text" id="invoice_no" name="invoice_no" value="{{ gst_release_data.invoice_no }}" required><br><br>
 
+    <!-- Basic Amount -->
+    <label for="Basic_Amount">Basic Amount:</label><br>
+    <input type="number" step="0.01" id="Basic_Amount" name="Basic_Amount" value="{{ gst_release_data.basic_amount }}" required><br><br>
 
-    <label for="basic_amount">Basic Amount:</label><br>
+    <!-- Final Amount -->
-    <input type="number" step="0.01" id="basic_amount" name="basic_amount" value="{{ gst_release_data[3] }}"
+    <label for="Final_Amount">Final Amount:</label><br>
-           required><br><br>
+    <input type="number" step="0.01" id="Final_Amount" name="Final_Amount" value="{{ gst_release_data.final_amount }}" required><br><br>
 
-    <label for="final_amount">Final Amount:</label><br>
+    <!-- Total Amount -->
-    <input type="number" step="0.01" id="final_amount" name="final_amount" value="{{ gst_release_data[4] }}"
+    <label for="Total_Amount">Total Amount:</label><br>
-           required><br><br>
+    <input type="number" step="0.01" id="Total_Amount" name="Total_Amount" value="{{ gst_release_data.total_amount }}" required><br><br>
 
-     <label for="total_amount">Total Amount:</label><br>
+    <!-- UTR -->
-    <input type="number" step="0.01" id="total_amount" name="total_amount" value="{{ gst_release_data[5] }}"
+    <label for="UTR">UTR:</label><br>
-           required><br><br>
+    <input type="text" id="UTR" name="UTR" value="{{ gst_release_data.utr }}" readonly required><br><br>
 
-     <label for="utr">UTR:</label><br>
+    <!-- Hidden Contractor ID -->
-    <input type="text"  id="utr" name="utr" value="{{ gst_release_data[6] }}"
+    <input type="hidden" id="Contractor_ID" name="Contractor_ID" value="{{ gst_release_data.contractor_id }}">
-           required readonly><br><br>
 
     <button type="submit">Update GST Release</button>
 </form>
 
-
 </body>
 {% endblock %}

templates/edit_hold_type.html

@@ -1,7 +1,7 @@
-
 {% extends 'base.html' %}
 
 {% block content %}
+
 <head>
     <title>Edit Hold Type</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
@@ -10,10 +10,10 @@
 
 <body>
     <h2>Edit Hold Type</h2>
-    <form id="updateHoldTypeForm">
+    <form id="updateHoldTypeForm" method="POST">
-        <input type="hidden" id="hold_type_id" value="{{ hold_type[0] }}">
+        <input type="hidden" id="hold_type_id" value="{{ hold_type.hold_type_id }}">
         <label for="edit_hold_type">Hold Type:</label>
-        <input type="text" id="edit_hold_type" name="hold_type" value="{{ hold_type[1] }}" required>
+        <input type="text" id="edit_hold_type" name="hold_type" value="{{ hold_type.hold_type }}" required>
         <button type="submit">Update</button>
         <a href="{{ url_for('hold_types.add_hold_type') }}"></a>
     </form>
@@ -37,7 +37,7 @@
             formData.append('hold_type', newHoldType);
 
             $.ajax({
-                url: '/update_hold_type/' + holdTypeId,
+                url: '/edit_hold_type/' + holdTypeId,
                 method: 'POST',
                 data: formData,
                 processData: false,
@@ -55,8 +55,3 @@
     });
 </script>
 {% endblock %}
-
-
-
-
-

templates/edit_invoice.html

@@ -2,17 +2,18 @@
 {% block content %}
 
 <head>
-    <meta charset="UTF-8"/>
+    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Edit Invoice</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/invoice.css') }}">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style1.css') }}">
+
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 </head>
 
 <body>
 
-<div id="editForm">
+    <div id="editForm">
         <h2>Edit Invoice</h2>
 
         <!-- Success Alert Box -->
@@ -20,7 +21,8 @@
             Invoice successfully updated!
         </div>
 
-    <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}" method="POST">
+        <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}"
+            method="POST">
 
             <!-- Subcontractor Field -->
             <div class="row1">
@@ -28,7 +30,8 @@
                     <label for="subcontractor">Subcontractor Name:</label>
                     <input class="form-control" list="subcontractor_list" id="subcontractor" name="subcontractor"
                         value="{{ invoice.Contractor_Name }}" placeholder="Type to search..." required>
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id" value="{{ invoice.Subcontractor_Id }}">
+                    <input type="hidden" id="subcontractor_id" name="subcontractor_id"
+                        value="{{ invoice.Subcontractor_Id }}">
                     <datalist id="subcontractor_list"></datalist>
                 </div>
             </div>
@@ -37,12 +40,12 @@
             <div class="row2">
                 <div>
                     <label for="village">Village Name:</label>
-                <input type="text" id="village" name="village" value="{{ invoice.Village_Name }}" required/>
+                    <input type="text" id="village" name="village" value="{{ invoice.Village_Name }}" required />
                     <datalist id="village_list"></datalist>
                 </div>
                 <div>
                     <label for="pmc_no">PMC No:</label>
-                <input type="text" id="pmc_no" name="pmc_no" value="{{ invoice.PMC_No }}" required/>
+                    <input type="text" id="pmc_no" name="pmc_no" value="{{ invoice.PMC_No }}" required />
                 </div>
             </div>
 
@@ -50,11 +53,12 @@
             <div class="row2">
                 <div>
                     <label for="work_type">Work Type:</label>
-                <input type="text" id="work_type" name="work_type" value="{{ invoice.Work_Type }}" required/>
+                    <input type="text" id="work_type" name="work_type" value="{{ invoice.Work_Type }}" required />
                 </div>
                 <div>
                     <label for="invoice_details">Invoice Details:</label>
-                <textarea id="invoice_details" name="invoice_details" required>{{ invoice.Invoice_Details }}</textarea>
+                    <textarea id="invoice_details" name="invoice_details"
+                        required>{{ invoice.Invoice_Details }}</textarea>
                 </div>
             </div>
 
@@ -62,11 +66,12 @@
             <div class="row2">
                 <div>
                     <label for="invoice_no">Invoice No:</label>
-                <input type="text" id="invoice_no" name="invoice_no" value="{{ invoice.Invoice_No }}" required/>
+                    <input type="text" id="invoice_no" name="invoice_no" value="{{ invoice.invoice_no }}" required />
                 </div>
                 <div>
                     <label for="invoice_date">Invoice Date:</label>
-                <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}" required/>
+                    <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}"
+                        required />
                 </div>
             </div>
 
@@ -74,15 +79,18 @@
             <div class="row3">
                 <div>
                     <label for="basic_amount">Basic Amount:</label>
-                <input type="number" step="0.01" id="basic_amount" name="basic_amount" value="{{ invoice.Basic_Amount }}" required/>
+                    <input type="number" step="0.01" id="basic_amount" name="basic_amount"
+                        value="{{ invoice.Basic_Amount }}" required />
                 </div>
                 <div>
                     <label for="debit_amount">Debit Amount:</label>
-                <input type="number" step="0.01" id="debit_amount" name="debit_amount" value="{{ invoice.Debit_Amount }}" required/>
+                    <input type="number" step="0.01" id="debit_amount" name="debit_amount"
+                        value="{{ invoice.Debit_Amount }}" required />
                 </div>
                 <div>
                     <label for="after_debit_amount">After Debit Amount:</label>
-                <input type="number" step="0.01" id="after_debit_amount" name="after_debit_amount" value="{{ invoice.After_Debit_Amount }}" required/>
+                    <input type="number" step="0.01" id="after_debit_amount" name="after_debit_amount"
+                        value="{{ invoice.After_Debit_Amount }}" required />
                 </div>
             </div>
 
@@ -90,15 +98,17 @@
             <div class="row3">
                 <div>
                     <label for="amount">Amount:</label>
-                <input type="number" step="0.01" id="amount" name="amount" value="{{ invoice.Amount }}" required/>
+                    <input type="number" step="0.01" id="amount" name="amount" value="{{ invoice.Amount }}" required />
                 </div>
                 <div>
                     <label for="gst_amount">GST Amount:</label>
-                <input type="number" step="0.01" id="gst_amount" name="gst_amount" value="{{ invoice.GST_Amount }}" required/>
+                    <input type="number" step="0.01" id="gst_amount" name="gst_amount" value="{{ invoice.GST_Amount }}"
+                        required />
                 </div>
                 <div>
                     <label for="tds_amount">TDS Amount:</label>
-                <input type="number" step="0.01" id="tds_amount" name="tds_amount" value="{{ invoice.TDS_Amount }}" required/>
+                    <input type="number" step="0.01" id="tds_amount" name="tds_amount" value="{{ invoice.TDS_Amount }}"
+                        required />
                 </div>
             </div>
 
@@ -106,34 +116,39 @@
             <div class="row3">
                 <div>
                     <label for="sd_amount">SD Amount:</label>
-                <input type="number" step="0.01" id="sd_amount" name="sd_amount" value="{{ invoice.SD_Amount }}" required/>
+                    <input type="number" step="0.01" id="sd_amount" name="sd_amount" value="{{ invoice.SD_Amount }}"
+                        required />
                 </div>
                 <div>
                     <label for="on_commission">On Commission:</label>
-                <input type="number" step="0.01" id="on_commission" name="on_commission" value="{{ invoice.On_Commission }}" required/>
+                    <input type="number" step="0.01" id="on_commission" name="on_commission"
+                        value="{{ invoice.On_Commission }}" required />
                 </div>
                 <div>
                     <label for="hydro_testing">Hydro Testing:</label>
-                <input type="number" step="0.01" id="hydro_testing" name="hydro_testing" value="{{ invoice.Hydro_Testing }}" required/>
+                    <input type="number" step="0.01" id="hydro_testing" name="hydro_testing"
+                        value="{{ invoice.Hydro_Testing }}" required />
                 </div>
             </div>
 
             <!-- Hold Amount Section -->
-<div id="hold_amount_container">
+            <div id="hold_amount_container">
                 {% set seen_types = [] %}
                 {% for hold in invoice.hold_amounts %}
                 {% if hold.hold_type not in seen_types %}
                 {% set _ = seen_types.append(hold.hold_type) %}
                 <div class="hold-amount-row">
                     <label for="hold_type_{{ loop.index }}">Hold Type:</label>
-                <input type="text" id="hold_type_{{ loop.index }}" name="hold_type[]" value="{{ hold.hold_type }}" required/>
+                    <input type="text" id="hold_type_{{ loop.index }}" name="hold_type[]" value="{{ hold.hold_type }}"
+                        required />
                     <label for="hold_amount_{{ loop.index }}">Hold Amount:</label>
-                <input type="number" step="0.01" id="hold_amount_{{ loop.index }}" name="hold_amount[]" value="{{ hold.hold_amount }}" required/>
+                    <input type="number" step="0.01" id="hold_amount_{{ loop.index }}" name="hold_amount[]"
+                        value="{{ hold.hold_amount }}" required />
                     <button type="button" class="remove-hold-amount">Remove</button>
                 </div>
                 {% endif %}
                 {% endfor %}
-</div>
+            </div>
 
 
             <div class="hold-row">
@@ -144,24 +159,26 @@
             <div class="row2">
                 <div>
                     <label for="gst_sd_amount">GST SD Amount:</label>
-                <input type="number" step="0.01" id="gst_sd_amount" name="gst_sd_amount" value="{{ invoice.GST_SD_Amount }}" required/>
+                    <input type="number" step="0.01" id="gst_sd_amount" name="gst_sd_amount"
+                        value="{{ invoice.GST_SD_Amount }}" required />
                 </div>
                 <div>
                     <label for="final_amount">Final Amount:</label>
-                <input type="number" step="0.01" id="final_amount" name="final_amount" value="{{ invoice.Final_Amount }}" required/>
+                    <input type="number" step="0.01" id="final_amount" name="final_amount"
+                        value="{{ invoice.Final_Amount }}" required />
                 </div>
             </div>
 
             <!-- Submit Button -->
             <button type="submit" class="button">Update</button>
         </form>
-</div>
+    </div>
 
-<!-- JS for dynamic hold amount rows -->
+    <!-- JS for dynamic hold amount rows -->
-<script>
+    <script>
-$(document).ready(function() {
+        $(document).ready(function () {
             // Add new hold amount row
-    $("#add_hold_amount").click(function() {
+            $("#add_hold_amount").click(function () {
                 const index = $("#hold_amount_container .hold-amount-row").length;
                 const newRow = `
             <div class="hold-amount-row">
@@ -176,32 +193,34 @@ $(document).ready(function() {
             });
 
             // Remove hold amount row
-    $(document).on("click", ".remove-hold-amount", function() {
+            $(document).on("click", ".remove-hold-amount", function () {
                 $(this).closest(".hold-amount-row").remove();
             });
 
             // Submit form via AJAX
-    $("#invoiceForm").submit(function(e) {
+            $("#invoiceForm").submit(function (e) {
                 e.preventDefault();
 
                 $.ajax({
                     type: "POST",
                     url: $(this).attr("action"),
                     data: $(this).serialize(),
-            success: function(response) {
+                    dataType: 'json',  // ensure JSON is returned
-                if(response.status === "success") {
+                    success: function (response) {
-                $("#invoiceSuccessAlert").fadeIn().delay(3000).fadeOut();
+                        if (response.status === "success") {
                             alert("Invoice updated successfully!");  // <-- Popup alert
-                }
 
+                            // ✅ Redirect to Add Invoice page (table part visible)
+                            window.location.href = "{{ url_for('invoice.add_invoice') }}#addTable";
+                        }
                     },
-            error: function(xhr) {
+                    error: function (xhr) {
-                alert("Error: " + xhr.responseJSON.message);
+                        alert("Error: " + xhr.responseJSON?.message || "Something went wrong!");
                     }
                 });
             });
-});
+        });
-</script>
+    </script>
 
 </body>
 {% endblock %}

templates/edit_village.html

@@ -28,25 +28,17 @@
 
             <button type="submit">Update Village</button>
         </form>
-    </div>
+  <!-- Flash Messages (hidden, used for JS popup) -->
-
+<div id="flash-messages-container" style="display:none;">
-    <!-- Flash Message (Hidden, used for JS popup) -->
     {% with messages = get_flashed_messages(with_categories=true) %}
         {% if messages %}
             {% for category, message in messages %}
-          <div id="flash-message" data-category="{{ category }}" style="display:none;">{{ message }}</div>
+                <div class="flash-message" data-category="{{ category }}">{{ message }}</div>
             {% endfor %}
         {% endif %}
     {% endwith %}
 </div>
 
-<script>
+
-    window.onload = function () {
-        const flash = document.getElementById('flash-message');
-        if (flash && flash.innerText.trim() !== "") {
-            alert(flash.innerText);
-        }
-    };
-</script>
 </body>
 {% endblock %}

templates/pmc_report.html

@@ -1,7 +1,6 @@
-
-
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -9,9 +8,10 @@
     <!--    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">-->
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/subcontractor_report.css') }}">
 </head>
+
 <body>
 
-<div class="container">
+    <div class="container">
         <h2>PMC Report</h2>
 
         <div class="info">
@@ -19,72 +19,72 @@
             <div class="row2">
                 <div>
                     <label for="subcontractor">Subcontractor Name:</label>
-                <input type="text" id="subcontractor" name="subcontractor" value="{{ info.Contractor_Name }}"
+                    <input type="text" id="subcontractor" name="subcontractor" value="{{ contInfo.Contractor_Name }}"
-                       readonly/>
+                        readonly />
                 </div>
                 <div>
                     <label for="Address">Address :</label>
-                <textarea id="Address" name="Address" readonly>{{ info.Address }}</textarea>
+                    <textarea id="Address" name="Address" readonly>{{ contInfo.Address }}</textarea>
                 </div>
             </div>
             <div class="row3">
                 <div>
                     <label for="PAN_No">PAN No :</label>
-                <input type="text" id="PAN_No" name="PAN_No" value="{{ info.PAN_No }}" readonly/>
+                    <input type="text" id="PAN_No" name="PAN_No" value="{{ contInfo.PAN_No }}" readonly />
                 </div>
                 <div>
                     <label for="Mobile_No">Mobile Number :</label>
-                <input type="text" id="Mobile_No" name="Mobile_No" value="{{ info.Mobile_No }}" readonly/>
+                    <input type="text" id="Mobile_No" name="Mobile_No" value="{{ contInfo.Mobile_No }}" readonly />
                 </div>
                 <div>
                     <label for="Email">Email :</label>
-                <input type="text" id="Email" name="Email" value="{{ info.Email }}" readonly/>
+                    <input type="text" id="Email" name="Email" value="{{ contInfo.Email }}" readonly />
                 </div>
             </div>
             <div class="row2">
                 <div>
                     <label for="GST_Registration_Type">GST Registration Type :</label>
                     <input type="text" id="GST_Registration_Type" name="GST_Registration_Type"
-                       value="{{ info.GST_Registration_Type }}" readonly/>
+                        value="{{ contInfo.GST_Registration_Type }}" readonly />
 
                 </div>
                 <div>
                     <label for="GST_No">GST No:</label>
-                <input type="text" id="GST_No" name="GST_No" value="{{ info.GST_No }}" readonly/>
+                    <input type="text" id="GST_No" name="GST_No" value="{{ contInfo.GST_No }}" readonly />
                 </div>
             </div>
-        <h2>PMC Report for PMC No: {{ info.PMC_No}}</h2>
+            <h2>PMC Report for PMC No: {{ contInfo.PMC_No}}</h2>
             <div class="row3">
                 <div>
                     <label for="State">State :</label>
-                <input type="text" id="State" name="State" value="{{ info.State_Name }}" readonly/>
+                    <input type="text" id="State" name="State" value="{{ contInfo.State_Name }}" readonly />
                 </div>
                 <div>
                     <label for="District">District :</label>
-                <input type="text" id="District" name="District" value="{{ info.District_Name }}" readonly/>
+                    <input type="text" id="District" name="District" value="{{ contInfo.District_Name }}" readonly />
                 </div>
                 <div>
                     <label for="Block">Block :</label>
-                <input type="text" id="Block" name="Block" value="{{ info.Block_Name }}" readonly/>
+                    <input type="text" id="Block" name="Block" value="{{ contInfo.Block_Name }}" readonly />
                 </div>
             </div>
             <div class="row2">
                 <div>
                     <label for="PMC_No">PMC No:</label>
-                <input type="text" id="PMC_No" name="PMC_No" value="{{ info.PMC_No }}" readonly/>
+                    <input type="text" id="PMC_No" name="PMC_No" value="{{ contInfo.PMC_No }}" readonly />
                 </div>
                 <div>
                     <label for="Village_Name">Village Name :</label>
                     <input type="text" id="Village_Name" name="Village_Name"
-                       value="{{ info.Village_Name.capitalize() }}" readonly/>
+                        value="{{ contInfo.Village_Name.capitalize() }}" readonly />
+                </div>
             </div>
         </div>
     </div>
-</div>
 
 
-<h3>Invoice Details</h3>
+    <h3>Invoice Details</h3>
-<table>
+    <table>
         <thead>
             <tr>
                 <th>PMC No</th>
@@ -118,7 +118,7 @@
             {% for invoice in invoices %}
             <tr>
                 <td>{{ invoice.PMC_No }}</td>
-        <td>{{ invoice.Village_Name.capitalize() }}</td>
+                <td>{{ invoice.Village_Name.capitalize() if invoice.Village_Name else '' }}</td>
                 <td>{{ invoice.Work_Type }}</td>
                 <td>{{ invoice.Invoice_Details }}</td>
                 <td>{{ invoice.Invoice_Date }}</td>
@@ -174,9 +174,9 @@
             </tr>
             {% endif %}
         </tbody>
-</table>
+    </table>
-<h3>Hold Release</h3>
+    <h3>Hold Release</h3>
-<table>
+    <table>
         <thead>
             <tr>
                 <th>PMC No</th>
@@ -205,17 +205,19 @@
             </tr>
             {%endif%}
         </tbody>
-</table>
+    </table>
 
-<br>
+    <br>
-<h3>GST Release Note Details</h3>
+    <h3>GST Release Note Details</h3>
-<table>
+    <table>
         <thead>
             <tr>
                 <th>PMC No</th>
                 <th>Invoice No</th>
                 <th>Basic Amount</th>
                 <th>Final Amount</th>
+                <th>Total_Amount</th>
+                <th>UTR</th>
             </tr>
         </thead>
         <tbody>
@@ -223,9 +225,11 @@
             {% for gst in gst_rel %}
             <tr>
                 <td>{{ gst.pmc_no }}</td>
-        <td>{{ gst.invoice_no }}</td>
+                <td>{{ gst.Invoice_No }}</td>
-        <td>{{ gst.basic_amount }}</td>
+                <td>{{ gst.Basic_Amount }}</td>
-        <td>{{ gst.final_amount }}</td>
+                <td>{{ gst.Final_Amount }}</td>
+                <td>{{ gst.Total_Amount }}</td>
+                <td>{{ gst.UTR }}</td>
             </tr>
             {% endfor %}
             <tr>
@@ -240,7 +244,7 @@
             </tr>
             {% endif %}
         </tbody>
-</table>
+    </table>
 
     <tr>
         <h3>Credit Details</h3>
@@ -291,9 +295,9 @@
         </thead>
     </table>
 
-<br>
+    <br>
-<h3>Payment Details</h3>
+    <h3>Payment Details</h3>
-<table>
+    <table>
         <thead>
             <tr>
                 <th>PMC No</th>
@@ -305,15 +309,15 @@
             </tr>
         </thead>
         <tbody>
-    {% if payments %}
+            {% if invoices %}
-    {% for pay in payments %}
+            {% for pay in invoices %}
             <tr>
-        <td>{{ pay.pmc_no }}</td>
+                <td>{{ pay.PMC_No }}</td>
                 <td>{{ pay.invoice_no }}</td>
                 <td>{{ pay.Payment_Amount }}</td>
                 <td>{{ pay.TDS_Payment_Amount }}</td>
-        <td>{{ pay.Total_amount }}</td>
+                <td>{{ pay.Total_Amount }}</td>
-        <td>{{ pay.utr}}</td>
+                <td>{{ pay.UTR}}</td>
             </tr>
             {% endfor %}
             <tr>
@@ -331,10 +335,10 @@
             {% endif %}
 
         </tbody>
-</table>
+    </table>
 
-<a href="/download_pmc_report/{{ info.PMC_No}}">
+    <a href="/download_pmc_report/{{ contInfo.PMC_No}}">
         <button class="download-btn">Download PMC Report</button>
-</a>
+    </a>
 </body>
 {% endblock %}

templates/report.html

@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -7,9 +8,10 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/report.css') }}">
     <script src="{{ url_for('static', filename='js/searchContractor.js') }}"></script>
 </head>
+
 <body>
 
-<div id="report" class="page">
+    <div id="report" class="page">
         <h2>Search Contractor Report</h2>
         <div>
             <form id="search-form">
@@ -53,6 +55,7 @@
                         <input type="date" id="year_to" name="year_to">
                     </div>
                 </div>
+                <button type="button" onclick="fetchData()">Search</button>
             </form>
 
             <h2>Contractor List</h2>
@@ -102,7 +105,7 @@
                 </tbody>
             </table>
         </div>
-</div>
+    </div>
 
 </body>
 {% endblock %}

templates/show_excel_file.html

@@ -58,8 +58,9 @@
 
     <!-- Hidden fields for other necessary information -->
     <input type="text" name="subcontractor_data" value="{{ subcontractor_data['Contractor_Id'] }}">
-    <input type="text" name="state_data" value="{{ state_data['State_ID'] }}">
+    <input type="text" name="state_data" value="{{ state_data['State_Id'] }}">
-    <input type="text" name="district_data" value="{{ district_data['District_ID'] }}">
+    <!-- <input type="text" name="district_data" value="{{ district_data['District_ID'] }}">      -->
+    <input type="text" name="district_data" value="{{ district_data['District_id'] }}">     
     <input type="text" name="block_data" value="{{ block_data['Block_Id'] }}">
 
     <input type="text" name="file_info" value="{{ file_info }}">

templates/subcontractor_report.html

@@ -1,8 +1,6 @@
-
-
-
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -10,8 +8,9 @@
     <!--        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">-->
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/subcontractor_report.css') }}">
 </head>
+
 <body>
-<div class="container">
+    <div class="container">
         <h2>Contractor Report</h2>
 
         <div class="info">
@@ -20,7 +19,7 @@
                 <div>
                     <label for="subcontractor">Subcontractor Name:</label>
                     <input type="text" id="subcontractor" name="subcontractor" value="{{ contInfo.Contractor_Name }}"
-                       readonly/>
+                        readonly />
                 </div>
                 <div>
                     <label for="Address">Address :</label>
@@ -30,71 +29,45 @@
             <div class="row3">
                 <div>
                     <label for="PAN_No">PAN No :</label>
-                <input type="text" id="PAN_No" name="PAN_No" value="{{ contInfo.PAN_No }}" readonly/>
+                    <input type="text" id="PAN_No" name="PAN_No" value="{{ contInfo.PAN_No }}" readonly />
                 </div>
                 <div>
                     <label for="Mobile_No">Mobile Number :</label>
-                <input type="text" id="Mobile_No" name="Mobile_No" value="{{ contInfo.Mobile_No }}" readonly/>
+                    <input type="text" id="Mobile_No" name="Mobile_No" value="{{ contInfo.Mobile_No }}" readonly />
                 </div>
                 <div>
                     <label for="Email">Email :</label>
-                <input type="text" id="Email" name="Email" value="{{ contInfo.Email }}" readonly/>
+                    <input type="text" id="Email" name="Email" value="{{ contInfo.Email }}" readonly />
                 </div>
             </div>
             <div class="row2">
                 <div>
                     <label for="GST_Registration_Type">GST Registration Type :</label>
                     <input type="text" id="GST_Registration_Type" name="GST_Registration_Type"
-                       value="{{ contInfo.GST_Registration_Type }}" readonly/>
+                        value="{{ contInfo.GST_Registration_Type }}" readonly />
 
                 </div>
                 <div>
                     <label for="GST_No">GST No:</label>
-                <input type="text" id="GST_No" name="GST_No" value="{{ contInfo.GST_No }}" readonly/>
+                    <input type="text" id="GST_No" name="GST_No" value="{{ contInfo.GST_No }}" readonly />
                 </div>
             </div>
             <div class="row3">
                 <div>
                     <label for="State">State :</label>
-                <input type="text" id="State" name="State" value="{{ contInfo.State_Name }}" readonly/>
+                    <input type="text" id="State" name="State" value="{{ contInfo.State_Name }}" readonly />
                 </div>
                 <div>
                     <label for="District">District :</label>
-                <input type="text" id="District" name="District" value="{{ contInfo.District_Name }}" readonly/>
+                    <input type="text" id="District" name="District" value="{{ contInfo.District_Name }}" readonly />
                 </div>
                 <div>
                     <label for="Block">Block :</label>
-                <input type="text" id="Block" name="Block" value="{{ contInfo.Block_Name }}" readonly/>
+                    <input type="text" id="Block" name="Block" value="{{ contInfo.Block_Name }}" readonly />
                 </div>
             </div>
         </div>
 
-    <h3>Total</h3>
-    <table class="total-table">
-        <tr>
-            <th colspan="2">{{current_date}}</th>
-        </tr>
-<!--        <tr>-->
-<!--            <th>Total Hold Amounnt</th>-->
-<!--            <td>0</td>-->
-<!--        </tr>-->
-        <tr>
-            <th>Advance / Suplus</th>
-            <td>{{total["sum_invo_final_amt"]+total["sum_gst_final_amt"]-total["sum_pay_total_amt"]}}</td>
-        </tr>
-        {% if hold_types %}
-        <tr>
-            {% for hold in hold_types %}
-            <th>{{ hold.hold_type }}</th>
-            <td>{{total["sum_invo_hold_amt"]}}</td>
-            {% endfor %}
-        </tr>
-        {% endif %}
-        <tr>
-            <th>Amount With TDS</th>
-            <td>{{total["sum_invo_tds_amt"]}}</td>
-        </tr>
-    </table>
 
         <!--        {% if hold_types %}-->
         <!--        <h3>Hold Types</h3>-->
@@ -141,7 +114,7 @@
                 {% for invoice in invoices %}
                 <tr>
                     <td>{{ invoice.PMC_No }}</td>
-            <td>{{ invoice.Village_Name.capitalize() }}</td>
+                    <td>{{ invoice.Village_Name}}</td>
                     <td>{{ invoice.Work_Type }}</td>
                     <td>{{ invoice.Invoice_Details }}</td>
                     <td>{{ invoice.Invoice_Date }}</td>
@@ -293,6 +266,8 @@
                     <th>Invoice No</th>
                     <th>Basic Amount</th>
                     <th>Final Amount</th>
+                    <th>Total Amount</th>
+                    <th>UTR</th>
                 </tr>
 
 
@@ -302,9 +277,11 @@
                 {% for gst in gst_rel %}
                 <tr>
                     <td>{{ gst.pmc_no }}</td>
-            <td>{{ gst.invoice_no }}</td>
+                    <td>{{ gst.Invoice_No }}</td>
-            <td>{{ gst.basic_amount }}</td>
+                    <td>{{ gst.Basic_Amount }}</td>
-            <td>{{ gst.final_amount }}</td>
+                    <td>{{ gst.Final_Amount }}</td>
+                    <td>{{ gst.Total_Amount }}</td>
+                    <td>{{ gst.UTR }}</td>
                 </tr>
                 {% endfor %}
                 <tr>
@@ -336,15 +313,15 @@
                 </tr>
             </thead>
             <tbody>
-        {% if payments %}
+                {% if invoices %}
-        {% for pay in payments %}
+                {% for pay in invoices %}
                 <tr>
-            <td>{{ pay.pmc_no }}</td>
+                    <td>{{ pay.PMC_No }}</td>
                     <td>{{ pay.invoice_no }}</td>
                     <td>{{ pay.Payment_Amount }}</td>
                     <td>{{ pay.TDS_Payment_Amount }}</td>
-            <td>{{ pay.Total_amount }}</td>
+                    <td>{{ pay.Total_Amount }}</td>
-            <td>{{ pay.utr}}</td>
+                    <td>{{ pay.UTR}}</td>
                 </tr>
                 {% endfor %}
 
@@ -366,7 +343,8 @@
         </table>
 
 
-    <a href="{{ url_for('report.download_report', contractor_id=contractor_id) }}" class="download-btn">Download Report</a>
+        <a href="{{ url_for('report.download_report', contractor_id=contractor_id) }}" class="download-btn">Download
-</div>
+            Report</a>
+    </div>
 </body>
 {% endblock %}