Compare commits
2 Commits
8cba86323e
...
f22dc0cccd
| Author | SHA1 | Date | |
|---|---|---|---|
| f22dc0cccd | |||
| 0007d6e87d |
@@ -199,7 +199,7 @@ def client_vs_all_subcontractor():
|
||||
df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
|
||||
except KeyError as e:
|
||||
flash(f"Merge Error: Missing column {str(e)}. Check if 'Location' is defined in your database models.", "danger")
|
||||
return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
|
||||
return render_template("client_report.html", tables=tables, ra_val=ra_val)
|
||||
|
||||
|
||||
# Convert to HTML for preview
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{% if tables.tr or tables.mh or tables.dc %}
|
||||
{% if tables.tr or tables.mh or tables.dc or tables.laying %}
|
||||
<div class="card shadow-sm p-3">
|
||||
<h4 class="mb-3">Comparison Preview</h4>
|
||||
|
||||
@@ -50,6 +50,9 @@
|
||||
<button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
|
||||
Comparison</button>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
|
||||
& Bedding Comparison</button>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content mt-3" id="reportTabsContent">
|
||||
@@ -68,6 +71,11 @@
|
||||
{{ tables.dc|safe }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-pane fade" id="laying" role="tabpanel">
|
||||
<div class="table-responsive" style="max-height: 500px;">
|
||||
{{ tables.laying|safe }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user