app/routes/file_report.py

@@ -1,3 +1,5 @@
+import pandas as pd
+import io
 from flask import Blueprint, render_template, request, send_file, flash
 from app.models.subcontractor_model import Subcontractor
 from app.models.manhole_excavation_model import ManholeExcavation
@@ -8,296 +10,232 @@ from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 from app.utils.helpers import login_required
  
-import pandas as pd
+# --- BLUEPRINT DEFINITION ---
-import io
-from enum import Enum
-
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
  
-class BillType(Enum):
+# --- DATA WRAPPERS ---
-    Client = 1
-    Subcontractor = 2
  
-class SubcontractorBill:
+class ClientBill:
-    df_tr = []
+    def __init__(self):
-    df_mh = []
+        self.df_tr = pd.DataFrame()
-    df_dc =[]
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
  
     def Fetch(self, RA_Bill_No):
-              # CLIENT DATA (RA BILL WISE)
+        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()
  
-        trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
-        mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
-        dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
  
-        self.df_tr = pd.DataFrame([c.__dict__ for c in trench])
+        if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
-        self.df_mh = pd.DataFrame([c.__dict__ for c in mh])
+            self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
-        self.df_dc = pd.DataFrame([c.__dict__ for c in dc])
-
-        # CLEAN COLUMNS
-        drop_cols = ["id","created_at","Remarks","_sa_instance_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)
  
-        mh_exc_columns = [
+class SubcontractorBill:
-            "Location", "MH_NO", "Upto_IL_Depth", "Cutting_Depth", "ID_of_MH_m",
+    def __init__(self):
-            "Ex_Dia_of_Manhole", "Area_of_Manhole",
+        self.df_tr = pd.DataFrame()
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
  
-            "Soft_Murum_0_to_1_5", "Soft_Murum_1_5_to_3_0", "Soft_Murum_3_0_to_4_5",
+    def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
-            "Hard_Murum_0_to_1_5", "Hard_Murum_1_5_to_3_0",
+        filters = {}
-            "Soft_Rock_0_to_1_5", "Soft_Rock_1_5_to_3_0",
+        if subcontractor_id:
-            "Hard_Rock_0_to_1_5", "Hard_Rock_1_5_to_3_0",
+            filters["subcontractor_id"] = subcontractor_id
-            "Hard_Rock_3_0_to_4_5", "Hard_Rock_4_5_to_6_0", "Hard_Rock_6_0_to_7_5",
+        if RA_Bill_No:
+            filters["RA_Bill_No"] = RA_Bill_No
  
-            "Soft_Murum_0_to_1_5_total", "Soft_Murum_1_5_to_3_0_total",
+        trench = TrenchExcavation.query.filter_by(**filters).all()
-            "Soft_Murum_3_0_to_4_5_total",
+        mh = ManholeExcavation.query.filter_by(**filters).all()
-            "Hard_Murum_0_to_1_5_total", "Hard_Murum_1_5_and_above_total",
+        dc = ManholeDomesticChamber.query.filter_by(**filters).all()
-            "Soft_Rock_0_to_1_5_total", "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total", "Hard_Rock_1_5_and_above_total",
-            "Hard_Rock_3_0_to_4_5_total", "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total",
  
-            "Remarks", "Total"
+        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])
  
-        trench_columns = [
+        if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
-            "Location", "MH_NO", "CC_length", "Invert_Level", "MH_Top_Level",
+            self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
-            "Ground_Level", "ID_of_MH_m", "Actual_Trench_Length", "Pipe_Dia_mm",
  
-            "Width_0_to_2_5", "Width_2_5_to_3_0", "Width_3_0_to_4_5", "Width_4_5_to_6_0",
+        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)
  
-            "Upto_IL_Depth", "Cutting_Depth", "Avg_Depth",
+# --- ROUTES ---
  
-            "Soft_Murum_0_to_1_5", "Soft_Murum_1_5_to_3_0", "Soft_Murum_3_0_to_4_5",
+# @file_report_bp.route("/report", methods=["GET", "POST"])
-            "Hard_Murum_0_to_1_5", "Hard_Murum_1_5_to_3_0",
+# @login_required
-            "Soft_Rock_0_to_1_5", "Soft_Rock_1_5_to_3_0",
+# def report_file():
-            "Hard_Rock_0_to_1_5", "Hard_Rock_1_5_to_3_0",
+#     subcontractors = Subcontractor.query.all()
-            "Hard_Rock_3_0_to_4_5", "Hard_Rock_4_5_to_6_0", "Hard_Rock_6_0_to_7_5",
+#     if request.method == "POST":
+#         subcontractor_id = request.form.get("subcontractor_id")
+#         ra_bill_no = request.form.get("ra_bill_no")
+#         download_all = request.form.get("download_all") == "true"
  
-            "Soft_Murum_0_to_1_5_total", "Soft_Murum_1_5_to_3_0_total",
+#         if not subcontractor_id:
-            "Soft_Murum_3_0_to_4_5_total",
+#             flash("Please select a subcontractor.", "danger")
-            "Hard_Murum_0_to_1_5_total", "Hard_Murum_1_5_and_above_total",
+#             return render_template("report.html", subcontractors=subcontractors)
-            "Soft_Rock_0_to_1_5_total", "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total", "Hard_Rock_1_5_and_above_total",
-            "Hard_Rock_3_0_to_4_5_total", "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total",
  
-            "Remarks", "Total"
+#         subcontractor = Subcontractor.query.get(subcontractor_id)
-        ]
+#         bill_gen = SubcontractorBill()
  
-        domestic_columns = [
+#         if download_all:
-            "Location", "Node_No", "Depth_of_MH",
+#             bill_gen.Fetch(subcontractor_id=subcontractor_id)
-            "d_0_to_0_75", "d_1_06_to_1_65", "d_1_66_to_2_15",
+#             file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
-            "d_2_16_to_2_65", "d_2_66_to_3_15", "d_3_16_to_3_65",
+#         else:
-            "d_3_66_to_4_15", "d_4_16_to_4_65", "d_4_66_to_5_15",
+#             if not ra_bill_no:
-            "d_5_16_to_5_65", "d_5_66_to_6_15", "d_6_16_to_6_65",
+#                 flash("Please enter an RA Bill Number.", "danger")
-            "d_6_66_to_7_15", "d_7_16_to_7_65", "d_7_66_to_8_15",
+#                 return render_template("report.html", subcontractors=subcontractors)
-            "d_8_16_to_8_65", "d_8_66_to_9_15", "d_9_16_to_9_65",
+#             bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
-            "Domestic_Chambers"
+#             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)
  
+#         output = io.BytesIO()
+#         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")
  
-        # Reorder columns serial wise 
+#     return render_template("report.html", subcontractors=subcontractors)
-        df_mh_exc = self.df_mh.reindex(columns=mh_exc_columns, fill_value="")
-        df_trench = self.df_tr.reindex(columns=trench_columns, fill_value="")
-        df_domestic = self.df_dc.reindex(columns=domestic_columns, fill_value="")
-
-        
-
-# get report by contractor id and dowanload
 @file_report_bp.route("/report", methods=["GET", "POST"])
 @login_required
 def report_file():
     subcontractors = Subcontractor.query.all()
+    tables = None  # Match the variable name used in HTML
+    selected_sc_id = None
+    ra_bill_no = None
+    download_all = False
  
     if request.method == "POST":
         subcontractor_id = request.form.get("subcontractor_id")
+        ra_bill_no = request.form.get("ra_bill_no")
+        download_all = request.form.get("download_all") == "true"
+        action = request.form.get("action")
  
         if not subcontractor_id:
             flash("Please select a subcontractor.", "danger")
             return render_template("report.html", subcontractors=subcontractors)
  
-        # Fetch subcontractor for file name
         subcontractor = Subcontractor.query.get(subcontractor_id)
-        subcontractorBill = SubcontractorBill()
+        bill_gen = SubcontractorBill()
  
+        if download_all:
+            bill_gen.Fetch(subcontractor_id=subcontractor_id)
+            file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
+        else:
+            if not ra_bill_no:
+                flash("Please enter an RA Bill Number.", "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"
  
-        #  WRITE EXCEL FILE
+        if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
-        output = io.BytesIO()
+            flash("No data found for this selection.", "warning")
-        file_name = f"{subcontractor.subcontractor_name}_Report.xlsx"
-
-        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            subcontractorBill.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
-            subcontractorBill.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
-            subcontractorBill.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 render_template("report.html", subcontractors=subcontractors)
  
+        # If download is clicked, return file immediately
+        if action == "download":
+            output = io.BytesIO()
+            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)
  
-class ClientBill:
+        # PREVIEW LOGIC: Convert DataFrames to HTML for the 'tables' variable
-    df_tr = []
+        # We add bootstrap classes directly to the pandas output
-    df_mh = []
+        table_classes = "table table-hover table-bordered table-striped"
-    df_dc =[]
+        tables = {
-
+            "tr": bill_gen.df_tr.to_html(classes=table_classes, index=False),
-    def Fetch(self, RA_Bill_No):
+            "mh": bill_gen.df_mh.to_html(classes=table_classes, index=False),
-              # CLIENT DATA (RA BILL WISE)
+            "dc": bill_gen.df_dc.to_html(classes=table_classes, index=False)
- 
+        }
-        trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        selected_sc_id = subcontractor_id
-        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.__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])
-
-        # CLEAN COLUMNS
-        drop_cols = ["id","created_at","Remarks","_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)
-
  
+    return render_template(
+        "report.html",
+        subcontractors=subcontractors,
+        tables=tables,  # This now matches your HTML
+        selected_sc_id=selected_sc_id,
+        ra_bill_no=ra_bill_no,
+        download_all=download_all
+    )
  
 @file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
 @login_required
 def client_vs_all_subcontractor():
-    
+    tables = {"tr": None, "mh": None, "dc": None}
+    ra_val = ""
  
     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 select 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", 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)
  
-        # GROUP SUBCONTRACTOR DATA
+        # --- SAFETY CHECK: Verify data exists before merging ---
-        qty_cols = [
+        if clientBill.df_tr.empty and clientBill.df_mh.empty:
-            "Soft_Murum_0_to_1_5_total",
+            flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
-            "Soft_Murum_1_5_to_3_0_total",
+            return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
-            "Soft_Murum_3_0_to_4_5_total",
-            "Hard_Murum_0_to_1_5_total",
-            "Hard_Murum_1_5_and_above_total",
-            "Soft_Rock_0_to_1_5_total",
-            "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total",
-            "Hard_Rock_1_5_to_3_0_total",
-            "Hard_Rock_3_0_to_4_5_total",
-            "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total"
-        ]
  
-        mh_dc_qty_cols = [
+        qty_cols = [...] # (Keep your existing list)
-            "d_0_to_0_75",
+        mh_dc_qty_cols = [...] # (Keep your existing list)
-            "d_0_76_to_1_05",
-            "d_1_06_to_1_65",
-            "d_1_66_to_2_15",
-            "d_2_16_to_2_65",
-            "d_2_66_to_3_15",
-            "d_3_16_to_3_65",
-            "d_3_66_to_4_15",
-            "d_4_16_to_4_65",
-            "d_4_66_to_5_15",
-            "d_5_16_to_5_65",
-            "d_5_66_to_6_15",
-            "d_6_16_to_6_65",
-            "d_6_66_to_7_15",
-            "d_7_16_to_7_65",
-            "d_7_66_to_8_15",
-            "d_8_16_to_8_65",
-            "d_8_66_to_9_15",
-            "d_9_16_to_9_65",
-            "Domestic_Chambers"
-        ]
  
-        df_sub_tr_grp = (contractorBill.df_tr.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
+        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" # Fill missing join keys
+            return df.groupby(group_cols, as_index=False)[existing_cols].sum()
  
-        df_sub_mh_grp = (contractorBill.df_mh.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
+        # 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", "Node_No"], mh_dc_qty_cols)
  
-        df_sub_dc_grp = (contractorBill.df_dc.groupby(["Location", "Node_No"], as_index=False)[mh_dc_qty_cols].sum())
+        # --- 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]:
+            if not df_client.empty and "Location" not in df_client.columns:
+                df_client["Location"] = "Unknown"
  
-        # MERGE CLIENT VS SUBCONTRACTOR
+        try:
-        df_tr_cmp = clientBill.df_tr.merge(
+            df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-            df_sub_tr_grp,
+            df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-            on=["Location", "MH_NO"],
+            df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "Node_No"], how="left", suffixes=("_Client", "_Sub"))
-            how="left",
+        except KeyError as e:
-            suffixes=("_Client", "_Sub")
+            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)
  
-        df_mh_cmp = clientBill.df_mh.merge(
+        # ... (Rest of your calculation and download logic) ...
-            df_sub_mh_grp,
-            on=["Location", "MH_NO"],
-            how="left",
-            suffixes=("_Client", "_Sub")
-        )
  
-        if "MH_NO" in clientBill.df_dc.columns:
+        # Convert to HTML for preview
-            clientBill.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
+        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)
  
-        df_dc_cmp = clientBill.df_dc.merge(
+    return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)  
-            df_sub_dc_grp,
-            on=["Location", "Node_No"],
-            how="left",
-            suffixes=("_Client", "_Sub")
-        )
  
-        # CALCULATE DIFFERENCE
-        for col in qty_cols:
-            if f"{col}_Client" in df_tr_cmp.columns:
-                df_tr_cmp[f"{col}_Diff"] = (
-                    df_tr_cmp[f"{col}_Client"].fillna(0)
-                    - df_tr_cmp[f"{col}_Sub"].fillna(0)
-                )
-
-                print("Sum of df_tr_cmp::",df_tr_cmp)
-
-                df_mh_cmp[f"{col}_Diff"] = (
-                    df_mh_cmp[f"{col}_Client"].fillna(0)
-                    - df_mh_cmp[f"{col}_Sub"].fillna(0)
-                )
-                print("Sum of df_mh_cmp::",df_mh_cmp)
-
-
-        df_dc_cmp["Domestic_Chambers_Diff"] = (
-            df_dc_cmp["Domestic_Chambers_Client"].fillna(0)
-            - df_dc_cmp["Domestic_Chambers_Sub"].fillna(0)
-        )
-
-       
-        # EXPORT EXCEL
-        output = io.BytesIO()
-        file_name = f"Client_vs_All_Subcontractor_RA_{RA_Bill_No}.xlsx"
-
-        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            df_tr_cmp.to_excel(writer, sheet_name="Tr.Ex", index=False)
-            df_mh_cmp.to_excel(writer, sheet_name="Mh.Ex", index=False)
-            df_dc_cmp.to_excel(writer, sheet_name="MH & DC", index=False)
-
-        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")

app/templates/generate_comparison_client_vs_subcont.html

@@ -1,11 +1,9 @@
 {% extends "base.html" %}
 
 {% 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) %}
     {% if messages %}
     {% for category, message in messages %}
@@ -17,27 +15,62 @@
     {% endif %}
     {% endwith %}
 
-    <div class="card p-4 shadow-sm">
+    <div class="card p-4 shadow-sm mb-5">
-
         <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
-                <option value="">-- Select Subcontractor --</option>
+                        Data</button>
-
-                {% for sc in subcontractors %}
-                <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
-                {% endfor %}
-            </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>
-
                 </div>
+                <div class="col-md-6">
+                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
+                        Report</button>
+                </div>
+            </div>
+        </form>
+    </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>
 {% endblock %}

app/templates/report.html

@@ -2,10 +2,8 @@
 
 {% block content %}
 <div class="container mt-4">
+    <h2 class="mb-4 text-center">Generate Subcontractor Report</h2>
 
-    <h2 class="mb-4">File Report</h2>
-
-    <!-- FLASH MESSAGES -->
     {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
     {% for category, message in messages %}
@@ -17,23 +15,123 @@
     {% endif %}
     {% endwith %}
 
-    <div class="card p-4 shadow-sm">
+    <div class="card p-4 shadow-sm mx-auto" style="max-width: 600px;">
-
+        <form method="POST" id="reportForm">
-        <form method="POST">
+            <div class="mb-3">
-
-            <!-- SELECT SUBCONTRACTOR -->
                 <label class="form-label fw-semibold">Select Subcontractor</label>
-            <select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
+                <select name="subcontractor_id" class="form-select" required>
                     <option value="">-- Select Subcontractor --</option>
-
                     {% for sc in subcontractors %}
-                <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
+                    <option value="{{ sc.id }}" {% if selected_sc_id==sc.id|string %}selected{% endif %}>
+                        {{ sc.subcontractor_name }}
+                    </option>
                     {% endfor %}
                 </select>
-
-            <button class="btn btn-primary w-100">Generate Report</button>
-        </form>
-
             </div>
+
+            <div class="form-check form-switch mb-3">
+                <input class="form-check-input" type="checkbox" name="download_all" value="true" id="downloadAllSwitch"
+                    onchange="toggleRAInput(this)" {% if download_all %}checked{% endif %}>
+                <label class="form-check-label fw-bold text-primary" for="downloadAllSwitch">
+                    Download All RA Bills for this Contractor
+                </label>
+            </div>
+
+            <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"
+                    value="{{ ra_bill_no or '' }}">
+                <small class="text-muted">Required if "Download All" is off.</small>
+            </div>
+
+            <div class="row g-2">
+                <div class="col-md-6">
+                    <button type="submit" name="action" value="preview" class="btn btn-outline-primary w-100 py-2">
+                        <i class="fas fa-eye me-2"></i>Preview Data
+                    </button>
+                </div>
+                <div class="col-md-6">
+                    <button type="submit" name="action" value="download" class="btn btn-primary w-100 py-2">
+                        <i class="fas fa-download me-2"></i>Download Excel
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    {% if tables %}
+    <div class="mt-5 mb-5">
+        <hr>
+        <h3 class="text-center mb-4">Report Preview</h3>
+
+        <div class="card shadow-sm">
+            <div class="card-header bg-light">
+                <ul class="nav nav-tabs card-header-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">Transport (Tr.Ex.)</button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh"
+                            type="button">Manpower (MH.Ex.)</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</button>
+                    </li>
+                </ul>
+            </div>
+            <div class="card-body tab-content" id="reportTabsContent">
+                <div class="tab-pane fade show active" id="tr" role="tabpanel">
+                    <div class="table-responsive">
+                        {{ tables.tr | safe }}
+                    </div>
+                </div>
+                <div class="tab-pane fade" id="mh" role="tabpanel">
+                    <div class="table-responsive">
+                        {{ tables.mh | safe }}
+                    </div>
+                </div>
+                <div class="tab-pane fade" id="dc" role="tabpanel">
+                    <div class="table-responsive">
+                        {{ tables.dc | safe }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    {% endif %}
 </div>
+
+<style>
+    /* Styling specifically for pandas output */
+    .table-responsive .table {
+        font-size: 0.9rem;
+        white-space: nowrap;
+    }
+
+    .table-responsive thead {
+        background-color: #f8f9fa;
+    }
+</style>
+
+<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";
+        }
+    }
+
+    // Check status on load to handle form persistence
+    document.addEventListener("DOMContentLoaded", function () {
+        toggleRAInput(document.getElementById('downloadAllSwitch'));
+    });
+</script>
 {% endblock %}