diff --git a/app/routes/file_report.py b/app/routes/file_report.py index 5128b29..b92e6d2 100644 --- a/app/routes/file_report.py +++ b/app/routes/file_report.py @@ -22,30 +22,38 @@ class BillType(Enum): # --- 2. DEFINE CLASSES --- class SubcontractorBill: def __init__(self): - # Initialize as empty DataFrames so .to_excel() always exists self.df_tr = pd.DataFrame() self.df_mh = pd.DataFrame() self.df_dc = pd.DataFrame() - def Fetch(self, RA_Bill_No, subcontractor_id): - # Query data filtered by both Bill No and Subcontractor ID - trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all() - mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all() - dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all() + def Fetch(self, RA_Bill_No=None, subcontractor_id=None): + # Build dynamic filters based on what is provided + filters = {} + if subcontractor_id: + filters["subcontractor_id"] = subcontractor_id + if RA_Bill_No: + filters["RA_Bill_No"] = RA_Bill_No - # Convert SQL objects to DataFrames - self.df_tr = pd.DataFrame([c.__dict__ for c in trench]) - self.df_mh = pd.DataFrame([c.__dict__ for c in mh]) - self.df_dc = pd.DataFrame([c.__dict__ for c in dc]) + # Query using the filters + trench = TrenchExcavation.query.filter_by(**filters).all() + mh = ManholeExcavation.query.filter_by(**filters).all() + 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"] - 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) -# --- 3. DEFINE ROUTES --- +# --- Updated Route with "Download All" Support --- @file_report_bp.route("/report", methods=["GET", "POST"]) @login_required def report_file(): @@ -53,43 +61,71 @@ def report_file(): if request.method == "POST": 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: - flash("Please select a subcontractor and enter an RA Bill Number.", "danger") + if not subcontractor_id: + flash("Please select a subcontractor.", "danger") return render_template("report.html", subcontractors=subcontractors) subcontractor = Subcontractor.query.get(subcontractor_id) - - # Instantiate and Fetch Data 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: - 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) - # WRITE EXCEL FILE output = io.BytesIO() - file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx" - with pd.ExcelWriter(output, engine="xlsxwriter") as writer: 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_dc.to_excel(writer, index=False, sheet_name="MH & DC") output.seek(0) - 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("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 io @@ -157,17 +193,27 @@ class SubcontractorBill: @file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"]) @login_required 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": RA_Bill_No = request.form.get("RA_Bill_No") + ra_val = RA_Bill_No if not RA_Bill_No: flash("Please enter RA Bill No.", "danger") return render_template("generate_comparison_client_vs_subcont.html") + # ... (Keep your existing data fetching and processing logic exactly as is) ... clientBill = ClientBill() clientBill.Fetch(RA_Bill_No=RA_Bill_No) contractorBill = SubcontractorBill() contractorBill.Fetch(RA_Bill_No=RA_Bill_No) +<<<<<<< HEAD # Updated QTY lists to match model fields exactly qty_cols = [ @@ -185,6 +231,13 @@ def client_vs_all_subcontractor(): ] # 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): if df.empty: return pd.DataFrame() 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_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "Node_No"], mh_dc_qty_cols) +<<<<<<< HEAD # 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_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")) +<<<<<<< HEAD # Calculate Diffs +======= +>>>>>>> 2636f2e (added client RA bill wise download report) for df in [df_tr_cmp, df_mh_cmp]: for col in qty_cols: 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: 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() file_name = f"Comparison_RA_Bill_{RA_Bill_No}.xlsx" with pd.ExcelWriter(output, engine="xlsxwriter") as writer: @@ -219,4 +279,23 @@ def client_vs_all_subcontractor(): output.seek(0) 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") \ No newline at end of file + 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) diff --git a/app/templates/generate_comparison_client_vs_subcont.html b/app/templates/generate_comparison_client_vs_subcont.html index 9a3e62b..2551b18 100644 --- a/app/templates/generate_comparison_client_vs_subcont.html +++ b/app/templates/generate_comparison_client_vs_subcont.html @@ -1,11 +1,8 @@ {% extends "base.html" %} {% block content %} -
+

File Comparison

-

File Comparison

- - {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} {% for category, message in messages %} @@ -17,27 +14,57 @@ {% endif %} {% endwith %} -
- +
+ + - - - - - - - - +
+
+ +
+
+ +
+
-
+ + {% if tables.tr or tables.mh or tables.dc %} +
+

Comparison Preview

+ + + +
+
+
+ {{ tables.tr|safe }} +
+
+
+
+ {{ tables.mh|safe }} +
+
+
+
+ {{ tables.dc|safe }} +
+
+
+
+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/app/templates/report.html b/app/templates/report.html index 43f04cb..9bf0368 100644 --- a/app/templates/report.html +++ b/app/templates/report.html @@ -2,7 +2,7 @@ {% block content %}
-

Generate Subcontractor Report

+

Generate Subcontractor Report

{% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} @@ -11,12 +11,11 @@ {{ message }}
- ) {% endfor %} {% endif %} {% endwith %} -
+
@@ -28,13 +27,38 @@
-
- - +
+ +
- +
+ + + Required if "Download All" is off. +
+ +
+ + {% endblock %} \ No newline at end of file