Merge pull request 'Village Add, Edit and Delete Messages done' (#12) from swapnil-dev into main

Reviewed-on: #12

controllers/gst_release_controller.py

@@ -1,8 +1,8 @@
-# routes/gst_release_routes.py
-from flask import Blueprint, render_template, request, redirect, url_for, flash
+from flask import Blueprint, render_template, request, redirect, url_for
 from flask_login import login_required
 from model.gst_release import GSTRelease
 from model.Log import LogHelper
+from flask import flash, current_app
 
 gst_release_bp = Blueprint('gst_release_bp', __name__)
 gst_service = GSTRelease()
@@ -13,7 +13,7 @@ gst_service = GSTRelease()
 def add_gst_release():
     if request.method == 'POST':
         gst_service.AddGSTRelease(request)
-        LogHelper.log_action("Add GST Release", "User added GST release")
+        LogHelper.log_action("Add GST Release", f"User added GST release")
         flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
         return redirect(url_for('gst_release_bp.add_gst_release'))
 
@@ -30,7 +30,7 @@ def edit_gst_release(gst_release_id):
 
     if request.method == 'POST':
         gst_service.EditGSTRelease(request, gst_release_id)
-        LogHelper.log_action("Edit GST Release", "User edited GST release")
+        LogHelper.log_action("Edit GST Release", f"User edited GST release")
         flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
         return redirect(url_for('gst_release_bp.add_gst_release'))
 
@@ -40,7 +40,7 @@ def edit_gst_release(gst_release_id):
 @gst_release_bp.route('/delete_gst_release/<int:gst_release_id>', methods=['GET', 'POST'])
 @login_required
 def delete_gst_release(gst_release_id):
-    gst_service.DeleteGSTRelease(gst_release_id)
-    LogHelper.log_action("Delete GST Release", "User deleted GST release")
+    gst_service.DeleteGSTRelease(gst_release_id)  # remove request
+    LogHelper.log_action("Delete GST Release", f"User deleted GST release")
     flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
     return redirect(url_for('gst_release_bp.add_gst_release'))

controllers/village_controller.py

@@ -83,17 +83,29 @@ def check_village():
     return village.CheckVillage(request=request)
 
 
-# ------------------------- Delete Village -------------------------
 @village_bp.route('/delete_village/<int:village_id>')
 @login_required
 def delete_village(village_id):
-
     village = Village()
     village.DeleteVillage(request=request, village_id=village_id)
 
-    flash(village.resultMessage, "success" if village.isSuccess else "error")
-    return redirect(url_for('village.add_village'))
+    # ✅ Convert resultMessage to string if it's a Response or tuple
+    raw_msg = village.resultMessage
 
+    if isinstance(raw_msg, tuple):
+        # e.g., (<Response ...>, 200)
+        msg = "Village deleted successfully!"
+    elif hasattr(raw_msg, 'get_data'):
+        # Flask Response object
+        msg = raw_msg.get_data(as_text=True)  # get raw text
+    else:
+        # fallback
+        msg = str(raw_msg) if raw_msg else "Village deleted successfully!"
+
+    return jsonify({
+        "status": "success" if village.isSuccess else "error",
+        "message": msg
+    })
 
 # ------------------------- Edit Village -------------------------
 @village_bp.route('/edit_village/<int:village_id>', methods=['GET', 'POST'])

model/ItemCRUD.py

@@ -6,6 +6,7 @@ import config
 import re
 import mysql.connector
 
+
 # ----------------------------------------------------------
 # Mapping Class
 # ----------------------------------------------------------
@@ -22,11 +23,10 @@ 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,47 +93,13 @@ class ItemCRUD:
 
         try:
             # ======================================================
-            # GSTRelease MULTI-FIELD
+            # SUBCONTRACTOR (MULTI-FIELD)
             # ======================================================
-            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:
+            if data:
 
+                # Duplicate check
                 cursor.callproc(storedprocfetch, (data['Contractor_Name'],))
+
                 existing_item = None
                 for rs in cursor.stored_results():
                     existing_item = rs.fetchone()
@@ -145,6 +111,7 @@ class ItemCRUD:
                     )
                     return
 
+                # Insert
                 cursor.callproc(storedprocadd, (
                     data['Contractor_Name'],
                     data['Address'],
@@ -156,16 +123,17 @@ 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 SINGLE-FIELD (Village / Block / State)
+            # NORMAL (Village / Block / State)
             # ======================================================
             if not re.match(RegEx.patternAlphabetOnly, childname):
                 self.isSuccess = False
@@ -174,6 +142,7 @@ class ItemCRUD:
                 )
                 return
 
+            # Duplicate check
             if parentid is None:
                 cursor.callproc(storedprocfetch, (childname,))
             else:
@@ -190,14 +159,17 @@ 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
             )
 
@@ -227,33 +199,9 @@ class ItemCRUD:
 
         try:
             # ======================================================
-            # GSTRelease MULTI-FIELD
+            # SUBCONTRACTOR (MULTI-FIELD)
             # ======================================================
-            if self.itemCRUDType.name == "GSTRelease" and data:
-
-                cursor.callproc(storedprocupdate, (
-                    childid,
-                    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.update_success(self.itemCRUDMapping.name), 200
-                )
-                return
-
-            # ======================================================
-            # SUBCONTRACTOR MULTI-FIELD
-            # ======================================================
-            if self.itemCRUDType.name == "Subcontractor" and data:
-
+            if data:
                 cursor.callproc(storedprocupdate, (
                     childid,
                     data['Contractor_Name'],
@@ -266,7 +214,9 @@ 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
@@ -274,7 +224,7 @@ class ItemCRUD:
                 return
 
             # ======================================================
-            # NORMAL SINGLE-FIELD
+            # NORMAL
             # ======================================================
             if not re.match(RegEx.patternAlphabetOnly, childname):
                 self.isSuccess = False
@@ -287,6 +237,7 @@ class ItemCRUD:
                 cursor.callproc(storedprocupdate, (childid, parentid, childname))
 
             connection.commit()
+
             self.isSuccess = True
             self.resultMessage = ResponseHandler.update_success(self.itemCRUDMapping.name)['message']
 
@@ -308,15 +259,20 @@ 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
@@ -324,6 +280,7 @@ class ItemCRUD:
                 ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
             )
             return []
+
         finally:
             cursor.close()
             connection.close()
@@ -341,10 +298,13 @@ 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()
@@ -393,6 +353,7 @@ class ItemCRUD:
             return HtmlHelper.json_response(
                 ResponseHandler.fetch_failure(self.itemCRUDMapping.name), 500
             )
+
         finally:
             cursor.close()
             connection.close()

model/Utilities.py

@@ -8,7 +8,7 @@ class ItemCRUDType(Enum):
     State = 4
     HoldType = 5
     Subcontractor = 6
-    GSTRelease = 7
+    
 
 class RegEx:
     patternAlphabetOnly = "^[A-Za-z ]+$"

model/gst_release.py

@@ -1,8 +1,109 @@
-# model/gst_release.py
+# from flask import request
+# from model.ItemCRUD import ItemCRUD
+# from model.Utilities import ItemCRUDType
+
+# class GSTRelease:
+#     """CRUD operations for GST Release using ItemCRUD"""
+
+#     def __init__(self):
+#         self.isSuccess = False
+#         self.resultMessage = ""
+
+#     # ------------------- Add GST Release -------------------
+#     def AddGSTRelease(self, request):
+#         pmc_no = request.form.get('PMC_No', '').strip()
+#         invoice_no = request.form.get('invoice_No', '').strip()
+
+#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+#         gst.AddItem(
+#             request=request,
+#             parentid=None,
+#             childname=f"{pmc_no}-{invoice_no}",
+#             storedprocfetch="CheckGSTReleaseExists",
+#             storedprocadd="AddGSTReleaseFromExcel"  # your stored procedure handles extra fields
+#         )
+
+#         self.isSuccess = gst.isSuccess
+#         self.resultMessage = str(gst.resultMessage)
+
+#     # ------------------- Get All GST Releases -------------------
+#     def GetAllGSTReleases(self):
+#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+#         # Pass request=None for fetch
+#         rows = gst.GetAllData(request=None, storedproc="GetAllGSTReleases")
+
+#         self.isSuccess = gst.isSuccess
+#         self.resultMessage = str(gst.resultMessage)
+
+#         data = []
+#         for row in rows:
+#             data.append({
+#                 "gst_release_id": row[0],
+#                 "pmc_no": row[1],
+#                 "invoice_no": row[2],
+#                 "basic_amount": row[3],
+#                 "final_amount": row[4],
+#                 "total_amount": row[5],
+#                 "utr": row[6],
+#                 "contractor_id": row[7]
+#             })
+#         return data
+
+#     # ------------------- Get GST Release By ID -------------------
+#     def GetGSTReleaseByID(self, gst_release_id):
+#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+#         row = gst.GetDataByID(gst_release_id, request=None, storedproc="GetGSTReleaseById")
+
+#         self.isSuccess = gst.isSuccess
+#         self.resultMessage = str(gst.resultMessage)
+
+#         if row:
+#             return {
+#                 "gst_release_id": row[0],
+#                 "pmc_no": row[1],
+#                 "invoice_no": row[2],
+#                 "basic_amount": row[3],
+#                 "final_amount": row[4],
+#                 "total_amount": row[5],
+#                 "utr": row[6],
+#                 "contractor_id": row[7]
+#             }
+#         return None
+
+#     # ------------------- Edit GST Release -------------------
+#     def EditGSTRelease(self, request, gst_release_id):
+#         pmc_no = request.form.get('PMC_No', '').strip()
+#         invoice_no = request.form.get('invoice_No', '').strip()
+
+#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+#         gst.EditItem(
+#             request=request,
+#             childid=gst_release_id,
+#             parentid=None,
+#             childname=f"{pmc_no}-{invoice_no}",
+#             storedprocupdate="UpdateGSTRelease"  # stored procedure handles extra fields
+#         )
+
+#         self.isSuccess = gst.isSuccess
+#         self.resultMessage = str(gst.resultMessage)
+
+#     # ------------------- Delete GST Release -------------------
+#     def DeleteGSTRelease(self, gst_release_id):
+#         gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+#         gst.DeleteItem(
+#             itemID=gst_release_id,
+#             request=None,
+#             storedprocDelete="DeleteGSTReleaseById"
+#         )
+
+#         self.isSuccess = gst.isSuccess
+#         self.resultMessage = str(gst.resultMessage)
+
 from flask import request, jsonify
 from model.ItemCRUD import ItemCRUD
 from model.Utilities import ItemCRUDType
 
+
 class GSTRelease:
 
     def __init__(self):
@@ -24,7 +125,6 @@ class GSTRelease:
                 "Contractor_ID": int(request.form.get("Contractor_ID", 0) or 0)
             }
 
-            # Add GST Release
             gst.AddItem(
                 request=request,
                 data=data,
@@ -32,12 +132,6 @@ class GSTRelease:
                 storedprocadd="AddGSTReleaseFromExcel"
             )
 
-            # Check if addition was successful
-            if gst.isSuccess:
-                print(f"GST Release Added: {data}")
-            else:
-                print(f"Failed to add GST Release: {gst.resultMessage}")
-
             self.isSuccess = gst.isSuccess
             self.resultMessage = str(gst.resultMessage)
 
@@ -104,6 +198,7 @@ class GSTRelease:
     def GetAllGSTReleases(self):
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+
             rows = gst.GetAllData(None, "GetAllGSTReleases")
 
             data = []
@@ -129,6 +224,7 @@ class GSTRelease:
     def GetGSTReleaseByID(self, gst_release_id):
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
+
             row = gst.GetDataByID(gst_release_id, "GetGSTReleaseById")
 
             if row:

static/js/village.js

@@ -1,41 +1,37 @@
-
-
 window.onload = function () {
+    if (document.getElementById('Village_Name')) {
         document.getElementById('Village_Name').focus();
+    }
 };
  
 $(document).ready(function () {
 
-    // 🔥 RESTORE VIEW MODE AFTER RELOAD
-    var viewMode = localStorage.getItem("viewMode");
+    // ✅ RUN ONLY IF THIS PAGE HAS FORM/TABLE
+    if ($('#addForm').length && $('#addTable').length) {
 
-    if (viewMode === "table") {
-        $('#addForm').hide();
-        $('#addTable').show();
-    } else {
+        // ✅ DEFAULT VIEW → SHOW FORM
         $('#addForm').show();
         $('#addTable').hide();
-    }
 
 
-    // 🔥 BUTTON TOGGLE LOGIC
-
+        // 🔥 BUTTON TOGGLE
         $('#addButton').click(function () {
             $('#addForm').show();
             $('#addTable').hide();
-
-        localStorage.setItem("viewMode", "form");
         });
 
         $('#displayButton').click(function () {
             $('#addForm').hide();
             $('#addTable').show();
-
-        localStorage.setItem("viewMode", "table");
         });
+    }
 
 
+    // ===============================
     // STATE → DISTRICT
+    // ===============================
+    if ($('#state_Id').length) {
+
         $('#state_Id').change(function () {
 
             var stateId = $(this).val();
@@ -54,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();
@@ -91,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();
@@ -127,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();
@@ -142,7 +139,6 @@ $(document).ready(function () {
             if (blockId && villageName) {
 
                 $.ajax({
-
                     url: '/check_village',
                     type: 'POST',
 
@@ -168,9 +164,7 @@ $(document).ready(function () {
                                 .css('color', 'green');
 
                             $('#submitVillage').prop('disabled', false);
-
                         }
-
                     },
 
                     error: function () {
@@ -180,85 +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.');
-
                     }
-
                 },
 
                 error: function () {
-
                     alert('An error occurred. Please try again.');
-
                 }
-
             });
 
         });
+    }
 
 });
 
 
-// 🔥 DELETE FUNCTION (UPDATED)
-function deleteVillage(villageId) {
 
-    if (!confirm("Are you sure you want to delete this village?")) {
-        return;
-    }
 
-    // ✅ save that user is on table
-    localStorage.setItem("viewMode", "table");
+// ===============================
+// 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',
-
-        success: function () {
-
-            setTimeout(function () {
-
-                alert("Village deleted successfully!");
-
-                // reload but stay on table
-                location.reload();
-
-            }, 1000);
-
+        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/add_gst_release.html

@@ -68,11 +68,10 @@
     {% 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="Search..." onkeyup="searchTable()">
+        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
     </div>
     <table id="sortableTable" border="1">
         <thead>
@@ -91,22 +90,24 @@
         <tbody>
         {% for gst_rel in gst_releases %}
         <tr>
-                <td>{{ gst_rel.gst_release_id }}</td>
-                <td>{{ gst_rel.pmc_no }}</td>
-                <td>{{ gst_rel.invoice_no }}</td>
-                <td>{{ gst_rel.basic_amount }}</td>
-                <td>{{ gst_rel.final_amount }}</td>
-                <td>{{ gst_rel.total_amount }}</td>
-                <td>{{ gst_rel.utr }}</td>
+            <td>{{ gst_rel[0] }}</td>
+            <td>{{ gst_rel[1] }}</td>
+            <td>{{ gst_rel[2] }}</td>
+            <td>{{ gst_rel[3] }}</td>
+            <td>{{ gst_rel[4] }}</td>
+            <td>{{ gst_rel[5] }}</td>
+            <td>{{ gst_rel[6] }}</td>
             <td>
-                    <a href="{{ url_for('gst_release_bp.edit_gst_release', gst_release_id=gst_rel.gst_release_id) }}">
-                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon">
+                <a href="/edit_gst_release/{{ gst_rel[0] }}">
+                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+                         class="icon">
                 </a>
             </td>
             <td>
-                    <a href="{{ url_for('gst_release_bp.delete_gst_release', gst_release_id=gst_rel.gst_release_id) }}" 
+                <a href="/delete_gst_release/{{ gst_rel[0] }}"
                    onclick="return confirm('Are you sure you want to delete this GST Release?')">
-                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon">
+                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                         class="icon">
                 </a>
             </td>
         </tr>

templates/add_village.html

@@ -1,22 +1,24 @@
-{% extends 'base.html' %}
-{% block content %}
+{% extends 'base.html' %} {% block content %}
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta charset="UTF-8" />
+  <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 -->
-<div class="button-container">
+  <!-- Button Container to Center Buttons -->
+  <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>
-            <th class="sortable-header">Block Name
+          </span>
+        </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]) }}">
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
-                         class="icon">
+          <a
+            href="{{ url_for('village.edit_village', village_id=village[0]) }}"
+          >
+            <img
+              src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}"
+              alt="Edit"
+              class="icon"
+            />
           </a>
         </td>
         <td>
-                <a href="#"
-   onclick="deleteVillage({{ village[0] }}); return false;">
+       <a href="javascript:void(0);" 
+   onclick="deleteVillage({{ village[0] }}, this)">
     <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" 
-         alt="Delete" class="icon">
+         class="icon">
 </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_village.html

@@ -28,25 +28,17 @@
 
             <button type="submit">Update Village</button>
         </form>
-    </div>
-
-    <!-- Flash Message (Hidden, used for JS popup) -->
+  <!-- Flash Messages (hidden, used for JS popup) -->
+<div id="flash-messages-container" style="display:none;">
     {% 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 %}