add itemcrude

Reviewed-on: #9

.gitignore

@@ -4,3 +4,4 @@ __pycache__/
 
 static/downloads/
 static/uploads/
+

model/Village.py

@@ -1,3 +1,5 @@
+
+
 from model.Utilities import ResponseHandler, HtmlHelper, ItemCRUDType
 import config
 import mysql.connector
@@ -11,12 +13,19 @@ class Village:
     def __init__(self):
         self.isSuccess = False
         self.resultMessage = ""
+        self.response = {}  # ✅ ADDED
         self.village = ItemCRUD(itemType=ItemCRUDType.Village)
 
     # 🔹 Helper: sync status
     def _set_status(self, village):
         self.isSuccess = village.isSuccess
-        self.resultMessage = village.resultMessage
+
+        # ✅ 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):
@@ -28,8 +37,9 @@ class Village:
         block_id, village_name = self._get_form_data(request)
 
         if not village_name:
+            self.response = ResponseHandler.invalid_name("village")  # ✅ UPDATED
+            self.resultMessage = self.response["message"]
             self.isSuccess = False
-            self.resultMessage = "Village name cannot be empty"
             return
 
         try:
@@ -65,8 +75,9 @@ class Village:
         block_id, village_name = self._get_form_data(request)
 
         if not village_name:
+            self.response = ResponseHandler.invalid_name("village")  # ✅ UPDATED
+            self.resultMessage = self.response["message"]
             self.isSuccess = False
-            self.resultMessage = "Village name cannot be empty"
             return None
 
         try:
@@ -102,8 +113,9 @@ class Village:
         block_id, village_name = self._get_form_data(request)
 
         if not village_name:
+            self.response = ResponseHandler.invalid_name("village")  # ✅ UPDATED
+            self.resultMessage = self.response["message"]
             self.isSuccess = False
-            self.resultMessage = "Village name cannot be empty"
             return
 
         try:
@@ -163,9 +175,11 @@ class Village:
         except mysql.connector.Error as e:
             print(f"Error fetching blocks: {e}")
             self.isSuccess = False
-            self.resultMessage = HtmlHelper.json_response(
-                ResponseHandler.fetch_failure("block"), 500
-            )
+
+            # ✅ FIXED (removed jsonify response)
+            self.response = ResponseHandler.fetch_failure("block")
+            self.resultMessage = self.response["message"]
+
             return []
 
         finally:

static/js/village.js

@@ -1,9 +1,40 @@
+
+
 window.onload = function () {
     document.getElementById('Village_Name').focus();
 };
  
 $(document).ready(function () {
 
+    // 🔥 RESTORE VIEW MODE AFTER RELOAD
+    var viewMode = localStorage.getItem("viewMode");
+
+    if (viewMode === "table") {
+        $('#addForm').hide();
+        $('#addTable').show();
+    } else {
+        $('#addForm').show();
+        $('#addTable').hide();
+    }
+
+
+    // 🔥 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 () {
 
@@ -179,7 +210,7 @@ $(document).ready(function () {
 
                 } else {
 
-                    alert('Error adding village. Please try again.');
+                    alert(response.message || 'Error adding village. Please try again.');
 
                 }
 
@@ -196,3 +227,38 @@ $(document).ready(function () {
     });
 
 });
+
+
+// 🔥 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");
+
+    $.ajax({
+        url: '/delete_village/' + villageId,
+        type: 'GET',
+
+        success: function () {
+
+            setTimeout(function () {
+
+                alert("Village deleted successfully!");
+
+                // reload but stay on table
+                location.reload();
+
+            }, 1000);
+
+        },
+
+        error: function () {
+            alert("Error deleting village. Please try again.");
+        }
+
+    });
+}

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,91 +9,106 @@
     <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">
-    <button id="addButton" class="action-button">Add</button>
-    <button id="displayButton" class="action-button">Display</button>
-</div>
-
-<div id="addForm" style="display: none;">
-    <h2>Add 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="hidden" id="subcontractor_id" name="subcontractor_id"/>
-                <div id="subcontractor_list" class="autocomplete-items"></div>
-            </div>
-        </div>
-
-        <label for="PMC_No">PMC No:</label><br>
-        <select id="PMC_No" name="PMC_No" required>
-            <option value="">Select PMC No</option>
-        </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>
-
-        <label for="Payment_Amount">Amount:</label><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>
-<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>
-<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>
-<input type="number" step="0.01" id="total_amount" name="total_amount" required readonly><br><br>
-
-
-        <label for="utr">UTR:</label><br>
-        <input type="text" id="utr" name="utr"><br><br>
-
-        <button type="submit">Submit Payment</button>
-    </form>
-</div>
-
-<div id="successPopup" class="success-popup">
-    <i>&#10004;</i> Payment added successfully!
-</div>
-
-<div id="addTable" style="display: none;">
-    <div class="search-container">
-        <h2>Payment History</h2>
-        <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+    <div class="button-container">
+        <button id="addButton" class="action-button">Add</button>
+        <button id="displayButton" class="action-button">Display</button>
     </div>
-    <table id="sortableTable" border="1">
-        <thead>
-        <tr>
-            <th class="sortable-header">Payment ID</th>
-            <th class="sortable-header">PMC No</th>
-            <th>Invoice No</th>
-            <th>Payment Amount</th>
-            <th>TDS Amount</th>
-            <th>Total Amount</th>
-            <th>UTR</th>
-            <th>Update</th>
-            <th>Delete</th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for payment in payments %}
-        <tr>
-            <td>{{ payment[0] }}</td>
-            <td>{{ payment[1] }}</td>
-            <td>{{ payment[2] }}</td>
-            <td>{{ payment[3] }}</td>
-            <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="/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>
-        </tr>
-        <!-- <tr>
+
+    <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="hidden" id="subcontractor_id" name="subcontractor_id" />
+                    <div id="subcontractor_list" class="autocomplete-items"></div>
+                </div>
+            </div>
+
+            <label for="PMC_No">PMC No:</label><br>
+            <select id="PMC_No" name="PMC_No" required>
+                <option value="">Select PMC No</option>
+            </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>
+
+            <label for="Payment_Amount">Amount:</label><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>
+            <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>
+            <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>
+            <input type="number" step="0.01" id="total_amount" name="total_amount" required readonly><br><br>
+
+
+            <label for="utr">UTR:</label><br>
+            <input type="text" id="utr" name="utr"><br><br>
+
+            <button type="submit">Submit Payment</button>
+        </form>
+    </div>
+
+    <div id="successPopup" class="success-popup">
+        <i>&#10004;</i> Payment added successfully!
+    </div>
+
+    <div id="addTable" style="display: none;">
+        <div class="search-container">
+            <h2>Payment History</h2>
+            <input type="text" id="searchBar" placeholder="Searching..." onkeyup="searchTable()">
+        </div>
+        <table id="sortableTable" border="1">
+            <thead>
+                <tr>
+                    <th class="sortable-header">Payment ID</th>
+                    <th class="sortable-header">PMC No</th>
+                    <th>Invoice No</th>
+                    <th>Payment Amount</th>
+                    <th>TDS Amount</th>
+                    <th>Total Amount</th>
+                    <th>UTR</th>
+                    <th>Update</th>
+                    <th>Delete</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for payment in payments %}
+                <tr>
+                    <td>{{ payment[0] }}</td>
+                    <td>{{ payment[1] }}</td>
+                    <td>{{ payment[2] }}</td>
+                    <td>{{ payment[3] }}</td>
+                    <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>
+                        <form action="{{ url_for('payment_bp.delete_payment', payment_id=payment[0]) }}" method="POST"
+                            style="display:inline;">
+                            <button type="submit"
+                                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">
+                            </button>
+                        </form>
+                    </td>
+                </tr>
+                <!-- <tr>
             <td>{{ payment['Payment_Id'] }}</td>
             <td>{{ payment['PMC_No'] }}</td>
             <td>{{ payment['invoice_no'] }}</td>
@@ -103,91 +119,91 @@
             <td><a href="/edit_payment/{{ payment['Payment_Id'] }}"><img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit" class="icon"></a></td>
             <td><a href="/delete_payment/{{ payment['Payment_Id'] }}" 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> -->
-        {% endfor %}
-        </tbody>
-    </table>
-</div>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
 
-<script>
-document.getElementById("subcontractor").addEventListener("input", function () {
-    const query = this.value;
-    const list = document.getElementById("subcontractor_list");
+    <script>
+        document.getElementById("subcontractor").addEventListener("input", function () {
+            const query = this.value;
+            const list = document.getElementById("subcontractor_list");
 
-    if (query.length < 2) {
-        list.innerHTML = '';
-        return;
-    }
+            if (query.length < 2) {
+                list.innerHTML = '';
+                return;
+            }
 
-    fetch(`/search_subcontractor?query=${encodeURIComponent(query)}`)
-        .then(response => response.json())
-        .then(data => {
-            list.innerHTML = '';
-            data.results.forEach(item => {
-                const div = document.createElement("div");
-                div.setAttribute("data-id", item.id);
-                div.textContent = item.name;
-                list.appendChild(div);
-            });
-        });
-});
-
-document.getElementById("subcontractor_list").addEventListener("click", function (e) {
-    const selectedId = e.target.getAttribute("data-id");
-    const selectedName = e.target.textContent;
-
-    if (selectedId) {
-        document.getElementById("subcontractor_id").value = selectedId;
-        document.getElementById("subcontractor").value = selectedName;
-        document.getElementById("subcontractor_list").innerHTML = ""; // hide the list
-
-        console.log("Contractor id is", selectedId);
-
-        // Fetch PMC numbers
-        fetch(`/get_pmc_nos_by_subcontractor/${encodeURIComponent(selectedId)}`)
-            .then(response => response.json())
-            .then(data => {
-                console.log("Fetched PMC Nos:", data.pmc_nos);
-                const pmcDropdown = document.getElementById("PMC_No");
-                pmcDropdown.innerHTML = "";
-
-                const defaultOption = document.createElement("option");
-                defaultOption.value = "";
-                defaultOption.textContent = "Select PMC No";
-                pmcDropdown.appendChild(defaultOption);
-
-                data.pmc_nos.forEach(pmc => {
-                    const option = document.createElement("option");
-                    option.value = pmc;
-                    option.textContent = pmc;
-                    pmcDropdown.appendChild(option);
+            fetch(`/search_subcontractor?query=${encodeURIComponent(query)}`)
+                .then(response => response.json())
+                .then(data => {
+                    list.innerHTML = '';
+                    data.results.forEach(item => {
+                        const div = document.createElement("div");
+                        div.setAttribute("data-id", item.id);
+                        div.textContent = item.name;
+                        list.appendChild(div);
+                    });
                 });
+        });
 
-                if (data.pmc_nos.length === 0) {
-                    alert("No PMC Nos found for this subcontractor.");
-                }
-            })
-            .catch(error => {
-                console.error("Error fetching PMC Nos:", error);
-                alert("Failed to fetch PMC numbers.");
-            });
-    }
-});
-</script>
+        document.getElementById("subcontractor_list").addEventListener("click", function (e) {
+            const selectedId = e.target.getAttribute("data-id");
+            const selectedName = e.target.textContent;
 
-<script>
-function calculateTDSAndTotal() {
-    const amount = parseFloat(document.getElementById("Payment_Amount").value) || 0;
-    const tdsPercent = parseFloat(document.getElementById("TDS_Percentage").value) || 0;
+            if (selectedId) {
+                document.getElementById("subcontractor_id").value = selectedId;
+                document.getElementById("subcontractor").value = selectedName;
+                document.getElementById("subcontractor_list").innerHTML = ""; // hide the list
 
-    const tdsAmount = (amount * tdsPercent / 100).toFixed(2);
-    const totalAmount = (amount - tdsAmount).toFixed(2);
+                console.log("Contractor id is", selectedId);
 
-    document.getElementById("TDS_Payment_Amount").value = tdsAmount;
-    document.getElementById("total_amount").value = totalAmount;
-}
-</script>
+                // Fetch PMC numbers
+                fetch(`/get_pmc_nos_by_subcontractor/${encodeURIComponent(selectedId)}`)
+                    .then(response => response.json())
+                    .then(data => {
+                        console.log("Fetched PMC Nos:", data.pmc_nos);
+                        const pmcDropdown = document.getElementById("PMC_No");
+                        pmcDropdown.innerHTML = "";
+
+                        const defaultOption = document.createElement("option");
+                        defaultOption.value = "";
+                        defaultOption.textContent = "Select PMC No";
+                        pmcDropdown.appendChild(defaultOption);
+
+                        data.pmc_nos.forEach(pmc => {
+                            const option = document.createElement("option");
+                            option.value = pmc;
+                            option.textContent = pmc;
+                            pmcDropdown.appendChild(option);
+                        });
+
+                        if (data.pmc_nos.length === 0) {
+                            alert("No PMC Nos found for this subcontractor.");
+                        }
+                    })
+                    .catch(error => {
+                        console.error("Error fetching PMC Nos:", error);
+                        alert("Failed to fetch PMC numbers.");
+                    });
+            }
+        });
+    </script>
+
+    <script>
+        function calculateTDSAndTotal() {
+            const amount = parseFloat(document.getElementById("Payment_Amount").value) || 0;
+            const tdsPercent = parseFloat(document.getElementById("TDS_Percentage").value) || 0;
+
+            const tdsAmount = (amount * tdsPercent / 100).toFixed(2);
+            const totalAmount = (amount - tdsAmount).toFixed(2);
+
+            document.getElementById("TDS_Payment_Amount").value = tdsAmount;
+            document.getElementById("total_amount").value = totalAmount;
+        }
+    </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

@@ -84,11 +84,11 @@
                 </a>
             </td>
             <td>
-                <a href="{{ url_for('village.delete_village', village_id=village[0]) }}"
-                   onclick="return confirm('Are you sure you want to delete this village?');">
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
-                         class="icon">
-                </a>
+                <a href="#"
+   onclick="deleteVillage({{ village[0] }}); return false;">
+    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" 
+         alt="Delete" class="icon">
+</a>
             </td>
         </tr>
         {% endfor %}