Update activity.log

Reviewed-on: #11

controllers/gst_release_controller.py

@@ -1,8 +1,8 @@
-from flask import Blueprint, render_template, request, redirect, url_for
+# routes/gst_release_routes.py
+from flask import Blueprint, render_template, request, redirect, url_for, flash
 from flask_login import login_required
 from model.gst_release import GSTRelease
 from model.Log import LogHelper
-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", f"User added GST release")
+        LogHelper.log_action("Add GST Release", "User added GST release")
         flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
         return redirect(url_for('gst_release_bp.add_gst_release'))
 
@@ -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", f"User edited GST release")
+        LogHelper.log_action("Edit GST Release", "User edited GST release")
         flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
         return redirect(url_for('gst_release_bp.add_gst_release'))
 
@@ -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)  # remove request
+    gst_service.DeleteGSTRelease(gst_release_id)
-    LogHelper.log_action("Delete GST Release", f"User deleted GST release")
+    LogHelper.log_action("Delete GST Release", "User deleted GST release")
     flash(gst_service.resultMessage, 'success' if gst_service.isSuccess else 'error')
     return redirect(url_for('gst_release_bp.add_gst_release'))

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)   # ✅
-        # ✅ Always redirect to same page (NO JSON)
+        return hold.resultMessage
-        return redirect(url_for("hold_types.add_hold_type"))
 
-    # GET request → show data
+    hold_types = hold.GetAllHoldTypes()   # ✅
-    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

model/ItemCRUD.py

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

model/Utilities.py

@@ -8,11 +8,10 @@ class ItemCRUDType(Enum):
     State = 4
     HoldType = 5
     Subcontractor = 6
-    
+    GSTRelease = 7
 
 class RegEx:
     patternAlphabetOnly = "^[A-Za-z ]+$"
-    allPattern = "^(?!\s*$).+"
 
 
 class ResponseHandler:

model/gst_release.py

@@ -1,109 +1,8 @@
-# from flask import request
+# model/gst_release.py
-# 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):
@@ -125,6 +24,7 @@ class GSTRelease:
                 "Contractor_ID": int(request.form.get("Contractor_ID", 0) or 0)
             }
 
+            # Add GST Release
             gst.AddItem(
                 request=request,
                 data=data,
@@ -132,6 +32,12 @@ 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)
 
@@ -198,7 +104,6 @@ class GSTRelease:
     def GetAllGSTReleases(self):
         try:
             gst = ItemCRUD(itemType=ItemCRUDType.GSTRelease)
-
             rows = gst.GetAllData(None, "GetAllGSTReleases")
 
             data = []
@@ -224,7 +129,6 @@ 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/hold_types.js

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

templates/add_gst_release.html

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

templates/add_hold_type.html

@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% block content %}
-
 <head>
     <title>Manage Hold Types</title>
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
@@ -8,7 +7,6 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
        <script src="{{ url_for('static', filename='js/search_on_table.js') }}"></script>
 </head>
-
 <body>
 
 <div class="button-container">
@@ -48,21 +46,8 @@
         <tr>
             <td>{{ htd['hold_type_id'] }}</td>
             <td>{{ htd['hold_type'] }}</td>
-                <td style="text-align:center;">
+            <td><a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">Edit</a></td>
-                    <a href="{{ url_for('hold_types.edit_hold_type', id=htd['hold_type_id']) }}">
+            <td><button class="delete-button" data-id="{{ htd['hold_type_id'] }}">Delete</button></td>
-                        <img src="{{ url_for('static', filename='images/icons/pen_blue_icon.png') }}" alt="Edit"
-                            class="icon">
-                    </a>
-                </td>
-
-                <td style="text-align:center;">
-                    <a href="{{ url_for('hold_types.delete_hold_type', id=htd['hold_type_id']) }}"
-                        onclick="return confirm('Are you sure you want to delete this hold type?');">
-
-                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
-                            class="icon">
-                    </a>
-                </td>
         </tr>
         {% endfor %}
     </table>
@@ -71,3 +56,4 @@
 </div>
 </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" method="POST">
+    <form id="updateHoldTypeForm">
-        <input type="hidden" id="hold_type_id" value="{{ hold_type.hold_type_id }}">
+        <input type="hidden" id="hold_type_id" value="{{ hold_type[0] }}">
         <label for="edit_hold_type">Hold Type:</label>
-        <input type="text" id="edit_hold_type" name="hold_type" value="{{ hold_type.hold_type }}" required>
+        <input type="text" id="edit_hold_type" name="hold_type" value="{{ hold_type[1] }}" 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: '/edit_hold_type/' + holdTypeId,
+                url: '/update_hold_type/' + holdTypeId,
                 method: 'POST',
                 data: formData,
                 processData: false,
@@ -55,3 +55,8 @@
     });
 </script>
 {% endblock %}
+
+
+
+
+

templates/edit_invoice.html

@@ -20,8 +20,7 @@
         Invoice successfully updated!
     </div>
 
-        <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}"
+    <form id="invoiceForm" action="{{ url_for('invoice.edit_invoice', invoice_id=invoice.Invoice_Id) }}" method="POST">
-            method="POST">
 
         <!-- Subcontractor Field -->
         <div class="row1">
@@ -29,8 +28,7 @@
                 <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"
+                <input type="hidden" id="subcontractor_id" name="subcontractor_id" value="{{ invoice.Subcontractor_Id }}">
-                        value="{{ invoice.Subcontractor_Id }}">
                 <datalist id="subcontractor_list"></datalist>
             </div>
         </div>
@@ -56,8 +54,7 @@
             </div>
             <div>
                 <label for="invoice_details">Invoice Details:</label>
-                    <textarea id="invoice_details" name="invoice_details"
+                <textarea id="invoice_details" name="invoice_details" required>{{ invoice.Invoice_Details }}</textarea>
-                        required>{{ invoice.Invoice_Details }}</textarea>
             </div>
         </div>
 
@@ -65,12 +62,11 @@
         <div class="row2">
             <div>
                 <label for="invoice_no">Invoice No:</label>
-                    <input type="text" id="invoice_no" name="invoice_no" value="{{ invoice.invoice_no }}" required />
+                <input type="text" id="invoice_no" name="invoice_no" value="{{ invoice.Invoice_No }}" required/>
             </div>
             <div>
                 <label for="invoice_date">Invoice Date:</label>
-                    <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}"
+                <input type="date" id="invoice_date" name="invoice_date" value="{{ invoice.Invoice_Date }}" required/>
-                        required />
             </div>
         </div>
 
@@ -78,18 +74,15 @@
         <div class="row3">
             <div>
                 <label for="basic_amount">Basic Amount:</label>
-                    <input type="number" step="0.01" id="basic_amount" name="basic_amount"
+                <input type="number" step="0.01" id="basic_amount" name="basic_amount" value="{{ invoice.Basic_Amount }}" required/>
-                        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"
+                <input type="number" step="0.01" id="debit_amount" name="debit_amount" value="{{ invoice.Debit_Amount }}" required/>
-                        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"
+                <input type="number" step="0.01" id="after_debit_amount" name="after_debit_amount" value="{{ invoice.After_Debit_Amount }}" required/>
-                        value="{{ invoice.After_Debit_Amount }}" required />
             </div>
         </div>
 
@@ -101,13 +94,11 @@
             </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 }}"
+                <input type="number" step="0.01" id="gst_amount" name="gst_amount" value="{{ invoice.GST_Amount }}" required/>
-                        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 }}"
+                <input type="number" step="0.01" id="tds_amount" name="tds_amount" value="{{ invoice.TDS_Amount }}" required/>
-                        required />
             </div>
         </div>
 
@@ -115,18 +106,15 @@
         <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 }}"
+                <input type="number" step="0.01" id="sd_amount" name="sd_amount" value="{{ invoice.SD_Amount }}" required/>
-                        required />
             </div>
             <div>
                 <label for="on_commission">On Commission:</label>
-                    <input type="number" step="0.01" id="on_commission" name="on_commission"
+                <input type="number" step="0.01" id="on_commission" name="on_commission" value="{{ invoice.On_Commission }}" required/>
-                        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"
+                <input type="number" step="0.01" id="hydro_testing" name="hydro_testing" value="{{ invoice.Hydro_Testing }}" required/>
-                        value="{{ invoice.Hydro_Testing }}" required />
             </div>
         </div>
 
@@ -138,11 +126,9 @@
             {% 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 }}"
+                <input type="text" id="hold_type_{{ loop.index }}" name="hold_type[]" value="{{ hold.hold_type }}" required/>
-                        required />
                 <label for="hold_amount_{{ loop.index }}">Hold Amount:</label>
-                    <input type="number" step="0.01" id="hold_amount_{{ loop.index }}" name="hold_amount[]"
+                <input type="number" step="0.01" id="hold_amount_{{ loop.index }}" name="hold_amount[]" value="{{ hold.hold_amount }}" required/>
-                        value="{{ hold.hold_amount }}" required />
                 <button type="button" class="remove-hold-amount">Remove</button>
             </div>
         {% endif %}
@@ -158,13 +144,11 @@
         <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"
+                <input type="number" step="0.01" id="gst_sd_amount" name="gst_sd_amount" value="{{ invoice.GST_SD_Amount }}" required/>
-                        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"
+                <input type="number" step="0.01" id="final_amount" name="final_amount" value="{{ invoice.Final_Amount }}" required/>
-                        value="{{ invoice.Final_Amount }}" required />
             </div>
         </div>