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/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'))

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,17 +156,16 @@ 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):
                 self.isSuccess = False
@@ -142,7 +174,6 @@ class ItemCRUD:
                 )
                 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,7 +274,7 @@ class ItemCRUD:
                 return
 
             # ======================================================
-            # NORMAL
+            # NORMAL SINGLE-FIELD
             # ======================================================
             if not re.match(RegEx.allPattern, childname):
                 self.isSuccess = False
@@ -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()
@@ -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,7 +8,7 @@ class ItemCRUDType(Enum):
     State = 4
     HoldType = 5
     Subcontractor = 6
-    
+    GSTRelease = 7
 
 class RegEx:
     patternAlphabetOnly = "^[A-Za-z ]+$"

model/gst_release.py

@@ -1,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,12 +24,19 @@ class GSTRelease:
                 "Contractor_ID": int(request.form.get("Contractor_ID", 0) or 0)
             }
 
+            # Add GST Release
             gst.AddItem(
                 request=request,
                 data=data,
                 storedprocfetch="CheckGSTReleaseExists",
                 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:

templates/add_gst_release.html

@@ -68,50 +68,49 @@
     {% 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>
-        <tr>
+            <tr>
-            <th class="sortable-header">GST_Release_Id</th>
+                <th class="sortable-header">GST_Release_Id</th>
-            <th class="sortable-header">PMC_No</th>
+                <th class="sortable-header">PMC_No</th>
-            <th>Invoice_No</th>
+                <th>Invoice_No</th>
-            <th>Basic_Amount</th>
+                <th>Basic_Amount</th>
-            <th>Final_Amount</th>
+                <th>Final_Amount</th>
-            <th>Total_Amount</th>
+                <th>Total_Amount</th>
-            <th>UTR</th>
+                <th>UTR</th>
-            <th>Update</th>
+                <th>Update</th>
-            <th>Delete</th>
+                <th>Delete</th>
-        </tr>
+            </tr>
         </thead>
         <tbody>
-        {% for gst_rel in gst_releases %}
+            {% for gst_rel in gst_releases %}
-        <tr>
+            <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>
+                <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>
-                </a>
+                </td>
-            </td>
+                <td>
-            <td>
+                    <a href="{{ url_for('gst_release_bp.delete_gst_release', gst_release_id=gst_rel.gst_release_id) }}" 
-                <a href="/delete_gst_release/{{ gst_rel[0] }}"
+                       onclick="return confirm('Are you sure you want to delete this GST Release?')">
-                   onclick="return confirm('Are you sure you want to delete this GST Release?')">
+                        <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete" class="icon">
-                    <img src="{{ url_for('static', filename='images/icons/bin_red_icon.png') }}" alt="Delete"
+                    </a>
-                         class="icon">
+                </td>
-                </a>
+            </tr>
-            </td>
+            {% endfor %}
-        </tr>
-        {% endfor %}
         </tbody>
     </table>
 </div>