Merge pull request 'GST Release Display Chages' (#16) from laxmi-dev into main

Reviewed-on: #16
Reviewed-by: Pankaj J Patil <pankajjpatil2001@gmail.com>

controllers/hold_types_controller.py

@@ -10,21 +10,21 @@ hold_bp = Blueprint("hold_types", __name__)
 @hold_bp.route('/add_hold_type', methods=['GET','POST'])
 @login_required
 def add_hold_type():
-
     hold = HoldTypes()
 
     if request.method == 'POST':
-        hold.AddHoldType(request)   # ✅
+        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

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")
+    # ✅ Convert resultMessage to string if it's a Response or tuple
-    return redirect(url_for('village.add_village'))
+    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

@@ -167,7 +167,7 @@ class ItemCRUD:
             # ======================================================
             # 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
@@ -276,7 +276,7 @@ class ItemCRUD:
             # ======================================================
             # 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
@@ -364,7 +364,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
             )

model/Utilities.py

@@ -12,6 +12,7 @@ class ItemCRUDType(Enum):
 
 class RegEx:
     patternAlphabetOnly = "^[A-Za-z ]+$"
+    allPattern = "^(?!\s*$).+"
 
 
 class ResponseHandler:

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/village.js

@@ -1,264 +1,250 @@
-
-
 window.onload = function () {
-    document.getElementById('Village_Name').focus();
+    if (document.getElementById('Village_Name')) {
+        document.getElementById('Village_Name').focus();
+    }
 };
  
 $(document).ready(function () {
 
-    // 🔥 RESTORE VIEW MODE AFTER RELOAD
+    // ✅ RUN ONLY IF THIS PAGE HAS FORM/TABLE
-    var viewMode = localStorage.getItem("viewMode");
+    if ($('#addForm').length && $('#addTable').length) {
 
-    if (viewMode === "table") {
+        // ✅ DEFAULT VIEW → SHOW FORM
-        $('#addForm').hide();
-        $('#addTable').show();
-    } else {
         $('#addForm').show();
         $('#addTable').hide();
+
+
+        // 🔥 BUTTON TOGGLE
+        $('#addButton').click(function () {
+            $('#addForm').show();
+            $('#addTable').hide();
+        });
+
+        $('#displayButton').click(function () {
+            $('#addForm').hide();
+            $('#addTable').show();
+        });
     }
 
 
-    // 🔥 BUTTON TOGGLE LOGIC
+    // ===============================
-
-    $('#addButton').click(function () {
-        $('#addForm').show();
-        $('#addTable').hide();
-
-        localStorage.setItem("viewMode", "form");
-    });
-
-    $('#displayButton').click(function () {
-        $('#addForm').hide();
-        $('#addTable').show();
-
-        localStorage.setItem("viewMode", "table");
-    });
-
-
     // STATE → DISTRICT
-    $('#state_Id').change(function () {
+    // ===============================
+    if ($('#state_Id').length) {
 
-        var stateId = $(this).val();
+        $('#state_Id').change(function () {
 
-        if (stateId) {
+            var stateId = $(this).val();
 
-            $.ajax({
+            if (stateId) {
-                url: '/get_districts/' + stateId,
-                type: 'GET',
 
-                success: function (data) {
+                $.ajax({
+                    url: '/get_districts/' + stateId,
+                    type: 'GET',
 
-                    var districtDropdown = $('#district_Id');
+                    success: function (data) {
 
-                    districtDropdown.empty();
+                        var districtDropdown = $('#district_Id');
-                    districtDropdown.append('<option value="" disabled selected>Select District</option>');
 
-                    data.forEach(function (district) {
+                        districtDropdown.empty();
+                        districtDropdown.append('<option value="" disabled selected>Select District</option>');
 
-                        districtDropdown.append(
+                        data.forEach(function (district) {
-                            '<option value="' + district.id + '">' + district.name + '</option>'
+                            districtDropdown.append(
-                        );
+                                '<option value="' + district.id + '">' + district.name + '</option>'
+                            );
+                        });
 
-                    });
+                        districtDropdown.prop('disabled', false);
-
+                    }
-                    districtDropdown.prop('disabled', false);
+                });
-
+            }
-                }
+        });
-
+    }
-            });
-
-        }
-
-    });
 
 
+    // ===============================
     // DISTRICT → BLOCK
-    $('#district_Id').change(function () {
+    // ===============================
+    if ($('#district_Id').length) {
 
-        var districtId = $(this).val();
+        $('#district_Id').change(function () {
 
-        if (districtId) {
+            var districtId = $(this).val();
 
-            $.ajax({
+            if (districtId) {
-                url: '/get_blocks/' + districtId,
-                type: 'GET',
 
-                success: function (data) {
+                $.ajax({
+                    url: '/get_blocks/' + districtId,
+                    type: 'GET',
 
-                    var blockDropdown = $('#block_Id');
+                    success: function (data) {
 
-                    blockDropdown.empty();
+                        var blockDropdown = $('#block_Id');
-                    blockDropdown.append('<option value="" disabled selected>Select Block</option>');
 
-                    data.forEach(function (block) {
+                        blockDropdown.empty();
+                        blockDropdown.append('<option value="" disabled selected>Select Block</option>');
 
-                        blockDropdown.append(
+                        data.forEach(function (block) {
-                            '<option value="' + block.id + '">' + block.name + '</option>'
+                            blockDropdown.append(
-                        );
+                                '<option value="' + block.id + '">' + block.name + '</option>'
+                            );
+                        });
 
-                    });
+                        blockDropdown.prop('disabled', false);
-
+                    }
-                    blockDropdown.prop('disabled', false);
+                });
-
+            }
-                }
+        });
-
+    }
-            });
-
-        }
-
-    });
 
 
+    // ===============================
     // VILLAGE NAME VALIDATION
-    $('#Village_Name').on('input', function () {
+    // ===============================
+    if ($('#Village_Name').length) {
 
-        var villageName = $(this).val();
+        $('#Village_Name').on('input', function () {
-        var validPattern = /^[A-Za-z ]*$/;
 
-        if (!validPattern.test(villageName)) {
+            var villageName = $(this).val();
+            var validPattern = /^[A-Za-z ]*$/;
 
-            $('#villageMessage')
+            if (!validPattern.test(villageName)) {
-                .text('Only letters and spaces are allowed!')
-                .css('color', 'red');
 
-            $('#submitVillage').prop('disabled', true);
+                $('#villageMessage')
+                    .text('Only letters and spaces are allowed!')
+                    .css('color', 'red');
 
-        } else {
+                $('#submitVillage').prop('disabled', true);
 
-            $('#villageMessage').text('');
+            } else {
-            $('#submitVillage').prop('disabled', false);
 
-        }
+                $('#villageMessage').text('');
-
+                $('#submitVillage').prop('disabled', false);
-    });
+            }
+        });
+    }
 
 
+    // ===============================
     // CHECK DUPLICATE VILLAGE
-    $('#Village_Name, #block_Id').on('change keyup', function () {
+    // ===============================
+    if ($('#Village_Name').length && $('#block_Id').length) {
 
-        var blockId = $('#block_Id').val();
+        $('#Village_Name, #block_Id').on('change keyup', function () {
-        var villageName = $('#Village_Name').val().trim();
 
-        if (blockId && villageName) {
+            var blockId = $('#block_Id').val();
+            var villageName = $('#Village_Name').val().trim();
 
-            $.ajax({
+            if (blockId && villageName) {
 
-                url: '/check_village',
+                $.ajax({
-                type: 'POST',
+                    url: '/check_village',
+                    type: 'POST',
 
-                data: {
+                    data: {
-                    block_Id: blockId,
+                        block_Id: blockId,
-                    Village_Name: villageName
+                        Village_Name: villageName
-                },
+                    },
 
-                success: function (response) {
+                    success: function (response) {
 
-                    if (response.status === 'exists') {
+                        if (response.status === 'exists') {
+
+                            $('#villageMessage')
+                                .text(response.message)
+                                .css('color', 'red');
+
+                            $('#submitVillage').prop('disabled', true);
+
+                        } else {
+
+                            $('#villageMessage')
+                                .text(response.message)
+                                .css('color', 'green');
+
+                            $('#submitVillage').prop('disabled', false);
+                        }
+                    },
+
+                    error: function () {
 
                         $('#villageMessage')
-                            .text(response.message)
+                            .text('Error checking village name')
                             .css('color', 'red');
 
                         $('#submitVillage').prop('disabled', true);
+                    }
+                });
+            }
+        });
+    }
+
+
+    // ===============================
+    // ADD VILLAGE (SAFE SCOPE FIX)
+    // ===============================
+    if ($('#villageForm').length) {
+
+        $('#villageForm').submit(function (event) {
+
+            event.preventDefault();
+
+            $.ajax({
+                url: '/add_village',
+                type: 'POST',
+                data: $(this).serialize(),
+
+                success: function (response) {
+
+                    if (response && response.status === 'success') {
+
+                        alert(response.message || 'Village added successfully!');
+
+                        // ✅ clear form
+                        $('#villageForm')[0].reset();
+
+                        // ✅ switch to table
+                        $('#addForm').hide();
+                        $('#addTable').show();
+
+                        // optional refresh
+                        location.reload();
 
                     } else {
-
+                        alert(response.message || 'Error adding village. Please try again.');
-                        $('#villageMessage')
-                            .text(response.message)
-                            .css('color', 'green');
-
-                        $('#submitVillage').prop('disabled', false);
-
                     }
-
                 },
 
                 error: function () {
-
+                    alert('An error occurred. Please try again.');
-                    $('#villageMessage')
-                        .text('Error checking village name')
-                        .css('color', 'red');
-
-                    $('#submitVillage').prop('disabled', true);
-
                 }
-
             });
 
-        }
-
-    });
-
-
-    // ADD VILLAGE
-    $('#villageForm').submit(function (event) {
-
-        event.preventDefault();
-
-        $.ajax({
-
-            url: '/add_village',
-            type: 'POST',
-            data: $(this).serialize(),
-
-            success: function (response) {
-
-                if (response.status === 'success') {
-
-                    alert('Village added successfully!');
-                    location.reload();
-
-                } else {
-
-                    alert(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',
-
+        dataType: 'json',
-        success: function () {
+        success: function (response) {
-
+            alert(response.message); // ✅ now shows "Village deleted successfully!"
-            setTimeout(function () {
+            if (element) $(element).closest("tr").remove();
-
-                alert("Village deleted successfully!");
-
-                // reload but stay on table
-                location.reload();
-
-            }, 1000);
-
         },
-
         error: function () {
             alert("Error deleting village. Please try again.");
         }
-
     });
 }

templates/add_hold_type.html

@@ -1,59 +1,73 @@
 {% extends 'base.html' %}
 {% block content %}
+
 <head>
     <title>Manage Hold Types</title>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
     <!-- <script src="{{ url_for('static', filename='js/hold_types.js') }}"></script> -->
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
-       <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
+
 <body>
 
-<div class="button-container">
+    <div class="button-container">
-    <button id="addButton" class="action-button">Add</button>
+        <button id="addButton" class="action-button">Add</button>
-    <button id="displayButton" class="action-button">Display</button>
+        <button id="displayButton" class="action-button">Display</button>
-</div>
+    </div>
 
-<div id="addForm">
+    <div id="addForm">
-    <h2>Add Hold Types</h2>
+        <h2>Add Hold Types</h2>
-    <form id="holdTypeForm" method="POST" action="{{ url_for('hold_types.add_hold_type') }}">
+        <form id="holdTypeForm" method="POST" action="{{ url_for('hold_types.add_hold_type') }}">
-        <label>Enter Hold Amount Type:</label>
+            <label>Enter Hold Amount Type:</label>
-        <input type="text" id="hold_type" name="hold_type" placeholder="Enter Type" required>
+            <input type="text" id="hold_type" name="hold_type" placeholder="Enter Type" required>
-        <span id="holdTypeMessage"></span>
+            <span id="holdTypeMessage"></span>
-        <button type="submit" value="Add Hold Type" id="successPopup">Add Hold Type</button>
+            <button type="submit" value="Add Hold Type" id="successPopup">Add Hold Type</button>
-    </form>
+        </form>
-</div>
+    </div>
 
-<div id="addTable" style="display: none;">
+    <div id="addTable" style="display: none;">
-  <div class="search-container">
+        <div class="search-container">
-        <h2>Hold Type List</h2>
+            <h2>Hold Type List</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+            <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
-            </div>
+        </div>
-    <table id="sortableTable" border="1">
+        <table id="sortableTable" border="1">
-        <tr>
+            <tr>
-            <th>ID</th>
+                <th>ID</th>
-            <th class="sortable-header">
+                <th class="sortable-header">
-                Hold Type
+                    Hold Type
-                <span class="sort-buttons">
+                    <span class="sort-buttons">
-                    <span class="sort-asc">⬆️</span>
+                        <span class="sort-asc">⬆️</span>
-                    <span class="sort-desc">⬇️</span>
+                        <span class="sort-desc">⬇️</span>
-                </span>
+                    </span>
-            </th>
+                </th>
-            <th>Update</th>
+                <th>Update</th>
-            <th>Delete</th>
+                <th>Delete</th>
-        </tr>
+            </tr>
-        {% for htd in Hold_Types_data %}
+            {% for htd in Hold_Types_data %}
-        <tr>
+            <tr>
-            <td>{{ htd['hold_type_id'] }}</td>
+                <td>{{ htd['hold_type_id'] }}</td>
-            <td>{{ htd['hold_type'] }}</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']) }}">
-        </tr>
+                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
-        {% endfor %}
+                            class="icon">
-    </table>
+                    </a>
+                </td>
 
-    <a href="/">Back to Dashboard</a>
+                <td style="text-align:center;">
-</div>
+                    <a href="{{ url_for('hold_types.delete_hold_type', id=htd['hold_type_id']) }}"
+                        onclick="return confirm('Are you sure you want to delete this hold type?');">
+
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                            class="icon">
+                    </a>
+                </td>
+            </tr>
+            {% endfor %}
+        </table>
+
+        <a href="/">Back to Dashboard</a>
+    </div>
 </body>
 {% endblock %}
-

templates/add_village.html

@@ -1,99 +1,129 @@
-{% 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>
+  <title>Village Management</title>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
+  <link
-    <script src="{{ url_for('static', filename='js/village.js') }}"></script>
+    rel="stylesheet"
-    <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
+    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">
+      <div class="form-block">
-            <h2>Add a New Village</h2>
+        <h2>Add a New Village</h2>
-            <form id="villageForm" method="POST">
+        <form id="villageForm" method="POST">
-                <label for="state_Id">State:</label>
+          <label for="state_Id">State:</label>
-                <select id="state_Id" name="state_Id" required>
+          <select id="state_Id" name="state_Id" required>
-                    <option value="" disabled selected>Select State</option>
+            <option value="" disabled selected>Select State</option>
-                    {% for state in states %}
+            {% for state in states %}
-                    <option value="{{ state[0] }}">{{ state[1] }}</option>
+            <option value="{{ state[0] }}">{{ state[1] }}</option>
-                    {% endfor %}
+            {% endfor %}
-                </select>
+          </select>
 
-                <label for="district_Id">District:</label>
+          <label for="district_Id">District:</label>
-                <select id="district_Id" name="district_Id" required disabled>
+          <select id="district_Id" name="district_Id" required disabled>
-                    <option value="" disabled selected>Select District</option>
+            <option value="" disabled selected>Select District</option>
-                </select>
+          </select>
 
-                <label for="block_Id">Block:</label>
+          <label for="block_Id">Block:</label>
-                <select id="block_Id" name="block_Id" required disabled>
+          <select id="block_Id" name="block_Id" required disabled>
-                    <option value="" disabled selected>Select Block</option>
+            <option value="" disabled selected>Select Block</option>
-                </select>
+          </select>
 
-                <label for="Village_Name">Village Name:</label>
+          <label for="Village_Name">Village Name:</label>
-                <input type="text" id="Village_Name" name="Village_Name" placeholder="Enter Village Name" required>
+          <input
-                <span id="villageMessage"></span>
+            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>
+          <button type="submit" id="submitVillage" disabled>Add Village</button>
-            </form>
+        </form>
-        </div>
+      </div>
     </div>
-</div>
+  </div>
 
-<div id="addTable" style="display: none;">
+  <div id="addTable" style="display: none">
     <div class="search-container">
-        <h2>Display Villages</h2>
+      <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">
-        <tr>
+      <tr>
-            <th>Village Sr No</th>
+        <th>Village Sr No</th>
-            <th class="sortable-header">
+        <th class="sortable-header">
-                Village Name
+          Village Name
-                <span class="sort-buttons">
+          <span class="sort-buttons">
-                        <span class="sort-asc">⬆️</span>
+            <span class="sort-asc">⬆️</span>
-                        <span class="sort-desc">⬇️</span>
+            <span class="sort-desc">⬇️</span>
-                    </span></th>
+          </span>
-            <th class="sortable-header">Block Name
+        </th>
-                <span class="sort-buttons">
+        <th class="sortable-header">
-                        <span class="sort-asc">⬆️</span>
+          Block Name
-                        <span class="sort-desc">⬇️</span>
+          <span class="sort-buttons">
-                    </span></th>
+            <span class="sort-asc">⬆️</span>
-            <th>Update</th>
+            <span class="sort-desc">⬇️</span>
-            <th>Delete</th>
+          </span>
-        </tr>
+        </th>
-        {% for village in villages %}
+        <th>Update</th>
-        <tr>
+        <th>Delete</th>
-            <td>{{ village[0] }}</td>
+      </tr>
-            <td>{{ village[1] }}</td>
+      {% for village in villages %}
-            <td>{{ village[2] }}</td>
+      <tr>
-            <td>
+        <td>{{ village[0] }}</td>
-                <a href="{{ url_for('village.edit_village', village_id=village[0]) }}">
+        <td>{{ village[1] }}</td>
-                    <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
+        <td>{{ village[2] }}</td>
-                         class="icon">
+        <td>
-                </a>
+          <a
-            </td>
+            href="{{ url_for('village.edit_village', village_id=village[0]) }}"
-            <td>
+          >
-                <a href="#"
+            <img
-   onclick="deleteVillage({{ village[0] }}); return false;">
+              src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}"
+              alt="Edit"
+              class="icon"
+            />
+          </a>
+        </td>
+        <td>
+       <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>
+        </td>
-        </tr>
+      </tr>
-        {% endfor %}
+      {% 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_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,8 +2,8 @@
 {% 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') }}">
@@ -12,158 +12,174 @@
 
 <body>
 
-<div id="editForm">
+    <div id="editForm">
-    <h2>Edit Invoice</h2>
+        <h2>Edit Invoice</h2>
 
-    <!-- Success Alert Box -->
+        <!-- Success Alert Box -->
-    <div id="invoiceSuccessAlert" class="success-alert" style="display:none;">
+        <div id="invoiceSuccessAlert" class="success-alert" style="display:none;">
-        Invoice successfully updated!
+            Invoice successfully updated!
+        </div>
+
+        <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}"
+            method="POST">
+
+            <!-- Subcontractor Field -->
+            <div class="row1">
+                <div>
+                    <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 }}">
+                    <datalist id="subcontractor_list"></datalist>
+                </div>
+            </div>
+
+            <!-- Village and PMC No Fields -->
+            <div class="row2">
+                <div>
+                    <label for="village">Village Name:</label>
+                    <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 />
+                </div>
+            </div>
+
+            <!-- Work Type and Invoice Details -->
+            <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 />
+                </div>
+                <div>
+                    <label for="invoice_details">Invoice Details:</label>
+                    <textarea id="invoice_details" name="invoice_details"
+                        required>{{ invoice.Invoice_Details }}</textarea>
+                </div>
+            </div>
+
+            <!-- Invoice No and Invoice Date -->
+            <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 />
+                </div>
+                <div>
+                    <label for="invoice_date">Invoice Date:</label>
+                    <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}"
+                        required />
+                </div>
+            </div>
+
+            <!-- Amount Fields -->
+            <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 />
+                </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 />
+                </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 />
+                </div>
+            </div>
+
+            <!-- GST, TDS, and Other Amounts -->
+            <div class="row3">
+                <div>
+                    <label for="amount">Amount:</label>
+                    <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 />
+                </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 />
+                </div>
+            </div>
+
+            <!-- SD, On Commission, Hydro Testing -->
+            <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 />
+                </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 />
+                </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 />
+                </div>
+            </div>
+
+            <!-- Hold Amount Section -->
+            <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 />
+                    <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 />
+                    <button type="button" class="remove-hold-amount">Remove</button>
+                </div>
+                {% endif %}
+                {% endfor %}
+            </div>
+
+
+            <div class="hold-row">
+                <button type="button" id="add_hold_amount" class="button">+ Add Hold Amount</button>
+            </div>
+
+            <!-- Final Amounts -->
+            <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 />
+                </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 />
+                </div>
+            </div>
+
+            <!-- Submit Button -->
+            <button type="submit" class="button">Update</button>
+        </form>
     </div>
 
-    <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}" method="POST">
+    <!-- JS for dynamic hold amount rows -->
-
+    <script>
-        <!-- Subcontractor Field -->
+        $(document).ready(function () {
-        <div class="row1">
+            // Add new hold amount row
-            <div>
+            $("#add_hold_amount").click(function () {
-                <label for="subcontractor">Subcontractor Name:</label>
+                const index = $("#hold_amount_container .hold-amount-row").length;
-                <input class="form-control" list="subcontractor_list" id="subcontractor" name="subcontractor"
+                const newRow = `
-                       value="{{ invoice.Contractor_Name }}" placeholder="Type to search..." required>
-                <input type="hidden" id="subcontractor_id" name="subcontractor_id" value="{{ invoice.Subcontractor_Id }}">
-                <datalist id="subcontractor_list"></datalist>
-            </div>
-        </div>
-
-        <!-- Village and PMC No Fields -->
-        <div class="row2">
-            <div>
-                <label for="village">Village Name:</label>
-                <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/>
-            </div>
-        </div>
-
-        <!-- Work Type and Invoice Details -->
-        <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/>
-            </div>
-            <div>
-                <label for="invoice_details">Invoice Details:</label>
-                <textarea id="invoice_details" name="invoice_details" required>{{ invoice.Invoice_Details }}</textarea>
-            </div>
-        </div>
-
-        <!-- Invoice No and Invoice Date -->
-        <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/>
-            </div>
-            <div>
-                <label for="invoice_date">Invoice Date:</label>
-                <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}" required/>
-            </div>
-        </div>
-
-        <!-- Amount Fields -->
-        <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/>
-            </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/>
-            </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/>
-            </div>
-        </div>
-
-        <!-- GST, TDS, and Other Amounts -->
-        <div class="row3">
-            <div>
-                <label for="amount">Amount:</label>
-                <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/>
-            </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/>
-            </div>
-        </div>
-
-        <!-- SD, On Commission, Hydro Testing -->
-        <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/>
-            </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/>
-            </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/>
-            </div>
-        </div>
-
-       <!-- Hold Amount Section -->
-<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/>
-                <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/>
-                <button type="button" class="remove-hold-amount">Remove</button>
-            </div>
-        {% endif %}
-    {% endfor %}
-</div>
-
-
-        <div class="hold-row">
-            <button type="button" id="add_hold_amount" class="button">+ Add Hold Amount</button>
-        </div>
-
-        <!-- Final Amounts -->
-        <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/>
-            </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/>
-            </div>
-        </div>
-
-        <!-- Submit Button -->
-        <button type="submit" class="button">Update</button>
-    </form>
-</div>
-
-<!-- JS for dynamic hold amount rows -->
-<script>
-$(document).ready(function() {
-    // Add new hold amount row
-    $("#add_hold_amount").click(function() {
-        const index = $("#hold_amount_container .hold-amount-row").length;
-        const newRow = `
             <div class="hold-amount-row">
                 <label for="hold_type_${index}">Hold Type:</label>
                 <input type="text" id="hold_type_${index}" name="hold_type[]" required/>
@@ -172,36 +188,36 @@ $(document).ready(function() {
                 <button type="button" class="remove-hold-amount">Remove</button>
             </div>
         `;
-        $("#hold_amount_container").append(newRow);
+                $("#hold_amount_container").append(newRow);
-    });
+            });
 
-    // Remove hold amount row
+            // Remove hold amount row
-    $(document).on("click", ".remove-hold-amount", function() {
+            $(document).on("click", ".remove-hold-amount", function () {
-        $(this).closest(".hold-amount-row").remove();
+                $(this).closest(".hold-amount-row").remove();
-    });
+            });
 
-    // Submit form via AJAX
+            // Submit form via AJAX
-    $("#invoiceForm").submit(function(e) {
+            $("#invoiceForm").submit(function (e) {
-        e.preventDefault();
+                e.preventDefault();
 
-        $.ajax({
+                $.ajax({
-            type: "POST",
+                    type: "POST",
-            url: $(this).attr("action"),
+                    url: $(this).attr("action"),
-            data: $(this).serialize(),
+                    data: $(this).serialize(),
-            success: function(response) {
+                    success: function (response) {
-                if(response.status === "success") {
+                        if (response.status === "success") {
-                $("#invoiceSuccessAlert").fadeIn().delay(3000).fadeOut();
+                            $("#invoiceSuccessAlert").fadeIn().delay(3000).fadeOut();
-                alert("Invoice updated successfully!");  // <-- Popup alert
+                            alert("Invoice updated successfully!");  // <-- Popup alert
-                }
+                        }
 
-            },
+                    },
-            error: function(xhr) {
+                    error: function (xhr) {
-                alert("Error: " + xhr.responseJSON.message);
+                        alert("Error: " + xhr.responseJSON.message);
-            }
+                    }
+                });
+            });
         });
-    });
+    </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 %}
+        {% if messages %}
-        {% for category, message in 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 %}
+            {% endfor %}
-      {% endif %}
+        {% endif %}
     {% endwith %}
 </div>
 
-<script>
+
-    window.onload = function () {
-        const flash = document.getElementById('flash-message');
-        if (flash && flash.innerText.trim() !== "") {
-            alert(flash.innerText);
-        }
-    };
-</script>
 </body>
 {% endblock %}