From 58139ea239680335c4aa0b8611964867a8a1fe90 Mon Sep 17 00:00:00 2001
From: pjpatil12 <pankajjpatil2001@gmail.com>
Date: Wed, 7 Jan 2026 17:22:18 +0530
Subject: [PATCH] UI changes

---
 AppCode/MatCreditHandler.py    |  38 ++++-----
 main.py                        |   3 +-
 templates/add_ao.html          |   1 -
 templates/add_cit.html         |   1 -
 templates/add_itat.html        |   1 -
 templates/ao_reports.html      |   8 +-
 templates/base.html            |  22 +++--
 templates/cit_reports.html     |   9 +-
 templates/display_cit.html     |   4 -
 templates/display_itat.html    |   9 +-
 templates/index.html           |   2 +-
 templates/itat_reports.html    |  14 +---
 templates/itr_reports.html     |  11 +--
 templates/login.html           | 149 ++++++++++++++++-----------------
 templates/stage_reports.html   |   2 -
 templates/summary_reports.html |   5 +-
 templates/update_ao.html       |   6 --
 templates/update_cit.html      |   6 --
 templates/update_itat.html     |   6 --
 templates/update_itr.html      |   6 --
 templates/upload.html          |   9 --
 21 files changed, 114 insertions(+), 198 deletions(-)

diff --git a/AppCode/MatCreditHandler.py b/AppCode/MatCreditHandler.py
index 892ef12..167163c 100644
--- a/AppCode/MatCreditHandler.py
+++ b/AppCode/MatCreditHandler.py
@@ -6,30 +6,24 @@ import mysql.connector
 class MatCreditHandler:
 
     def __init__(self):
-        db = DBConfig()
-        self.conn = db.get_db_connection()
+        # db = DBConfig()
+        self.conn = DBConfig.get_db_connection()
         self.cursor = self.conn.cursor(dictionary=True)
 
-    @staticmethod
-    def fetch_all():
-        conn = DBConfig.get_db_connection()
-        cur = conn.cursor(dictionary=True)
-
+    # get all Mat credit data
+    def fetch_all(self):
         try:
-            # Stored Procedure returns TWO result sets
-            cur.callproc("GetMatCedit")
-
-            result_sets = cur.stored_results()
-
-            mat_rows = next(result_sets).fetchall()
-            utilization_rows = next(result_sets).fetchall()
-
-            return mat_rows, utilization_rows
+           self.cursor.callproc("GetMatCedit")
+           result_sets = self.cursor.stored_results()
+           mat_rows = next(result_sets).fetchall()
+           utilization_rows = next(result_sets).fetchall()
 
+           return mat_rows, utilization_rows
         finally:
-            cur.close()
-            conn.close()
+            self.cursor.close()
+            self.cursor.close()
 
+    # Save Mat credit data single row
     @staticmethod
     def save_single(data):
         conn = DBConfig.get_db_connection()
@@ -81,6 +75,7 @@ class MatCreditHandler:
             conn.close()
 
     
+    # save all Mat credit data 
     @staticmethod
     def save_bulk(rows):
         conn = DBConfig.get_db_connection()
@@ -120,4 +115,9 @@ class MatCreditHandler:
 
         finally:
             cur.close()
-            conn.close()
\ No newline at end of file
+            conn.close()
+
+    # CLOSE CONNECTION
+    def close(self):
+        self.cursor.close()
+        self.conn.close()
diff --git a/main.py b/main.py
index 85df8a3..5985e0b 100644
--- a/main.py
+++ b/main.py
@@ -452,8 +452,8 @@ def check_year():
 def mat_credit():
 
     mat= MatCreditHandler()
-
     mat_rows, utilization_rows = mat.fetch_all()
+    mat.close()
 
     utilization_map = {}
     all_years = set()
@@ -492,7 +492,6 @@ def save_mat_all():
         return jsonify({"error": str(e)}), 500
 
 
-
 # run 
 if __name__ == '__main__':
       app.run(host='0.0.0.0', port=5003, debug=True)
\ No newline at end of file
diff --git a/templates/add_ao.html b/templates/add_ao.html
index cc71b75..d72d16b 100644
--- a/templates/add_ao.html
+++ b/templates/add_ao.html
@@ -169,7 +169,6 @@
 </div>
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/ao_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
diff --git a/templates/add_cit.html b/templates/add_cit.html
index 832fd5d..aa77ac8 100644
--- a/templates/add_cit.html
+++ b/templates/add_cit.html
@@ -168,7 +168,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/add_itat.html b/templates/add_itat.html
index 0fe26ec..c345de5 100644
--- a/templates/add_itat.html
+++ b/templates/add_itat.html
@@ -171,7 +171,6 @@
 {% endblock %}
 
 {% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/itr_calc.js') }}"></script>
 <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
diff --git a/templates/ao_reports.html b/templates/ao_reports.html
index 8b23b5f..4f3b40e 100644
--- a/templates/ao_reports.html
+++ b/templates/ao_reports.html
@@ -31,11 +31,5 @@
 
     </div>
 </div>
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}
 
-{% block extra_js %}  <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-{% endblock %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index b894a44..b1eff67 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -27,31 +27,37 @@
         <a href="{{ url_for('index') }}">
             <h2>Dashboard</h2>
         </a>
-
+        <!-- ITR model -->
         <div class="menu-btn" onclick="toggleMenu('itrMenu')">ITR ▼</div>
         <div class="submenu" id="itrMenu">
             <a href="{{ url_for('add_itr') }}">➕ Add ITR</a>
             <a href="{{ url_for('display_itr') }}">🧾 ITR Records</a>
         </div>
-
+        <!-- AO model -->
         <div class="menu-btn" onclick="toggleMenu('aoMenu')">AO ▼</div>
         <div class="submenu" id="aoMenu">
             <a href="{{ url_for('add_ao') }}">➕ Add AO</a>
             <a href="{{ url_for('display_ao') }}">🧾 AO Records</a>
         </div>
-
+        <!-- CIT model -->
         <div class="menu-btn" onclick="toggleMenu('citMenu')">CIT ▼</div>
         <div class="submenu" id="citMenu">
             <a href="{{ url_for('add_cit') }}">➕ Add CIT</a>
             <a href="{{ url_for('display_cit') }}">🧾 CIT Records</a>
         </div>
-
+        <!-- ITAT model -->
         <div class="menu-btn" onclick="toggleMenu('itatMenu')">ITAT ▼</div>
         <div class="submenu" id="itatMenu">
             <a href="{{ url_for('add_itat') }}">➕ Add ITAT</a>
             <a href="{{ url_for('display_itat') }}">🧾 ITAT Records</a>
         </div>
+        <!-- MAT credit model -->
+        <div class="menu-btn" onclick="toggleMenu('matCredit')">Mat Credit ▼</div>
+        <div class="submenu" id="matCredit">
+            <a href="{{ url_for('mat_credit') }}">📄 Mat Credit from</a>
+        </div>
 
+        <!-- Documents & Reports -->
         <div class="menu-btn" onclick="toggleMenu('docMenu')">Documents & Reports ▼</div>
         <div class="submenu" id="docMenu">
             <a href="{{ url_for('upload_file') }}">📂 Upload</a>
@@ -60,14 +66,6 @@
             <a href="{{ url_for('summary_report') }}">📝 Summary Report</a>
         </div>
 
-
-        <div class="menu-btn" onclick="toggleMenu('matCredit')">Mat Credit ▼</div>
-        <div class="submenu" id="matCredit">
-            <a href="{{ url_for('mat_credit') }}">📄 Mat Credit from</a>
-            <!-- <a href="{{ url_for('view_documents') }}">📄 Documents</a> -->
-
-        </div>
-
         <!-- Logout at bottom -->
         <a href="{{ url_for('auth.logout') }}" class="sidebar-logout">
             <img src="{{ url_for('static', filename='images/logout_icon.png') }}" class="logout-icon" alt="Logout" />
diff --git a/templates/cit_reports.html b/templates/cit_reports.html
index 0c50921..53d1226 100644
--- a/templates/cit_reports.html
+++ b/templates/cit_reports.html
@@ -30,12 +30,5 @@
 
     </div>
 </div>
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}
-
-{% block extra_js %}  <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-{% endblock %}
-{% endblock %}
 
+{% endblock %}
\ No newline at end of file
diff --git a/templates/display_cit.html b/templates/display_cit.html
index 7c700bb..0e0bd79 100644
--- a/templates/display_cit.html
+++ b/templates/display_cit.html
@@ -54,8 +54,4 @@
         {% endif %}
     </div>
 </div>
-{% endblock %}
-
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/display_itat.html b/templates/display_itat.html
index 2eeeb0b..bd98535 100644
--- a/templates/display_itat.html
+++ b/templates/display_itat.html
@@ -46,7 +46,7 @@
                             <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
                             <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
                             <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
-                            <td>{{ "{:,.2f}".format(record.refund) }}</td>>
+                            <td>{{ "{:,.2f}".format(record.refund) }}</td>
 
                             <td class="action-cell">
                                 <a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a>
@@ -68,8 +68,5 @@
 
         </div>
     </div>
-    {% endblock %}
-
-    {% block scripts %}
-    <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-    {% endblock %}
\ No newline at end of file
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 948d9f3..0b06567 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -9,4 +9,4 @@
         Welcome to Income Tax Utilities Dashboard
     </p>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/itat_reports.html b/templates/itat_reports.html
index f10600f..e3f8955 100644
--- a/templates/itat_reports.html
+++ b/templates/itat_reports.html
@@ -11,31 +11,21 @@
     <div class="container">
 
         <h2>Download ITAT Report</h2>
-
         <form method="GET" action="{{ url_for('itat_report') }}" target="_blank">
 
             <label for="year">Select Year:</label><br>
-
             <select name="year" id="year" required>
                 <option value="">-- Select Year --</option>
                 {% for y in years %}
                 <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
                 {% endfor %}
             </select>
-
             <br>
-
             <button type="submit">Download Excel</button>
 
         </form>
-
     </div>
 </div>
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}
 
-{% block extra_js %}  <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-{% endblock %}
-{% endblock %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/itr_reports.html b/templates/itr_reports.html
index 2628a9c..a5844d7 100644
--- a/templates/itr_reports.html
+++ b/templates/itr_reports.html
@@ -11,7 +11,6 @@
     <div class="container">
 
         <h2>Download ITR Report</h2>
-
         <form method="GET" action="{{ url_for('itr_report') }}" target="_blank">
 
             <label for="year">Select Year:</label><br>
@@ -23,20 +22,12 @@
             </select>
 
             <br>
-
             <button type="submit">
                 Download Excel
             </button>
 
         </form>
-
     </div>
 </div>
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}
 
-{% block extra_js %}  <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-{% endblock %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
index db9b763..66e1788 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,85 +1,84 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>LCEPL Income Tax</title>
-    <style>
-      body {
-        font-family: Arial, sans-serif;
-        background: #f3f3f3;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 100vh;
-      }
 
-      .login-container {
-        background: white;
-        padding: 2rem;
-        border-radius: 10px;
-        box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
-        width: 300px;
-      }
+<head>
+  <meta charset="UTF-8" />
+  <title>LCEPL Income Tax</title>
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      background: #f3f3f3;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100vh;
+    }
 
-      h2 {
-        text-align: center;
-        margin-bottom: 1.5rem;
-      }
+    .login-container {
+      background: white;
+      padding: 2rem;
+      border-radius: 10px;
+      box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
+      width: 300px;
+    }
 
-      input[type="text"],
-      input[type="password"] {
-        width: 100%;
-        padding: 0.5rem;
-        margin-bottom: 1rem;
-        border: 1px solid #ccc;
-        border-radius: 5px;
-      }
+    h2 {
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
 
-      button {
-        width: 100%;
-        padding: 0.5rem;
-        background: #007bff;
-        color: white;
-        border: none;
-        border-radius: 5px;
-        cursor: pointer;
-      }
+    input[type="text"],
+    input[type="password"] {
+      width: 100%;
+      padding: 0.5rem;
+      margin-bottom: 1rem;
+      border: 1px solid #ccc;
+      border-radius: 5px;
+    }
 
-      .flash {
-        color: red;
-        text-align: center;
-        margin-bottom: 1rem;
-      }
-      .title {
-        text-align: center;
-        color: #007bff;
-      }
+    button {
+      width: 100%;
+      padding: 0.5rem;
+      background: #007bff;
+      color: white;
+      border: none;
+      border-radius: 5px;
+      cursor: pointer;
+    }
 
-      .subtitle {
-        text-align: center;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="login-container">
-      <h1 class="title">Laxmi Civil Engineering Services</h1>
-      <h4 class="subtitle">LOGIN</h4>
+    .flash {
+      color: red;
+      text-align: center;
+      margin-bottom: 1rem;
+    }
 
-      {% with messages = get_flashed_messages(with_categories=true) %} {% if
-      messages %} {% for category, message in messages %}
-      <div class="flash flash-{{ category }}">{{ message }}</div>
-      {% endfor %} {% endif %} {% endwith %}
+    .title {
+      text-align: center;
+      color: #007bff;
+    }
 
-      <form method="post">
-        <input type="text" name="username" placeholder="Username" required />
-        <input
-          type="password"
-          name="password"
-          placeholder="Password"
-          required
-        />
-        <button type="submit">Login</button>
-      </form>
-    </div>
-  </body>
-</html>
+    .subtitle {
+      text-align: center;
+    }
+  </style>
+</head>
+
+<body>
+  <div class="login-container">
+    <h1 class="title">Laxmi Civil Engineering Services</h1>
+    <h4 class="subtitle">LOGIN</h4>
+
+    {% with messages = get_flashed_messages(with_categories=true) %} {% if
+    messages %} {% for category, message in messages %}
+    <div class="flash flash-{{ category }}">{{ message }}</div>
+    {% endfor %} {% endif %} {% endwith %}
+
+    <form method="post">
+      <input type="text" name="username" placeholder="Username" required />
+      <input type="password" name="password" placeholder="Password" required />
+      <button type="submit">Login</button>
+    </form>
+  </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/templates/stage_reports.html b/templates/stage_reports.html
index 4fd933f..2aa4bb9 100644
--- a/templates/stage_reports.html
+++ b/templates/stage_reports.html
@@ -127,8 +127,6 @@
 
 <body>
     <div class="container">
-        <!-- Back to Dashboard Button -->
-<!--        <a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>-->
 
         <h2>{{ stage }} Reports</h2>
 
diff --git a/templates/summary_reports.html b/templates/summary_reports.html
index 63a794b..b5c594f 100644
--- a/templates/summary_reports.html
+++ b/templates/summary_reports.html
@@ -30,9 +30,6 @@
 
     </div>
 </div>
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}
+
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_ao.html b/templates/update_ao.html
index 8e47dad..261ee90 100644
--- a/templates/update_ao.html
+++ b/templates/update_ao.html
@@ -31,10 +31,4 @@
 
     </div>
 </div>
-{% endblock %}
-
-{% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_cit.html b/templates/update_cit.html
index 595ca1c..549d13c 100644
--- a/templates/update_cit.html
+++ b/templates/update_cit.html
@@ -30,10 +30,4 @@
 
 </div>
 
-{% endblock %}
-
-{% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_itat.html b/templates/update_itat.html
index 9098846..c7c7180 100644
--- a/templates/update_itat.html
+++ b/templates/update_itat.html
@@ -28,10 +28,4 @@
 
 </div>
 
-{% endblock %}
-
-{% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/update_itr.html b/templates/update_itr.html
index 4949ac4..4c10348 100644
--- a/templates/update_itr.html
+++ b/templates/update_itr.html
@@ -31,10 +31,4 @@
 
     </div>
 </div>
-{% endblock %}
-
-{% block extra_js %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-<!-- <script src="{{ url_for('static', filename='js/cit_calc.js') }}"></script> -->
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/upload.html b/templates/upload.html
index 4e3a475..3dd8b70 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -35,13 +35,4 @@
 
     </div>
 </div>
-{% endblock %}
-
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}
-
-{% block extra_js %}
-<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
 {% endblock %}
\ No newline at end of file