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

dashboarded added

Browse Source
This commit is contained in:
anishd100
2026-01-24 13:41:52 +05:30
parent 1dceb640bd
commit 20a5d01f88
19 changed files with 513 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
app/routes/file_report.py
View File

@@ -72,7 +72,8 @@ class SubcontractorBill:
for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
if not df.empty:
df.drop(columns=drop_cols, errors="ignore", inplace=True)
# --- subcontractor report only ---
@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
@login_required
@@ -91,7 +92,7 @@ def report_file():
if not subcontractor_id:
flash("Please select a subcontractor.", "danger")
return render_template("report.html", subcontractors=subcontractors)
return render_template("subcontractor_report.html", subcontractors=subcontractors)
subcontractor = Subcontractor.query.get(subcontractor_id)
bill_gen = SubcontractorBill()
@@ -102,13 +103,13 @@ def report_file():
else:
if not ra_bill_no:
flash("Please enter an RA Bill Number.", "danger")
return render_template("report.html", subcontractors=subcontractors)
return render_template("subcontractor_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:
flash("No data found for this selection.", "warning")
return render_template("report.html", subcontractors=subcontractors)
return render_template("subcontractor_report.html", subcontractors=subcontractors)
# If download is clicked, return file immediately
if action == "download":
@@ -144,87 +145,70 @@ def report_file():
@file_report_bp.route("/client_report", methods=["GET", "POST"])
@login_required
def client_vs_all_subcontractor():
# Initialize dictionary keys to match HTML variables
tables = {"tr": None, "mh": None, "dc": None, "laying": None}
tables = {"tr": None, "mh": None, "dc": None}
ra_val = ""
if request.method == "POST":
RA_Bill_No = request.form.get("RA_Bill_No")
action = request.form.get("action") # Identify if 'download' or 'preview'
ra_val = RA_Bill_No
if not RA_Bill_No:
flash("Please enter RA Bill No.", "danger")
return render_template("client_report.html", tables=tables, ra_val=ra_val)
clientBill = ClientBill()
clientBill.Fetch(RA_Bill_No=RA_Bill_No)
contractorBill = SubcontractorBill()
contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
# Safety Check: Verify if data exists
if clientBill.df_tr.empty and clientBill.df_mh.empty and clientBill.df_laying.empty:
# --- SAFETY CHECK: Verify data exists before merging ---
if clientBill.df_tr.empty and clientBill.df_mh.empty:
flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
return render_template("client_report.html", tables=tables, ra_val=ra_val)
# Define columns based on your model field names
qty_cols = [
"pipe_150_mm", "pipe_200_mm", "pipe_250_mm", "pipe_300_mm",
"pipe_350_mm", "pipe_400_mm", "pipe_450_mm", "pipe_500_mm",
"pipe_600_mm", "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
]
mh_dc_qty_cols = ["qty", "total"] # Update these based on your DC model fields
mh_lay_qty_cols = qty_cols + ["Laying_Length", "CC_length"]
qty_cols = [...] # (Keep your existing list)
mh_dc_qty_cols = [...] # (Keep your existing list)
mh_lay_qty_cols =[...]
def aggregate_df(df, group_cols, sum_cols):
if df.empty:
# Create an empty DF with the correct columns to avoid Merge/Key Errors
return pd.DataFrame(columns=group_cols + sum_cols)
existing_cols = [c for c in sum_cols if c in df.columns]
# Ensure group_cols exist in the DF
for col in group_cols:
if col not in df.columns:
df[col] = "N/A"
df[col] = "N/A" # Fill missing join keys
return df.groupby(group_cols, as_index=False)[existing_cols].sum()
# Aggregate data from Subcontractor tables
# Aggregate data
df_sub_tr_grp = aggregate_df(contractorBill.df_tr, ["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", "MH_NO"], mh_dc_qty_cols)
# FIXED: Aggregating from .df_laying
df_sub_lay_grp = aggregate_df(contractorBill.df_laying, ["Location", "MH_NO"], mh_lay_qty_cols)
# Standardize "Location" column to prevent merge keys being missing
for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying]:
df_sub_lay_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_lay_qty_cols)
# --- FINAL MERGE LOGIC ---
# We check if "Location" exists in the client data. If not, we add it to prevent the KeyError.
for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying ]:
if not df_client.empty and "Location" not in df_client.columns:
df_client["Location"] = "Unknown"
try:
# Final Merge for Comparison
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_dc_cmp = clientBill.df_dc.merge(df_sub_dc_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"))
# --- EXCEL DOWNLOAD LOGIC ---
if action == "download":
output = io.BytesIO()
with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
df_tr_cmp.to_excel(writer, index=False, sheet_name="Tr.Ex ")
df_mh_cmp.to_excel(writer, index=False, sheet_name="Mh.Ex ")
df_dc_cmp.to_excel(writer, index=False, sheet_name="DC ")
df_lay_cmp.to_excel(writer, index=False, sheet_name="Laying and Bedding")
output.seek(0)
file_name = f"Client_Comparison_RA_{RA_Bill_No}.xlsx"
return send_file(output, download_name=file_name, as_attachment=True)
# --- PREVIEW HTML LOGIC ---
table_classes = 'table table-striped table-hover table-sm border shadow-sm'
tables["tr"] = df_tr_cmp.to_html(classes=table_classes, index=False)
tables["mh"] = df_mh_cmp.to_html(classes=table_classes, index=False)
tables["dc"] = df_dc_cmp.to_html(classes=table_classes, index=False)
tables["laying"] = df_lay_cmp.to_html(classes=table_classes, index=False)
except KeyError as e:
flash(f"Merge Error: Missing column {str(e)}", "danger")
flash(f"Merge Error: Missing column {str(e)}. Check if 'Location' is defined in your database models.", "danger")
return render_template("client_report.html", tables=tables, ra_val=ra_val)
return render_template("client_report.html", tables=tables, ra_val=ra_val)
# Convert to HTML for preview
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)
tables["laying"] = df_lay_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
return render_template("client_report.html", tables=tables, ra_val=ra_val)