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

added client RA bill wise download report

Browse Source
This commit is contained in:
anishd100
2026-01-13 15:58:52 +05:30
parent 844dcbee81
commit 2cbb565380
3 changed files with 191 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
app/routes/file_report.py
View File

@@ -22,30 +22,38 @@ class BillType(Enum):
# --- 2. DEFINE CLASSES --- # --- 2. DEFINE CLASSES ---
class SubcontractorBill: class SubcontractorBill:
def __init__(self): def __init__(self):
# Initialize as empty DataFrames so .to_excel() always exists
self.df_tr = pd.DataFrame() self.df_tr = pd.DataFrame()
self.df_mh = pd.DataFrame() self.df_mh = pd.DataFrame()
self.df_dc = pd.DataFrame() self.df_dc = pd.DataFrame()
def Fetch(self, RA_Bill_No, subcontractor_id): def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
# Query data filtered by both Bill No and Subcontractor ID # Build dynamic filters based on what is provided
trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all() filters = {}
mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all() if subcontractor_id:
dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all() filters["subcontractor_id"] = subcontractor_id
if RA_Bill_No:
filters["RA_Bill_No"] = RA_Bill_No
# Convert SQL objects to DataFrames # Query using the filters
self.df_tr = pd.DataFrame([c.__dict__ for c in trench]) trench = TrenchExcavation.query.filter_by(**filters).all()
self.df_mh = pd.DataFrame([c.__dict__ for c in mh]) mh = ManholeExcavation.query.filter_by(**filters).all()
self.df_dc = pd.DataFrame([c.__dict__ for c in dc]) dc = ManholeDomesticChamber.query.filter_by(**filters).all()
# Convert to DataFrames
self.df_tr = pd.DataFrame([c.serialize() for c in trench])
self.df_mh = pd.DataFrame([c.serialize() for c in mh])
self.df_dc = pd.DataFrame([c.serialize() for c in dc])
# Standardize columns and clean internal SQLAlchemy state
if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
# Clean Columns (remove SQLAlchemy internal state)
drop_cols = ["id", "created_at", "_sa_instance_state"] drop_cols = ["id", "created_at", "_sa_instance_state"]
for df in [self.df_tr, self.df_mh, self.df_dc]: for df in [self.df_tr, self.df_mh, self.df_dc]:
if not df.empty: if not df.empty:
df.drop(columns=drop_cols, errors="ignore", inplace=True) df.drop(columns=drop_cols, errors="ignore", inplace=True)
# --- 3. DEFINE ROUTES --- # --- Updated Route with "Download All" Support ---
@file_report_bp.route("/report", methods=["GET", "POST"]) @file_report_bp.route("/report", methods=["GET", "POST"])
@login_required @login_required
def report_file(): def report_file():
@@ -53,43 +61,71 @@ def report_file():
if request.method == "POST": if request.method == "POST":
subcontractor_id = request.form.get("subcontractor_id") subcontractor_id = request.form.get("subcontractor_id")
ra_bill_no = request.form.get("ra_bill_no") # Collected from the updated HTML ra_bill_no = request.form.get("ra_bill_no")
download_all = request.form.get("download_all") == "true" # Check for toggle
if not subcontractor_id or not ra_bill_no: if not subcontractor_id:
flash("Please select a subcontractor and enter an RA Bill Number.", "danger") flash("Please select a subcontractor.", "danger")
return render_template("report.html", subcontractors=subcontractors) return render_template("report.html", subcontractors=subcontractors)
subcontractor = Subcontractor.query.get(subcontractor_id) subcontractor = Subcontractor.query.get(subcontractor_id)
# Instantiate and Fetch Data
bill_gen = SubcontractorBill() bill_gen = SubcontractorBill()
bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
# Check if any data was found if download_all:
# Fetch EVERYTHING for this subcontractor
bill_gen.Fetch(subcontractor_id=subcontractor_id, RA_Bill_No=None)
file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
else:
if not ra_bill_no:
flash("Please enter an RA Bill Number or select 'Download All'.", "danger")
return render_template("report.html", subcontractors=subcontractors)
bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty: if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
flash(f"No data found for {subcontractor.subcontractor_name} in RA Bill {ra_bill_no}", "warning") flash("No data found for this selection.", "warning")
return render_template("report.html", subcontractors=subcontractors) return render_template("report.html", subcontractors=subcontractors)
# WRITE EXCEL FILE
output = io.BytesIO() output = io.BytesIO()
file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
with pd.ExcelWriter(output, engine="xlsxwriter") as writer: with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.") bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.") bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC") bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
output.seek(0) output.seek(0)
return send_file( return send_file(output, download_name=file_name, as_attachment=True,
output, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
download_name=file_name,
as_attachment=True,
mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
)
return render_template("report.html", subcontractors=subcontractors) return render_template("report.html", subcontractors=subcontractors)
# (ClientBill class and client_vs_all_subcontractor route would follow here...)
class ClientBill:
def __init__(self):
self.df_tr = pd.DataFrame()
self.df_mh = pd.DataFrame()
self.df_dc = pd.DataFrame()
def Fetch(self, RA_Bill_No):
trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
self.df_tr = pd.DataFrame([c.serialize() for c in trench])
self.df_mh = pd.DataFrame([c.serialize() for c in mh])
self.df_dc = pd.DataFrame([c.serialize() for c in dc])
# Standardize columns for merging
if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
drop_cols = ["id", "created_at", "_sa_instance_state"]
for df in [self.df_tr, self.df_mh, self.df_dc]:
if not df.empty:
df.drop(columns=drop_cols, errors="ignore", inplace=True)
import pandas as pd import pandas as pd
import io import io
@@ -157,17 +193,27 @@ class SubcontractorBill:
@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"]) @file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
@login_required @login_required
def client_vs_all_subcontractor(): def client_vs_all_subcontractor():
<<<<<<< HEAD
=======
# Initialize empty variables for the template
tables = {"tr": None, "mh": None, "dc": None}
ra_val = ""
>>>>>>> 2636f2e (added client RA bill wise download report)
if request.method == "POST": if request.method == "POST":
RA_Bill_No = request.form.get("RA_Bill_No") RA_Bill_No = request.form.get("RA_Bill_No")
ra_val = RA_Bill_No
if not RA_Bill_No: if not RA_Bill_No:
flash("Please enter RA Bill No.", "danger") flash("Please enter RA Bill No.", "danger")
return render_template("generate_comparison_client_vs_subcont.html") return render_template("generate_comparison_client_vs_subcont.html")
# ... (Keep your existing data fetching and processing logic exactly as is) ...
clientBill = ClientBill() clientBill = ClientBill()
clientBill.Fetch(RA_Bill_No=RA_Bill_No) clientBill.Fetch(RA_Bill_No=RA_Bill_No)
contractorBill = SubcontractorBill() contractorBill = SubcontractorBill()
contractorBill.Fetch(RA_Bill_No=RA_Bill_No) contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
<<<<<<< HEAD
# Updated QTY lists to match model fields exactly # Updated QTY lists to match model fields exactly
qty_cols = [ qty_cols = [
@@ -185,6 +231,13 @@ def client_vs_all_subcontractor():
] ]
# Aggregate Subcontractor Data safely # Aggregate Subcontractor Data safely
=======
# ... (Keep all your qty_cols, mh_dc_qty_cols, and aggregate_df function) ...
qty_cols = [...] # (Your existing list)
mh_dc_qty_cols = [...] # (Your existing list)
>>>>>>> 2636f2e (added client RA bill wise download report)
def aggregate_df(df, group_cols, sum_cols): def aggregate_df(df, group_cols, sum_cols):
if df.empty: return pd.DataFrame() if df.empty: return pd.DataFrame()
existing_cols = [c for c in sum_cols if c in df.columns] existing_cols = [c for c in sum_cols if c in df.columns]
@@ -194,12 +247,18 @@ def client_vs_all_subcontractor():
df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols) df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols)
df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "Node_No"], mh_dc_qty_cols) df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "Node_No"], mh_dc_qty_cols)
<<<<<<< HEAD
# Merge and Calculate Difference # Merge and Calculate Difference
=======
>>>>>>> 2636f2e (added client RA bill wise download report)
df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub")) df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub")) df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "Node_No"], how="left", suffixes=("_Client", "_Sub")) df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "Node_No"], how="left", suffixes=("_Client", "_Sub"))
<<<<<<< HEAD
# Calculate Diffs # Calculate Diffs
=======
>>>>>>> 2636f2e (added client RA bill wise download report)
for df in [df_tr_cmp, df_mh_cmp]: for df in [df_tr_cmp, df_mh_cmp]:
for col in qty_cols: for col in qty_cols:
if f"{col}_Client" in df.columns: if f"{col}_Client" in df.columns:
@@ -209,6 +268,7 @@ def client_vs_all_subcontractor():
if f"{col}_Client" in df_dc_cmp.columns: if f"{col}_Client" in df_dc_cmp.columns:
df_dc_cmp[f"{col}_Diff"] = df_dc_cmp[f"{col}_Client"].fillna(0) - df_dc_cmp[f"{col}_Sub"].fillna(0) df_dc_cmp[f"{col}_Diff"] = df_dc_cmp[f"{col}_Client"].fillna(0) - df_dc_cmp[f"{col}_Sub"].fillna(0)
<<<<<<< HEAD
output = io.BytesIO() output = io.BytesIO()
file_name = f"Comparison_RA_Bill_{RA_Bill_No}.xlsx" file_name = f"Comparison_RA_Bill_{RA_Bill_No}.xlsx"
with pd.ExcelWriter(output, engine="xlsxwriter") as writer: with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
@@ -220,3 +280,22 @@ def client_vs_all_subcontractor():
return send_file(output, download_name=file_name, as_attachment=True, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") return send_file(output, download_name=file_name, as_attachment=True, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
return render_template("generate_comparison_client_vs_subcont.html") return render_template("generate_comparison_client_vs_subcont.html")
=======
# ACTION LOGIC: Check if user clicked "Download" or just "Preview/Generate"
if request.form.get("action") == "download":
output = io.BytesIO()
file_name = f"Comparison_RA_Bill_{RA_Bill_No}.xlsx"
with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
df_tr_cmp.to_excel(writer, sheet_name="Tr.Ex Comparison", index=False)
df_mh_cmp.to_excel(writer, sheet_name="Mh.Ex Comparison", index=False)
df_dc_cmp.to_excel(writer, sheet_name="MH & DC Comparison", index=False)
output.seek(0)
return send_file(output, download_name=file_name, as_attachment=True, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
# If not downloading, convert DFs to HTML for the UI
tables["tr"] = df_tr_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
tables["mh"] = df_mh_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
tables["dc"] = df_dc_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
>>>>>>> 2636f2e (added client RA bill wise download report)

71
app/templates/generate_comparison_client_vs_subcont.html
View File

@@ -1,11 +1,8 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="container mt-4"> <div class="container-fluid mt-4"> <h2 class="mb-4">File Comparison</h2>
<h2 class="mb-4">File Comparison </h2>
<!-- FLASH MESSAGES -->
{% with messages = get_flashed_messages(with_categories=true) %} {% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %} {% if messages %}
{% for category, message in messages %} {% for category, message in messages %}
@@ -17,27 +14,57 @@
{% endif %} {% endif %}
{% endwith %} {% endwith %}
<div class="card p-4 shadow-sm"> <div class="card p-4 shadow-sm mb-5">
<form method="POST"> <form method="POST">
<label class="form-label fw-bold">RA Bill No</label>
<input type="text" name="RA_Bill_No" class="form-control mb-3" value="{{ ra_val }}" required>
<!-- SELECT SUBCONTRACTOR --> <div class="row">
<!-- <label class="form-label fw-semibold">Select Subcontractor</label> <div class="col-md-6">
<select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required> <button type="submit" name="action" value="preview" class="btn btn-secondary w-100">Preview Data</button>
<option value="">-- Select Subcontractor --</option> </div>
<div class="col-md-6">
{% for sc in subcontractors %} <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel Report</button>
<option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option> </div>
{% endfor %} </div>
</select> -->
<label class="form-label">RA Bill No</label>
<input type="text" name="RA_Bill_No" class="form-control mb-3" required>
<button class="btn btn-primary w-100">Generate Report</button>
</form> </form>
</div> </div>
{% if tables.tr or tables.mh or tables.dc %}
<div class="card shadow-sm p-3">
<h4 class="mb-3">Comparison Preview</h4>
<ul class="nav nav-tabs" id="reportTabs" role="tablist">
<li class="nav-item">
<button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr" type="button">Tr.Ex Comparison</button>
</li>
<li class="nav-item">
<button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex Comparison</button>
</li>
<li class="nav-item">
<button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC Comparison</button>
</li>
</ul>
<div class="tab-content mt-3" id="reportTabsContent">
<div class="tab-pane fade show active" id="tr" role="tabpanel">
<div class="table-responsive" style="max-height: 500px;">
{{ tables.tr|safe }}
</div>
</div>
<div class="tab-pane fade" id="mh" role="tabpanel">
<div class="table-responsive" style="max-height: 500px;">
{{ tables.mh|safe }}
</div>
</div>
<div class="tab-pane fade" id="dc" role="tabpanel">
<div class="table-responsive" style="max-height: 500px;">
{{ tables.dc|safe }}
</div>
</div>
</div>
</div>
{% endif %}
</div> </div>
{% endblock %} {% endblock %}

38
app/templates/report.html
View File

@@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div class="container mt-4"> <div class="container mt-4">
<h2 class="mb-4">Generate Subcontractor Report</h2> <h2 class="mb-4 text-center">Generate Subcontractor Report</h2>
{% with messages = get_flashed_messages(with_categories=true) %} {% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %} {% if messages %}
@@ -11,12 +11,11 @@
{{ message }} {{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert"></button> <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
</div> </div>
)
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
<div class="card p-4 shadow-sm"> <div class="card p-4 shadow-sm mx-auto" style="max-width: 600px;">
<form method="POST"> <form method="POST">
<div class="mb-3"> <div class="mb-3">
<label class="form-label fw-semibold">Select Subcontractor</label> <label class="form-label fw-semibold">Select Subcontractor</label>
@@ -28,13 +27,38 @@
</select> </select>
</div> </div>
<div class="mb-3"> <div class="form-check form-switch mb-3">
<label class="form-label fw-semibold">RA Bill Number</label> <input class="form-check-input" type="checkbox" name="download_all" value="true" id="downloadAllSwitch" onchange="toggleRAInput(this)">
<input type="text" name="ra_bill_no" class="form-control" placeholder="e.g. 01" required> <label class="form-check-label fw-bold text-primary" for="downloadAllSwitch">
Download All RA Bills for this Contractor
</label>
</div> </div>
<button type="submit" class="btn btn-primary w-100">Generate Excel Report</button> <div class="mb-4" id="ra_bill_container">
<label class="form-label fw-semibold">RA Bill Number</label>
<input type="text" name="ra_bill_no" id="ra_bill_input" class="form-control" placeholder="e.g. 01">
<small class="text-muted">Required if "Download All" is off.</small>
</div>
<button type="submit" class="btn btn-primary w-100 py-2">
<i class="fas fa-download me-2"></i>Generate Excel Report
</button>
</form> </form>
</div> </div>
</div> </div>
<script>
function toggleRAInput(checkbox) {
const input = document.getElementById('ra_bill_input');
const container = document.getElementById('ra_bill_container');
if (checkbox.checked) {
input.value = "";
input.disabled = true;
container.style.opacity = "0.5";
} else {
input.disabled = false;
container.style.opacity = "1";
}
}
</script>
{% endblock %} {% endblock %}