client laying and bedding in ui added
This commit is contained in:
@@ -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"))
|
df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
|
||||||
except KeyError as e:
|
except KeyError as e:
|
||||||
flash(f"Merge Error: Missing column {str(e)}. Check if 'Location' is defined in your database models.", "danger")
|
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
|
# Convert to HTML for preview
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</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">
|
<div class="card shadow-sm p-3">
|
||||||
<h4 class="mb-3">Comparison Preview</h4>
|
<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
|
<button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
|
||||||
Comparison</button>
|
Comparison</button>
|
||||||
</li>
|
</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>
|
</ul>
|
||||||
|
|
||||||
<div class="tab-content mt-3" id="reportTabsContent">
|
<div class="tab-content mt-3" id="reportTabsContent">
|
||||||
@@ -68,6 +71,11 @@
|
|||||||
{{ tables.dc|safe }}
|
{{ tables.dc|safe }}
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user