client models and report commit

This commit is contained in:
2025-12-13 18:50:27 +05:30
parent b11a974869
commit 89328c9066
21 changed files with 645 additions and 17 deletions

View File

@@ -24,17 +24,38 @@
<ul class="navbar-nav ms-auto">
<li class="nav-item"><a class="nav-link" href="/dashboard">Dashboard</a></li>
<li class="nav-item"><a class="nav-link" href="/file/import">File Import</a></li>
<li class="nav-item"><a class="nav-link" href="/file/report">Reports Download</a></li>
<!-- Sub-Contractor model -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Subcontractor</a>
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Subcontractor Model</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="/subcontractor/add">Add Subcontractor</a></li>
<li><a class="dropdown-item" href="/subcontractor/list">Subcontractor List</a></li>
<li><a class="dropdown-item" href="/subcontractor/add">Add of Subcontractor</a></li>
<li><a class="dropdown-item" href="/subcontractor/list">List of Subcontractor </a></li>
</ul>
</li>
<!-- Sub-contractor File import/report -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Sub-contractor File
System</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="/file/import">File Import</a></li>
<li><a class="dropdown-item" href="/file/report">Reports Download</a></li>
</ul>
</li>
<!-- Client to sub-cont. File import/report -->
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Client File
System</a>
<ul class="dropdown-menu dropdown-menu-dark">
<li><a class="dropdown-item" href="/file/import_client">File Import</a></li>
<li><a class="dropdown-item" href="/report/comparison_report">Reports Generate </a></li>
</ul>
</li>
<li class="nav-item"><a class="nav-link" href="/user/list">Users</a></li>
</ul>
@@ -61,5 +82,4 @@
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
</body>
</html>
</html>

View File

@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-4">File Import</h2>
<h2 class="mb-4">Sub-Contractor File Import</h2>
<div class="card p-4 shadow-sm">

View File

@@ -0,0 +1,39 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-4">Client File Import</h2>
<div class="card p-4 shadow-sm">
<form method="POST" enctype="multipart/form-data">
<!-- 1. SELECT SUBCONTRACTOR -->
<label class="form-label">Select Subcontractor vs Client</label>
<select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
<option value="">-- Select Subcontractor --</option>
{% for sc in subcontractors %}
<option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
{% endfor %}
</select>
<!-- 2. FILE TYPE (MODEL NAME) -->
<label class="form-label">Select File Type</label>
<select name="file_type" id="file_type" class="form-select mb-3" required>
<option value="">-- Select File Type --</option>
<option value="">Sheet</option>
<option value="tr_ex_client">Tr. Ex</option>
<option value="mh_ex_client">Mh. Ex </option>
<option value="mh_dc_client">MH & DC </option>
<option value="">Laying Sheet</option>
</select>
<!-- 3. FILE UPLOAD -->
<label class="form-label">Choose File</label>
<input type="file" name="file" class="form-control mb-3" required>
<button class="btn btn-primary w-100">Upload</button>
</form>
</div>
{% endblock %}

View File

@@ -0,0 +1,39 @@
{% extends "base.html" %}
{% block content %}
<div class="container mt-4">
<h2 class="mb-4">Subcontractor vs Client Comparison</h2>
<!-- FLASH MESSAGES -->
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
{% for category, message in messages %}
<div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
</div>
{% endfor %}
{% endif %}
{% endwith %}
<div class="card p-4 shadow-sm">
<form method="POST">
<!-- SELECT SUBCONTRACTOR -->
<label class="form-label fw-semibold">Select Subcontractor</label>
<select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
<option value="">-- Select Subcontractor --</option>
{% for sc in subcontractors %}
<option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
{% endfor %}
</select>
<button class="btn btn-primary w-100">Generate Report</button>
</form>
</div>
</div>
{% endblock %}