Merge pull request 'Summary report UI improvements and JS preview logic' (#1) from swapnil-dev into main

Reviewed-on: #1

.dockerignore

@@ -1,5 +0,0 @@
-__pycache__/
-*.pyc
-.git
-.idea
-venv

.env

@@ -1,25 +0,0 @@
-# -----------------------------
-# Flask App Configuration
-# -----------------------------
-FLASK_ENV=development
-FLASK_DEBUG=true
-FLASK_HOST=0.0.0.0
-FLASK_PORT=5010
-
-# -----------------------------
-# Security
-# -----------------------------
-SECRET_KEY=secret1234
-
-# -----------------------------
-# Database Configuration
-# -----------------------------
-DB_DIALECT=mysql
-# DB_DRIVER=pymysql
-DB_HOST=127.0.0.1
-# DB_HOST=db   # this is production for use docker 
-DB_PORT=3306
-DB_NAME=test_income_taxdb
-DB_USER=root
-DB_PASSWORD=root
-

AppCode/AOHandler.py

@@ -3,6 +3,7 @@ import mysql.connector
 import pandas as pd
 import io
 
+
 class AOHandler:
 
     def __init__(self):
@@ -32,8 +33,6 @@ class AOHandler:
 
     # Add AO record 
     def add_ao(self, data):
-        
-        try:
             fields = [
                 'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
                 'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
@@ -42,18 +41,14 @@ class AOHandler:
                 'tax_payable', 'surcharge', 'edu_cess',
                 'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
                 'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                'sat', 'tax_on_assessment', 'refund', 'Remarks','created_at'
+                'sat', 'tax_on_assessment', 'refund', 'Remarks'
             ]
 
             values = [data.get(f, 0) for f in fields]
+           
             self.cursor.callproc("InsertAO", values)    
             self.conn.commit()
-        except Exception as e:
+
-            self.conn.rollback()
-            raise e
-        finally:
-            self.cursor.close()
-            self.conn.close()
     
     # UPDATE AO RECORD by AO id
     def update_ao(self, id, data):
@@ -198,6 +193,8 @@ class AOHandler:
             print("MySQL Error →", e)
             return None
 
+
+
     # CLOSE CONNECTION
     def close(self):
         self.cursor.close()

AppCode/CITHandler.py

@@ -3,6 +3,7 @@ import mysql.connector
 import pandas as pd
 import io
 
+
 class CITHandler:
 
     def __init__(self):

AppCode/Config.py

@@ -1,43 +1,21 @@
-# import mysql.connector
-# import os
-
-# # Database Config 
-# class DBConfig:
-#     MYSQL_HOST = os.getenv("DB_HOST")
-#     MYSQL_USER = os.getenv("DB_USER")
-#     MYSQL_PASSWORD = os.getenv("DB_PASSWORD")
-#     MYSQL_DB = os.getenv("DB_NAME")
-
-#     @staticmethod
-#     def get_db_connection():
-#         """
-#         Returns a MySQL connection object.
-#         """
-#         return mysql.connector.connect(
-#             host=DBConfig.MYSQL_HOST,
-#             user=DBConfig.MYSQL_USER,
-#             password=DBConfig.MYSQL_PASSWORD,
-#             database=DBConfig.MYSQL_DB
-#         )
-
-
 import mysql.connector
 import os
 
-
+# Database Config 
 class DBConfig:
+    MYSQL_HOST = os.getenv("DB_HOST")
+    MYSQL_USER = os.getenv("DB_USER")
+    MYSQL_PASSWORD = os.getenv("DB_PASSWORD")
+    MYSQL_DB = os.getenv("DB_NAME")
+
     @staticmethod
     def get_db_connection():
         """
-        Create and return a MySQL database connection
+        Returns a MySQL connection object.
-        using environment variables.
         """
-
         return mysql.connector.connect(
-            host=os.getenv("DB_HOST", "db"),        # Docker service name
+            host=DBConfig.MYSQL_HOST,
-            port=int(os.getenv("DB_PORT", 3306)),
+            user=DBConfig.MYSQL_USER,
-            user=os.getenv("DB_USER", "root"),
+            password=DBConfig.MYSQL_PASSWORD,
-            password=os.getenv("DB_PASSWORD", "root"),
+            database=DBConfig.MYSQL_DB
-            database=os.getenv("DB_NAME", "test_income_taxdb"),
-            autocommit=False
         )

AppCode/ITRHandler.py

@@ -1,9 +1,11 @@
 import mysql.connector
 import pandas as pd
+import pymysql
 import io
 from flask import send_file, render_template, request
 
 from AppCode.Config import DBConfig
+from AppCode.YearGet import YearGet
 
 
 class ITRHandler:
@@ -12,6 +14,7 @@ class ITRHandler:
         self.conn = DBConfig.get_db_connection()
         self.cursor = self.conn.cursor(dictionary=True)
         
+
     # GET ALL ITR RECORDS using stored procedure "GetAllItr"
     def get_all_itr(self):
         self.cursor.callproc("GetAllItr")
@@ -41,29 +44,21 @@ class ITRHandler:
     # INSERT ITR RECORD using procedure "add_itr"
     def add_itr(self, data):
 
-        try:
+        columns = [
-            columns = [
+            'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
-                'year', 'gross_total_income', 'disallowance_14a', 'disallowance_37',
+            'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
-                'deduction_80ia_business', 'deduction_80ia_misc', 'deduction_80ia_other',
+            'deduction_sec37_disallowance', 'deduction_80g',
-                'deduction_sec37_disallowance', 'deduction_80g',
+            'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
-                'net_taxable_income', 'tax_30_percent', 'tax_book_profit_18_5',
+            'tax_payable', 'surcharge', 'edu_cess',
-                'tax_payable', 'surcharge', 'edu_cess',
+            'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
-                'total_tax_payable', 'mat_credit_created', 'mat_credit_utilized',
+            'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
-                'interest_234c', 'total_tax', 'advance_tax', 'tds', 'tcs',
+            'sat', 'tax_on_assessment', 'refund', 'Remarks'
-                'sat', 'tax_on_assessment', 'refund', 'Remarks','created_at'
+        ]
-            ]
+        values = [data.get(col, 0) for col in columns]
-            values = [data.get(col, 0) for col in columns]
-
-            # Call your stored procedure
-            self.cursor.callproc("InsertITR", values)
-            self.conn.commit()
-        except Exception as e:
-            self.conn.rollback()
-            raise e
-        finally:
-            self.cursor.close()
-            self.conn.close()
 
+        # Call your stored procedure
+        self.cursor.callproc("InsertITR", values)
+        self.conn.commit()
 
     # update itr by id
     def update(self, id, data):

AppCode/MatCreditHandler.py

@@ -1,18 +1,16 @@
 from AppCode.Config import DBConfig
-
+import mysql.connector
 
 class MatCreditHandler:
 
     def __init__(self):
+        # db = DBConfig()
         self.conn = DBConfig.get_db_connection()
         self.cursor = self.conn.cursor(dictionary=True)
 
-    # --------------------------------------------------
+    # get all Mat credit data
-    # FETCH ALL MAT CREDIT + UTILIZATION (For UI Display)
-    # --------------------------------------------------
     def fetch_all(self):
         try:
-           
            self.cursor.callproc("GetMatCedit")
            result_sets = self.cursor.stored_results()
            mat_rows = next(result_sets).fetchall()
@@ -21,78 +19,30 @@ class MatCreditHandler:
            return mat_rows, utilization_rows
         finally:
             self.cursor.close()
-            self.conn.close()
 
-    # --------------------------------------------------
+    # Save Mat credit data single row
-    # SAVE / UPDATE SINGLE MAT ROW (FROM MANUAL UI)
-    # --------------------------------------------------
     @staticmethod
     def save_single(data):
         conn = DBConfig.get_db_connection()
         cur = conn.cursor(dictionary=True)
-
         try:
-            # Save / Update MAT Credit
-            cur.callproc(
-                "SaveOrUpdateMatCredit",
-                (
-                    data["financial_year"],
-                    data["mat_credit"],
-                    data["balance"],
-                    data.get("remarks", "")
-                )
-            )
 
-            mat_id = None
+            cur.callproc("SaveOrUpdateMatCredit",(
-            for result in cur.stored_results():
+            data["financial_year"],
-                mat_id = result.fetchone()["mat_id"]
+            data["mat_credit"],
+            data["balance"]
+            ))
+
+            result = next(cur.stored_results()).fetchone()
+            mat_id = result["mat_id"]
+
+            if not mat_id:
+                raise Exception("mat_id not returned from procedure")
 
-            # Save utilization rows
             for u in data.get("utilization", []):
-                if float(u["amount"]) > 0:
-                    cur.callproc(
-                        "InsertMatUtilization",
-                        (mat_id, u["year"], u["amount"])
-                    )
-
-            conn.commit()
-
-        except Exception as e:
-            conn.rollback()
-            raise e
-        finally:
-            cur.close()
-            conn.close()
-
-    # --------------------------------------------------
-    # AUTO SAVE MAT FROM ITR (MAIN LOGIC)
-    # --------------------------------------------------
-    @staticmethod
-    def save_from_itr(year, mat_created, mat_utilized, remarks="Auto from"):
-        conn = DBConfig.get_db_connection()
-        cur = conn.cursor(dictionary=True)
-
-        try:
-            mat_created = float(mat_created or 0)
-            mat_utilized = float(mat_utilized or 0)
-
-            balance = mat_created - mat_utilized
-
-            # Save / Update MAT Credit
-            cur.callproc(
-                "SaveOrUpdateMatCredit",
-                (year, mat_created, balance, remarks)
-            )
-
-            mat_id = None
-            for result in cur.stored_results():
-                mat_id = result.fetchone()["mat_id"]
-
-            # Save utilization only if used
-            if mat_utilized > 0:
                 cur.callproc(
                     "InsertMatUtilization",
-                    (mat_id, year, mat_utilized)
+                    (mat_id, u["year"], u["amount"])
                 )
 
             conn.commit()
@@ -100,29 +50,56 @@ class MatCreditHandler:
         except Exception as e:
             conn.rollback()
             raise e
+
         finally:
             cur.close()
             conn.close()
     
-    # --------------------------------------------------
+    # save all Mat credit data 
-    # DELETE MAT CREDIT SAFELY (OPTIONAL)
+    # @staticmethod
-    # --------------------------------------------------
+    # def save_bulk(rows):
-    def delete_by_year(self, financial_year):
+    #     conn = DBConfig.get_db_connection()
-        try:
+    #     cur = conn.cursor()
-            self.cursor.execute(
+    #     skipped = []
-                "DELETE FROM mat_credit WHERE financial_year=%s",
-                (financial_year,)
-            )
-            self.conn.commit()
-        finally:
-            self.cursor.close()
-            self.conn.close()
 
-    # --------------------------------------------------
+    #     try:
-    # CLOSE CONNECTION (MANUAL USE)
+    #         for row in rows:
-    # --------------------------------------------------
+    #             cur.execute(
+    #                 "SELECT id FROM mat_credit WHERE financial_year=%s",
+    #                 (row["financial_year"],)
+    #             )
+    #             if cur.fetchone():
+    #                 skipped.append(row["financial_year"])
+    #                 continue
+
+    #             cur.execute("""
+    #                 INSERT INTO mat_credit (financial_year, mat_credit, balance)
+    #                 VALUES (%s,%s,%s)
+    #             """, (row["financial_year"], row["mat_credit"], row["balance"]))
+
+    #             mat_id = cur.lastrowid
+
+    #             for u in row["utilization"]:
+    #                 cur.execute("""
+    #                     INSERT INTO mat_utilization
+    #                     (mat_credit_id, utilized_year, utilized_amount)
+    #                     VALUES (%s,%s,%s)
+    #                 """, (mat_id, u["year"], u["amount"]))
+
+    #         conn.commit()
+    #         return skipped
+
+    #     except Exception:
+    #         conn.rollback()
+    #         raise
+
+    #     finally:
+    #         cur.close()
+    #         conn.close()
+
+    # CLOSE CONNECTION
     def close(self):
-        if self.cursor:
+        self.cursor.close()
-            self.cursor.close()
+        self.conn.close()
-        if self.conn:
+
-            self.conn.close()
+  

Dockerfile

@@ -1,22 +0,0 @@
-FROM python:3.11-slim
-
-# Prevent Python buffering
-ENV PYTHONDONTWRITEBYTECODE=1
-ENV PYTHONUNBUFFERED=1
-
-WORKDIR /app
-
-# Install system deps (if needed later)
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-EXPOSE 5000
-
-CMD ["python", "main.py"]
-

docker-compose.yml

@@ -1,29 +0,0 @@
-version: "3.9"
-
-services:
-  db:
-    image: mysql:8.0
-    container_name: income_tax_db
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: test_income_taxdb
-    ports:
-      - "3307:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
-      - ./db/income_tax.sql:/docker-entrypoint-initdb.d/income_tax.sql
-
-  web:
-    build: .
-    container_name: income_tax_web
-    restart: always
-    ports:
-      - "5010:5010"
-    env_file:
-      - .env
-    depends_on:
-      - db
-
-volumes:
-  mysql_data:

main.py

@@ -4,7 +4,7 @@ from dotenv import load_dotenv
 load_dotenv()
 import pandas as pd
 from werkzeug.utils import secure_filename
-from datetime import date
+
 from AppCode.Config import DBConfig
 from AppCode.LoginAuth import LoginAuth
 from AppCode.FileHandler import FileHandler
@@ -15,7 +15,6 @@ from AppCode.AOHandler import AOHandler
 from AppCode.CITHandler import CITHandler
 from AppCode.ITATHandler import ITATHandler
 from AppCode.MatCreditHandler import MatCreditHandler
-import subprocess
 
 
 
@@ -60,6 +59,7 @@ def view_documents():
     docHandler.View(request=request)
     return render_template('view_docs.html', documents=docHandler.documents, years=docHandler.years)
 
+
 # Upload file documents
 @app.route('/uploads/<filename>')
 @auth.login_required
@@ -68,26 +68,20 @@ def uploaded_file(filename):
     filepath = os.path.join(FileHandler.UPLOAD_FOLDER, secure_filename(filename))
 
     if not os.path.exists(filepath):
-        flash("Unsupported file type for viewing", "warning")
+        abort(404)
-        return redirect(url_for('view_documents'))
 
     file_ext = filename.rsplit('.', 1)[-1].lower()
     # --- View Mode ---
     if mode == 'view':
-        #  pdf
         if file_ext == 'pdf':
             return send_file(filepath, mimetype='application/pdf')
-        # Word
-        elif file_ext in ['doc', 'docx']:
-            return send_file(filepath, as_attachment=True)
-        # Excel
         elif file_ext in ['xls', 'xlsx']:
+            # Excel cannot be rendered in-browser by Flask; trigger download instead
             return send_file(filepath, as_attachment=False, download_name=filename, mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
         else:
-            flash("Unsupported file type for viewing", "warning")
+            return abort(415)  # Unsupported type for viewing
-            return redirect(url_for('view_documents'))
 
-    return send_file(filepath, as_attachment=True, download_name=filename)
+    return send_file(filepath, as_attachment=True)
 
 
 
@@ -111,26 +105,12 @@ def display_itr():
 def add_itr():
     if request.method == 'POST':
         itr = ITRHandler()
-        mat = MatCreditHandler()
         itr.add_itr(request.form)
         itr.close()
-        if 'documents' in request.files:
+        flash("ITR record added successfully!", "success")
-            doc = DocumentHandler()
-            doc.Upload(request)
-
-        # AUTO SAVE MAT FROM ITR
-        mat.save_from_itr(
-            year=request.form["year"],
-            mat_created=float(request.form.get("mat_credit_created", 0)),
-            mat_utilized=float(request.form.get("mat_credit_utilized", 0)),
-            remarks="Created via ITR"
-        )
-        
-        # flash("ITR record added successfully!", "success")
-        flash("ITR record and documents uploaded successfully!", "success")
         return redirect(url_for('display_itr'))
 
-    return render_template('add_itr.html',current_date=date.today().isoformat())
+    return render_template('add_itr.html')
 
 ## 4. DELETE an ITR record
 @app.route('/itr/delete/<int:id>', methods=['POST'])
@@ -155,7 +135,7 @@ def update_itr(id):
 
     record = itr.get_itr_by_id(id)
     itr.close()
-    return render_template('update_itr.html', record=record, current_date=date.today().isoformat())
+    return render_template('update_itr.html', record=record)
 
 
 
@@ -180,25 +160,11 @@ def display_ao():
 def add_ao():
     if request.method == 'POST':
         ao = AOHandler()
-        mat = MatCreditHandler()
         ao.add_ao(request.form)
         ao.close()
-
-        if 'documents' in request.files:
-            doc = DocumentHandler()
-            doc.Upload(request)
-
-        # AUTO SAVE MAT FROM ITR
-        mat.save_from_itr(
-            year=request.form["year"],
-            mat_created=float(request.form.get("mat_credit_created", 0)),
-            mat_utilized=float(request.form.get("mat_credit_utilized", 0)),
-            remarks="Created via ITR"
-        ) 
-
         flash("AO record added successfully!", "success")
         return redirect(url_for('display_ao'))
-    return render_template('add_ao.html',current_date=date.today().isoformat())
+    return render_template('add_ao.html')
 
 # 3. UPDATE AO record
 @app.route('/ao/update/<int:id>', methods=['GET', 'POST'])

requirements.txt

@@ -1,13 +0,0 @@
-Flask==3.0.1
-python-dotenv==1.0.1
-pandas==2.2.0
-Werkzeug==3.0.1
-
-mysql-connector-python==8.3.0
-
-Flask-HTTPAuth==4.8.0
-
-openpyxl==3.1.2
-xlrd==2.0.1
-
-gunicorn==21.2.0

static/js/ao_calc.js

@@ -46,6 +46,16 @@ document.addEventListener("DOMContentLoaded", function () {
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
@@ -60,37 +70,11 @@ document.addEventListener("DOMContentLoaded", function () {
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
-        // // --- mat_credit_created --- new
-        // setValue("mat_credit_created", Math.max(tax185 - total_tax_payable, 0));
-        // // --- mat credit_utilized --- new
-        // setValue("mat_credit_utilized", Math.max(total_tax_payable - tax185, 0));
-
-        // --- MAT credit and utilized ---
-        var a = tax185
-        var b = total_tax_payable
-        var result = 0
-        if (a > b) {
-            result = a - b
-            setValue("mat_credit_created", result);
-        }
-        else {
-            setValue("mat_credit_created", result);
-        }
-
-        if (b > a) {
-            result = b - a
-            setValue("mat_credit_utilized", result);
-        }
-        else {
-            setValue("mat_credit_utilized", result);
-        }
-
         // --- FINAL TAX ---
         var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
-        // var total_tax = total_tax_payable + mat_credit + interest_234c;
+        var total_tax = total_tax_payable + mat_credit + interest_234c;
-        var total_tax = total_tax_payable - mat_credit + interest_234c;
         setValue("total_tax", total_tax);
 
         // --- ASSESSMENT ---

static/js/itr_calc.js

@@ -46,6 +46,16 @@ document.addEventListener("DOMContentLoaded", function () {
         var tax_payable = (tax30 > tax185) ? tax30 : tax185;
         setValue("tax_payable", tax_payable);
 
+        // // --- SURCHARGE ---
+        // var percent = getValue("persentage");
+        // var surcharge = tax_payable * (percent / 100);
+        // setValue("surcharge", surcharge);
+
+        // // --- edu_cess ---
+        // var per_cess = getValue("persentage_cess")
+        // var edu_cess = (tax_payable + surcharge) * (per_cess / 100);
+        // setValue("edu_cess", edu_cess);
+
         // --- SURCHARGE ---
         var percent = getValue("persentage");
         var surcharge = tax_payable * (percent / 100);
@@ -60,37 +70,11 @@ document.addEventListener("DOMContentLoaded", function () {
         var total_tax_payable = tax_payable + surcharge + edu_cess;
         setValue("total_tax_payable", total_tax_payable);
 
-        // --- mat_credit_created --- new
-        // setValue("mat_credit_created", Math.max(tax185 - total_tax_payable, 0));
-        // // --- mat credit_utilized --- new
-        // setValue("mat_credit_utilized", Math.max(total_tax_payable - tax185, 0));
-
-        // --- mat credit_utilized ---
-        var a = tax185
-        var b = total_tax_payable
-        var result = 0
-        if (a > b) {
-            result = a - b
-            setValue("mat_credit_created", result);
-        }
-        else {
-            setValue("mat_credit_created", result);
-        }
-
-        if (b > a) {
-            result = b - a
-            setValue("mat_credit_utilized", result);
-        }
-        else {
-            setValue("mat_credit_utilized", result);
-        }
-
         // --- FINAL TAX ---
         var mat_credit = getValue("mat_credit_utilized");
         var interest_234c = getValue("interest_234c");
 
-        // var total_tax = total_tax_payable + mat_credit + interest_234c;
+        var total_tax = total_tax_payable + mat_credit + interest_234c;
-        var total_tax = total_tax_payable + interest_234c;
         setValue("total_tax", total_tax);
 
         // --- ASSESSMENT ---

static/js/summary_preview.js

@@ -45,6 +45,11 @@ document.getElementById("year").addEventListener("change", function () {
 
             // Show preview
             previewDiv.style.display = "block";
+
+           
+
+            
+
         })
         .catch(err => console.error("Preview load error:", err));
 });

templates/add_ao.html

@@ -10,8 +10,7 @@
 <div class="container">
 
     <h2 style="text-align:center;">New Assessing Officer Form</h2>
-    <form id="ao" method="POST" enctype="multipart/form-data">
+    <form id="ao" method="POST">
-        <input type="hidden" name="stage" value="ao">
         <div class="form-group full-width inline-2">
             <div>
                 <label>Assessment Year:</label>
@@ -20,12 +19,11 @@
                         -- Please select Assessment Year --
                     </option>
                 </select>
+
+
+
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
-            <div>
-                <label>Record Created Date:</label>
-                <input type="date" name="created_at" value="{{ current_date }}" required>
-            </div>
         </div>
 
         <div class="form-group full-width inline-2">
@@ -172,15 +170,9 @@
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
         </div>
 
-        <div class="form-group full-width inline-2">
+        <div class="form-group">
-            <div>
+            <label>Remarks:</label>
-                <label>Select Documents:</label>
+            <input type="text" name="Remarks">
-                <input type="file" name="documents" multiple>
-            </div>
-            <div>
-                <label>Remarks:</label>
-                <input type="text" name="Remarks">
-            </div>
         </div>
 
 

templates/add_itr.html

@@ -10,8 +10,7 @@
 {% block content %}
 <div class="container">
     <h2 style="text-align:center;">New Income Tax Return Form</h2>
-    <form id="itr" method="POST" enctype="multipart/form-data">
+    <form id="itr" method="POST">
-        <input type="hidden" name="stage" value="itr">
         <div class="form-group full-width inline-2">
             <div>
                 <label>Assessment Year:</label>
@@ -22,10 +21,6 @@
                 </select>
                 <div id="yearError" style="color:red; display:none; margin-bottom:10px;"></div>
             </div>
-            <div>
-                <label>Record Created Date:</label>
-                <input type="date" name="created_at" value="{{ current_date }}" required>
-            </div>
         </div>
         <div class="form-group full-width inline-2">
             <div>
@@ -171,15 +166,9 @@
             <input type="number" name="refund" class="auto" step="any" value="0.00" readonly>
         </div>
 
-        <div class="form-group full-width inline-2">
+        <div class="form-group">
-            <div>
+            <label>Remarks:</label>
-                <label>Select Documents:</label>
+            <input type="text" name="Remarks">
-                <input type="file" name="documents" multiple>
-            </div>
-            <div>
-                <label>Remarks:</label>
-                <input type="text" name="Remarks">
-            </div>
         </div>
 
         <button type="submit">Submit</button>

templates/display_ao.html

@@ -22,7 +22,6 @@
                     <th>Gross Total Income</th>
                     <th>Net Taxable Income</th>
                     <th>Total Tax</th>
-                    <th>Created Record Date</th>
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -33,7 +32,6 @@
                     <td>{{ ao.gross_total_income }}</td>
                     <td>{{ ao.net_taxable_income }}</td>
                     <td>{{ ao.total_tax }}</td>
-                    <td>{{ ao.created_at.strftime('%Y-%m-%d') }}</td>
                     <td>
                         <a href="{{ url_for('update_ao', id=ao.id) }}" class="btn btn-update">Edit</a>
 

templates/display_itr.html

@@ -22,7 +22,6 @@
                     <th>Net Taxable Income</th>
                     <th>Total Tax Payable</th>
                     <th>Refund</th>
-                    <th>Created Record Date</th>
                     <th>Actions</th>
                 </tr>
             </thead>
@@ -34,7 +33,6 @@
                     <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
                     <td>{{ "{:,.2f}".format(record.total_tax_payable) }}</td>
                     <td>{{ "{:,.2f}".format(record.refund) }}</td>
-                    <td>{{ record.created_at.strftime('%Y-%m-%d') }}</td>
                     <td class="action-cell">
                         <a href="{{ url_for('update_itr', id=record.id) }}" class="btn btn-update">Edit</a>
                         <form action="{{ url_for('delete_itr', id=record.id) }}" method="post"

templates/mat_credit.html

@@ -42,7 +42,7 @@
             <tbody>
                 {% for row in mat_rows %}
                 <tr>
-                    <td contenteditable="false">{{ row.financial_year }}-{{ row.financial_year | int + 1 }}</td>
+                    <td contenteditable="true">{{ row.financial_year }}</td>
                     <td><input value="{{ row.mat_credit }}"></td>
 
                     {% for y in added_years %}

templates/summary_reports.html

@@ -1,6 +1,9 @@
 {% extends "base.html" %} {% block title %}Download Summary Report{% endblock %}
 {% block extra_css %}
-<link rel="stylesheet" href="{{ url_for('static', filename='css/summary.css') }}" />
+<link
+  rel="stylesheet"
+  href="{{ url_for('static', filename='css/summary.css') }}"
+/>
 {% endblock %} {% block content %}
 <div class="container">
   <div class="head">

templates/update_ao.html

@@ -8,7 +8,7 @@
 
 {% block content %}
 <div class="container">
-    <h2>Update AO Record for Year {{ record.year }} - {{ record.year + 1 }}</h2>
+    <h2>Update AO Record for Year {{ record.year }}--{{ record.year + 1 }}</h2>
     <form method="POST" action="{{ url_for('update_ao', id=record.id) }}">
         <div class="form-group full-width inline-2">
             <div>
@@ -169,23 +169,6 @@
             <input type="text" name="Remarks" value="{{ record.remarks}}">
         </div>
 
-
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Created Date:</label>
-                <input type="date" name="created_at"
-                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
-                    readonly>
-            </div>
-
-            <div>
-                <label>Last Updated:</label>
-                <input type="date" name="updated_at"
-                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}"
-                    readonly>
-            </div>
-        </div>
-
         <button type="submit">Update Record</button>
 
     </form>

templates/update_itr.html

@@ -169,22 +169,6 @@
             <label>Remarks:</label>
             <input type="text" name="Remarks" value="{{ record.Remarks }}">
         </div>
-        <div class="form-group full-width inline-2">
-            <div>
-                <label>Created Date:</label>
-                <input type="date" name="created_at"
-                    value="{{ record.created_at.strftime('%Y-%m-%d') if record.created_at else current_date }}"
-                    readonly>
-            </div>
-
-            <div>
-                <label>Last Updated:</label>
-                <input type="date" name="updated_at"
-                    value="{{ record.updated_at.strftime('%Y-%m-%d') if record.updated_at else current_date }}"
-                    readonly>
-            </div>
-        </div>
-
         <button type="submit">Update Record</button>
     </form>
 </div>

templates/view_docs.html

@@ -27,11 +27,7 @@
         </select>
         <button type="submit">Apply</button>
     </form>
-    {% with messages = get_flashed_messages(with_categories=true) %}
+
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }}">{{ message }}</div>
-    {% endfor %}
-    {% endwith %}
     <!-- DOCUMENT TABLE -->
     <div class="table-responsive">
         <table>