UI changes

AppCode/MatCreditHandler.py

@@ -6,30 +6,24 @@ import mysql.connector
 class MatCreditHandler:
 
     def __init__(self):
-        db = DBConfig()
+        # db = DBConfig()
-        self.conn = db.get_db_connection()
+        self.conn = DBConfig.get_db_connection()
         self.cursor = self.conn.cursor(dictionary=True)
 
-    @staticmethod
+    # get all Mat credit data
-    def fetch_all():
+    def fetch_all(self):
-        conn = DBConfig.get_db_connection()
-        cur = conn.cursor(dictionary=True)
-
         try:
-            # Stored Procedure returns TWO result sets
+           self.cursor.callproc("GetMatCedit")
-            cur.callproc("GetMatCedit")
+           result_sets = self.cursor.stored_results()
-
-            result_sets = cur.stored_results()
-
            mat_rows = next(result_sets).fetchall()
            utilization_rows = next(result_sets).fetchall()
 
            return mat_rows, utilization_rows
-
         finally:
-            cur.close()
+            self.cursor.close()
-            conn.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()
@@ -121,3 +116,8 @@ class MatCreditHandler:
         finally:
             cur.close()
             conn.close()
+
+    # CLOSE CONNECTION
+    def close(self):
+        self.cursor.close()
+        self.conn.close()

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)

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 %}

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 %}

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 %}

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 %}

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" />

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 %}
-

templates/display_cit.html

@@ -55,7 +55,3 @@
     </div>
 </div>
 {% endblock %}
-
-{% block scripts %}
-<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
-{% endblock %}

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 %}
+</div>
-
-    {% block scripts %}
-    <script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
 {% endblock %}

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 %}

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 %}

templates/login.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="UTF-8" />
   <title>LCEPL Income Tax</title>
@@ -50,6 +51,7 @@
       text-align: center;
       margin-bottom: 1rem;
     }
+
     .title {
       text-align: center;
       color: #007bff;
@@ -60,6 +62,7 @@
     }
   </style>
 </head>
+
 <body>
   <div class="login-container">
     <h1 class="title">Laxmi Civil Engineering Services</h1>
@@ -72,14 +75,10 @@
 
     <form method="post">
       <input type="text" name="username" placeholder="Username" required />
-        <input
+      <input type="password" name="password" placeholder="Password" required />
-          type="password"
-          name="password"
-          placeholder="Password"
-          required
-        />
       <button type="submit">Login</button>
     </form>
   </div>
 </body>
+
 </html>

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>
 

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 %}

templates/update_ao.html

@@ -32,9 +32,3 @@
     </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 %}

templates/update_cit.html

@@ -31,9 +31,3 @@
 </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 %}

templates/update_itat.html

@@ -29,9 +29,3 @@
 </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 %}

templates/update_itr.html

@@ -32,9 +32,3 @@
     </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 %}

templates/upload.html

@@ -36,12 +36,3 @@
     </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 %}