Merged pankaj-dev into main

app/models/laying_model.py

@@ -0,0 +1,47 @@
+from app import db
+from datetime import datetime
+
+class Laying(db.Model):
+    __tablename__ = "laying"
+
+    id = db.Column(db.Integer, primary_key=True)
+    #  Foreign Key to Subcontractor table
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    # Relationship for easy access (subcontractor.subcontractor_name)
+    subcontractor = db.relationship("Subcontractor", backref="laying_records")
+
+    # Basic Fields
+    Location = db.Column(db.String(500))
+    MH_NO = db.Column(db.String(100))
+    CC_length = db.Column(db.Float)
+
+    Pipe_Dia_mm = db.Column(db.Float)
+    ID_of_MH_m = db.Column(db.Float)
+    Laying_Length = db.Column(db.Float)
+
+    pipe_150_mm = db.Column(db.Float)
+    pipe_200_mm = db.Column(db.Float)
+    pipe_250_mm = db.Column(db.Float)
+    pipe_300_mm = db.Column(db.Float)
+    pipe_350_mm = db.Column(db.Float)
+    pipe_400_mm = db.Column(db.Float)
+    pipe_450_mm = db.Column(db.Float)
+    pipe_500_mm = db.Column(db.Float)
+    pipe_600_mm = db.Column(db.Float)
+    pipe_700_mm = db.Column(db.Float)
+    pipe_900_mm = db.Column(db.Float)
+    pipe_1200_mm = db.Column(db.Float)
+    
+    
+    Total = db.Column(db.Float)
+    Remarks = db.Column(db.String(500))
+    RA_Bill_No=db.Column(db.String(500))
+    
+    created_at = db.Column(db.DateTime, default=datetime.today)
+
+
+    def __repr__(self):
+        return f"<LayingModel {self.Location}>"
+
+    def serialize(self):
+        return {c.name: getattr(self, c.name) for c in self.__table__.columns}

app/routes/dashboard.py

@@ -27,12 +27,13 @@ def bar_chart():
     plt.xlabel("Category")
     plt.ylabel("Count")
 
+
     return plot_to_base64()
 
 # Pie chart
 def pie_chart():
     labels = ["Completed", "In Progress", "Pending"]
-    sizes = [65, 20, 15]
+    sizes = [55, 20, 25]
 
     plt.figure()
     plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140)

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
@@ -7,6 +9,7 @@ from app.models.mh_ex_client_model import ManholeExcavationClient
 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
+<<<<<<< HEAD
 
 import pandas as pd
 import io
@@ -46,10 +49,112 @@ class SubcontractorBill:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
 
 # --- 3. DEFINE ROUTES ---
+=======
+ 
+# --- BLUEPRINT DEFINITION ---
+file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
+ 
+# --- DATA WRAPPERS ---
+ 
+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])
+ 
+        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)
+ 
+class SubcontractorBill:
+    def __init__(self):
+        self.df_tr = pd.DataFrame()
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
+ 
+    def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
+        filters = {}
+        if subcontractor_id:
+            filters["subcontractor_id"] = subcontractor_id
+        if RA_Bill_No:
+            filters["RA_Bill_No"] = RA_Bill_No
+ 
+        trench = TrenchExcavation.query.filter_by(**filters).all()
+        mh = ManholeExcavation.query.filter_by(**filters).all()
+        dc = ManholeDomesticChamber.query.filter_by(**filters).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])
+ 
+        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)
+ 
+# --- ROUTES ---
+ 
+# @file_report_bp.route("/report", methods=["GET", "POST"])
+# @login_required
+# def report_file():
+#     subcontractors = Subcontractor.query.all()
+#     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"
+ 
+#         if not subcontractor_id:
+#             flash("Please select a subcontractor.", "danger")
+#             return render_template("report.html", subcontractors=subcontractors)
+ 
+#         subcontractor = Subcontractor.query.get(subcontractor_id)
+#         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"
+ 
+#         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")
+ 
+#     return render_template("report.html", subcontractors=subcontractors)
+>>>>>>> pankaj-dev
 @file_report_bp.route("/report", methods=["GET", "POST"])
 @login_required
 def report_file():
     subcontractors = Subcontractor.query.all()
+<<<<<<< HEAD
 
     if request.method == "POST":
         subcontractor_id = request.form.get("subcontractor_id")
@@ -92,23 +197,88 @@ def report_file():
 # (ClientBill class and client_vs_all_subcontractor route would follow here...)
 
 
+=======
+    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)
+ 
+        subcontractor = Subcontractor.query.get(subcontractor_id)
+        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"
+ 
+        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)
+ 
+        # 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)
+ 
+        # PREVIEW LOGIC: Convert DataFrames to HTML for the 'tables' variable
+        # We add bootstrap classes directly to the pandas output
+        table_classes = "table table-hover table-bordered table-striped"
+        tables = {
+            "tr": bill_gen.df_tr.to_html(classes=table_classes, index=False),
+            "mh": bill_gen.df_mh.to_html(classes=table_classes, index=False),
+            "dc": bill_gen.df_dc.to_html(classes=table_classes, index=False)
+        }
+        selected_sc_id = subcontractor_id
+ 
+    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
+    )
+ 
+>>>>>>> pankaj-dev
 @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)
+<<<<<<< HEAD
       
         # GROUP SUBCONTRACTOR DATA
         qty_cols = [
@@ -222,3 +392,53 @@ def client_vs_all_subcontractor():
         )
 
     return render_template("generate_comparison_client_vs_subcont.html")
+=======
+ 
+        # --- 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("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
+ 
+        qty_cols = [...] # (Keep your existing list)
+        mh_dc_qty_cols = [...] # (Keep your existing list)
+ 
+        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()
+ 
+        # 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)
+ 
+        # --- 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"
+ 
+        try:
+            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"))
+        except KeyError as e:
+            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)
+ 
+        # ... (Rest of your calculation and download logic) ...
+ 
+        # 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)
+ 
+    return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)  
+ 
+>>>>>>> pankaj-dev

app/services/file_service.py

@@ -1,19 +1,22 @@
 import os
 import pandas as pd
 from werkzeug.utils import secure_filename
+from app.utils.file_utils import ensure_upload_folder
 
 from app.config import Config
 from app import db
 
+# Subcontractor models import
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
 
+# Client models import
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 
-from app.utils.file_utils import ensure_upload_folder
 
 
 class FileService:
@@ -60,10 +63,12 @@ class FileService:
             df_tr_ex = pd.read_excel(filepath, sheet_name="Tr.Ex.", header=12, dtype={"MH No": str})
             df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=12, dtype={"MH No": str})
             df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=11, dtype={"MH No": str})
+            df_laying = pd.read_excel(filepath, sheet_name="Laying", header=11, dtype={"MH No": str})
 
             self.process_trench_excavation(df_tr_ex, subcontractor_id, RA_Bill_No)
             self.process_manhole_excavation(df_mh_ex, subcontractor_id, RA_Bill_No)
             self.process_manhole_domestic_chamber(df_mh_dc, subcontractor_id, RA_Bill_No)
+            self.process_laying(df_laying, subcontractor_id, RA_Bill_No)
 
             return True, "SUBCONTRACTOR File uploaded successfully."
 
@@ -245,6 +250,66 @@ class FileService:
 
         db.session.commit()
 
+    # ---------------- Laying (Subcontractor) ----------------
+    def process_laying(self, df, subcontractor_id, RA_Bill_No):
+
+        df.columns = (
+            df.columns.astype(str)
+            .str.strip()
+            .str.replace(r"[^\w]", "_", regex=True)
+            .str.replace("__+", "_", regex=True)
+            .str.strip("_")
+        )
+
+        df = df.dropna(how="all")
+
+        if "Location" in df.columns:
+            df["Location"] = df["Location"].ffill()
+
+        errors = []
+
+        for idx, row in df.iterrows():
+            location = self.normalize(row.get("Location"))
+            mh_no = self.normalize(row.get("MH_NO"))
+
+            if not location or not mh_no:
+                continue
+
+            # exists = ManholeDomesticChamber.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()
+
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue
+
+            record_data = {}
+            for col in df.columns:
+                if hasattr(Laying, col):
+                    val = row[col]
+                    if pd.isna(val) or str(val).strip() in ["", "-", "—", "nan"]:
+                        val = None
+                    record_data[col] = val
+
+            record = Laying(
+                subcontractor_id=subcontractor_id,
+                RA_Bill_No=RA_Bill_No,
+                **record_data,
+            )
+            db.session.add(record)
+
+        if errors:
+            raise Exception(" | ".join(errors))
+
+        db.session.commit()
+
+
+
     # ---------------- CLIENT FILE UPLOAD ----------------
     def handle_client_file_upload(self, file, RA_Bill_No):
 

app/templates/dashboard.html

@@ -4,11 +4,12 @@
 
 <div class="container-fluid px-2 px-md-4">
 
-    <h4 class="mb-3 text-center text-md-start">Dashboard</h4>
+    <h4 class="mb-3 text-center text-md-start">Comparison Software Solapur(UGD) </h4>
 
     <!-- Summary Cards -->
     <div class="row g-3 mb-4">
 
+        <!-- Total Work -->
         <div class="col-12 col-md-4">
             <div class="card text-white bg-primary shadow h-100">
                 <div class="card-body text-center text-md-start">
@@ -18,6 +19,7 @@
             </div>
         </div>
 
+        <!-- Completed -->
         <div class="col-12 col-md-4">
             <div class="card text-white bg-success shadow h-100">
                 <div class="card-body text-center text-md-start">
@@ -27,6 +29,7 @@
             </div>
         </div>
 
+        <!-- Pending -->
         <div class="col-12 col-md-4">
             <div class="card text-dark bg-warning shadow h-100">
                 <div class="card-body text-center text-md-start">

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>
-
+                </div>
-                {% for sc in subcontractors %}
+                <div class="col-md-6">
-                <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
+                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
-                {% endfor %}
+                        Report</button>
-            </select> -->
+                </div>
-
+            </div>
-            <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>
+
+    {% 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,7 +2,11 @@
 
 {% block content %}
 <div class="container mt-4">
+<<<<<<< HEAD
     <h2 class="mb-4">Generate Subcontractor Report</h2>
+=======
+    <h2 class="mb-4 text-center">Generate Subcontractor Report</h2>
+>>>>>>> pankaj-dev
 
     {% with messages = get_flashed_messages(with_categories=true) %}
         {% if messages %}
@@ -16,13 +20,19 @@
         {% endif %}
     {% endwith %}
 
+<<<<<<< HEAD
     <div class="card p-4 shadow-sm">
         <form method="POST">
+=======
+    <div class="card p-4 shadow-sm mx-auto" style="max-width: 600px;">
+        <form method="POST" id="reportForm">
+>>>>>>> pankaj-dev
             <div class="mb-3">
                 <label class="form-label fw-semibold">Select Subcontractor</label>
                 <select name="subcontractor_id" class="form-select" required>
                     <option value="">-- Select Subcontractor --</option>
                     {% for sc in subcontractors %}
+<<<<<<< HEAD
                     <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
                     {% endfor %}
                 </select>
@@ -34,7 +44,118 @@
             </div>
 
             <button type="submit" class="btn btn-primary w-100">Generate Excel Report</button>
+=======
+                    <option value="{{ sc.id }}" {% if selected_sc_id==sc.id|string %}selected{% endif %}>
+                        {{ sc.subcontractor_name }}
+                    </option>
+                    {% endfor %}
+                </select>
+            </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>
+>>>>>>> pankaj-dev
         </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 %}