pjpatil12/IncomeTaxSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI changes

Browse Source
This commit is contained in:
pjpatil12
2026-01-07 17:22:18 +05:30
parent 68511b7558
commit 58139ea239
21 changed files with 114 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
AppCode/MatCreditHandler.py
View File

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

3
main.py
View File

@@ -452,8 +452,8 @@ def check_year():
def mat_credit(): def mat_credit():
mat= MatCreditHandler() mat= MatCreditHandler()
mat_rows, utilization_rows = mat.fetch_all() mat_rows, utilization_rows = mat.fetch_all()
mat.close()
utilization_map = {} utilization_map = {}
all_years = set() all_years = set()
@@ -492,7 +492,6 @@ def save_mat_all():
return jsonify({"error": str(e)}), 500 return jsonify({"error": str(e)}), 500
# run # run
if __name__ == '__main__': if __name__ == '__main__':
app.run(host='0.0.0.0', port=5003, debug=True) app.run(host='0.0.0.0', port=5003, debug=True)

1
templates/add_ao.html
View File

@@ -169,7 +169,6 @@
</div> </div>
{% block extra_js %} {% 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/ao_calc.js') }}"></script>
<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script> <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
{% endblock %} {% endblock %}

1
templates/add_cit.html
View File

@@ -168,7 +168,6 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% 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/cit_calc.js') }}"></script>
<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script> <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
{% endblock %} {% endblock %}

1
templates/add_itat.html
View File

@@ -171,7 +171,6 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% 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/itr_calc.js') }}"></script>
<script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script> <script src="{{ url_for('static', filename='js/year_dropdown.js') }}"></script>
{% endblock %} {% endblock %}

6
templates/ao_reports.html
View File

@@ -31,11 +31,5 @@
</div> </div>
</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 %}

22
templates/base.html
View File

@@ -27,31 +27,37 @@
<a href="{{ url_for('index') }}"> <a href="{{ url_for('index') }}">
<h2>Dashboard</h2> <h2>Dashboard</h2>
</a> </a>
<!-- ITR model -->
<div class="menu-btn" onclick="toggleMenu('itrMenu')">ITR ▼</div> <div class="menu-btn" onclick="toggleMenu('itrMenu')">ITR ▼</div>
<div class="submenu" id="itrMenu"> <div class="submenu" id="itrMenu">
<a href="{{ url_for('add_itr') }}">➕ Add ITR</a> <a href="{{ url_for('add_itr') }}">➕ Add ITR</a>
<a href="{{ url_for('display_itr') }}">🧾 ITR Records</a> <a href="{{ url_for('display_itr') }}">🧾 ITR Records</a>
</div> </div>
<!-- AO model -->
<div class="menu-btn" onclick="toggleMenu('aoMenu')">AO ▼</div> <div class="menu-btn" onclick="toggleMenu('aoMenu')">AO ▼</div>
<div class="submenu" id="aoMenu"> <div class="submenu" id="aoMenu">
<a href="{{ url_for('add_ao') }}">➕ Add AO</a> <a href="{{ url_for('add_ao') }}">➕ Add AO</a>
<a href="{{ url_for('display_ao') }}">🧾 AO Records</a> <a href="{{ url_for('display_ao') }}">🧾 AO Records</a>
</div> </div>
<!-- CIT model -->
<div class="menu-btn" onclick="toggleMenu('citMenu')">CIT ▼</div> <div class="menu-btn" onclick="toggleMenu('citMenu')">CIT ▼</div>
<div class="submenu" id="citMenu"> <div class="submenu" id="citMenu">
<a href="{{ url_for('add_cit') }}">➕ Add CIT</a> <a href="{{ url_for('add_cit') }}">➕ Add CIT</a>
<a href="{{ url_for('display_cit') }}">🧾 CIT Records</a> <a href="{{ url_for('display_cit') }}">🧾 CIT Records</a>
</div> </div>
<!-- ITAT model -->
<div class="menu-btn" onclick="toggleMenu('itatMenu')">ITAT ▼</div> <div class="menu-btn" onclick="toggleMenu('itatMenu')">ITAT ▼</div>
<div class="submenu" id="itatMenu"> <div class="submenu" id="itatMenu">
<a href="{{ url_for('add_itat') }}">➕ Add ITAT</a> <a href="{{ url_for('add_itat') }}">➕ Add ITAT</a>
<a href="{{ url_for('display_itat') }}">🧾 ITAT Records</a> <a href="{{ url_for('display_itat') }}">🧾 ITAT Records</a>
</div> </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="menu-btn" onclick="toggleMenu('docMenu')">Documents & Reports ▼</div>
<div class="submenu" id="docMenu"> <div class="submenu" id="docMenu">
<a href="{{ url_for('upload_file') }}">📂 Upload</a> <a href="{{ url_for('upload_file') }}">📂 Upload</a>
@@ -60,14 +66,6 @@
<a href="{{ url_for('summary_report') }}">📝 Summary Report</a> <a href="{{ url_for('summary_report') }}">📝 Summary Report</a>
</div> </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 --> <!-- Logout at bottom -->
<a href="{{ url_for('auth.logout') }}" class="sidebar-logout"> <a href="{{ url_for('auth.logout') }}" class="sidebar-logout">
<img src="{{ url_for('static', filename='images/logout_icon.png') }}" class="logout-icon" alt="Logout" /> <img src="{{ url_for('static', filename='images/logout_icon.png') }}" class="logout-icon" alt="Logout" />

7
templates/cit_reports.html
View File

@@ -30,12 +30,5 @@
</div> </div>
</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 %}

4
templates/display_cit.html
View File

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

9
templates/display_itat.html
View File

@@ -46,7 +46,7 @@
<td>{{ "{:,.2f}".format(record.gross_total_income) }}</td> <td>{{ "{:,.2f}".format(record.gross_total_income) }}</td>
<td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td> <td>{{ "{:,.2f}".format(record.net_taxable_income) }}</td>
<td>{{ "{:,.2f}".format(record.total_tax_payable) }}</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"> <td class="action-cell">
<a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a> <a href="{{ url_for('update_itat', id=record.id) }}" class="btn btn-update">Edit</a>
@@ -68,8 +68,5 @@
</div> </div>
</div> </div>
{% endblock %} </div>
{% endblock %}
{% block scripts %}
<script src="{{ url_for('static', filename='js/toggle.js') }}"></script>
{% endblock %}

12
templates/itat_reports.html
View File

@@ -11,31 +11,21 @@
<div class="container"> <div class="container">
<h2>Download ITAT Report</h2> <h2>Download ITAT Report</h2>
<form method="GET" action="{{ url_for('itat_report') }}" target="_blank"> <form method="GET" action="{{ url_for('itat_report') }}" target="_blank">
<label for="year">Select Year:</label><br> <label for="year">Select Year:</label><br>
<select name="year" id="year" required> <select name="year" id="year" required>
<option value="">-- Select Year --</option> <option value="">-- Select Year --</option>
{% for y in years %} {% for y in years %}
<option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option> <option value="{{ y }}">AY {{ y }} - {{ y + 1 }}</option>
{% endfor %} {% endfor %}
</select> </select>
<br> <br>
<button type="submit">Download Excel</button> <button type="submit">Download Excel</button>
</form> </form>
</div> </div>
</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 %}

9
templates/itr_reports.html
View File

@@ -11,7 +11,6 @@
<div class="container"> <div class="container">
<h2>Download ITR Report</h2> <h2>Download ITR Report</h2>
<form method="GET" action="{{ url_for('itr_report') }}" target="_blank"> <form method="GET" action="{{ url_for('itr_report') }}" target="_blank">
<label for="year">Select Year:</label><br> <label for="year">Select Year:</label><br>
@@ -23,20 +22,12 @@
</select> </select>
<br> <br>
<button type="submit"> <button type="submit">
Download Excel Download Excel
</button> </button>
</form> </form>
</div> </div>
</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 %}

147
templates/login.html
View File

@@ -1,85 +1,84 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <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 { <head>
background: white; <meta charset="UTF-8" />
padding: 2rem; <title>LCEPL Income Tax</title>
border-radius: 10px; <style>
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1); body {
width: 300px; font-family: Arial, sans-serif;
} background: #f3f3f3;
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
}
h2 { .login-container {
text-align: center; background: white;
margin-bottom: 1.5rem; padding: 2rem;
} border-radius: 10px;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
width: 300px;
}
input[type="text"], h2 {
input[type="password"] { text-align: center;
width: 100%; margin-bottom: 1.5rem;
padding: 0.5rem; }
margin-bottom: 1rem;
border: 1px solid #ccc;
border-radius: 5px;
}
button { input[type="text"],
width: 100%; input[type="password"] {
padding: 0.5rem; width: 100%;
background: #007bff; padding: 0.5rem;
color: white; margin-bottom: 1rem;
border: none; border: 1px solid #ccc;
border-radius: 5px; border-radius: 5px;
cursor: pointer; }
}
.flash { button {
color: red; width: 100%;
text-align: center; padding: 0.5rem;
margin-bottom: 1rem; background: #007bff;
} color: white;
.title { border: none;
text-align: center; border-radius: 5px;
color: #007bff; cursor: pointer;
} }
.subtitle { .flash {
text-align: center; color: red;
} text-align: center;
</style> margin-bottom: 1rem;
</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 .title {
messages %} {% for category, message in messages %} text-align: center;
<div class="flash flash-{{ category }}">{{ message }}</div> color: #007bff;
{% endfor %} {% endif %} {% endwith %} }
.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>
<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> </html>

2
templates/stage_reports.html
View File

@@ -127,8 +127,6 @@
<body> <body>
<div class="container"> <div class="container">
<!-- Back to Dashboard Button -->
<!-- <a href="{{ url_for('index') }}" class="back-btn">← Back to Dashboard</a>-->
<h2>{{ stage }} Reports</h2> <h2>{{ stage }} Reports</h2>

5
templates/summary_reports.html
View File

@@ -30,9 +30,6 @@
</div> </div>
</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 %} {% endblock %}

6
templates/update_ao.html
View File

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

6
templates/update_cit.html
View File

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

6
templates/update_itat.html
View File

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

6
templates/update_itr.html
View File

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

9
templates/upload.html
View File

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