Merge pull request 'Dowload report of client report fix' (#10) from dev-anish into main

Reviewed-on: #10

.env

@@ -0,0 +1,26 @@
+# -----------------------------
+# Flask App Configuration
+# -----------------------------
+FLASK_ENV=development
+FLASK_DEBUG=True
+FLASK_HOST='0.0.0.0'
+FLASK_PORT=5001
+
+# -----------------------------
+# Security
+# -----------------------------
+SECRET_KEY=change-this-to-strong-secret-key
+
+# -----------------------------
+# Database Configuration
+# -----------------------------
+DB_DIALECT=mysql
+DB_DRIVER=pymysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_NAME=comparisondb
+DB_USER=root
+DB_PASSWORD=root
+
+# DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
+

app/routes/dashboard.py

@@ -66,3 +66,17 @@ def dashboard():
         pie_chart=pie_chart(),
         histogram=histogram_chart()
     )
+
+# subcontractor dashboard
+@dashboard_bp.route("/subcontractor_dashboard")
+def subcontractor_dashboard():
+    if not session.get("user_id"):
+        return redirect(url_for("auth.login"))
+
+    return render_template(
+        "subcontractor_dashboard.html",
+        title="Dashboard",
+        bar_chart=bar_chart(),
+        pie_chart=pie_chart(),
+        histogram=histogram_chart()
+    )

app/routes/file_import.py

@@ -5,7 +5,8 @@ from app.utils.helpers import login_required
 
 file_import_bp = Blueprint("file_import", __name__, url_prefix="/file")
 
-@file_import_bp.route("/import", methods=["GET", "POST"])
+# this is contractractor immport routes
+@file_import_bp.route("/import_Subcontractor", methods=["GET", "POST"])
 @login_required
 def import_file():
     subcontractors = Subcontractor.query.all()
@@ -21,13 +22,13 @@ def import_file():
         flash(msg, "success" if success else "danger")
 
     return render_template(
-        "file_import.html",
+        "file_import_subcontractor.html",
         title="Sub-cont. File Import",
         subcontractors=subcontractors
     )
 
 
-# this route import client files
+# this is client import routes
 @file_import_bp.route("/import_client", methods=["GET", "POST"])
 @login_required
 def client_import_file():

app/routes/file_report.py

@@ -13,53 +13,8 @@ from app.models.laying_model import Laying
 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
-<<<<<<< HEAD
-from app.utils.helpers import login_required
-<<<<<<< HEAD
-
-import pandas as pd
-import io
-from enum import Enum
-
-# --- 1. DEFINE BLUEPRINT FIRST (Prevents NameError) ---
-file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
-
-class BillType(Enum):
-    Client = 1
-    Subcontractor = 2
-
-# --- 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()
-
-        # 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])
-
-        # 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 ---
-=======
-=======
 from app.models.laying_client_model import LayingClient
 
->>>>>>> pankaj-dev
  
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
@@ -118,109 +73,12 @@ class SubcontractorBill:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
  
-<<<<<<< HEAD
-<<<<<<< HEAD
-# --- 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
-=======
-
->>>>>>> pankaj-dev
-=======
 # --- subcontractor report only  ---
->>>>>>> pankaj-dev
-@file_report_bp.route("/report", methods=["GET", "POST"])
+@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
 @login_required
 def report_file():
     subcontractors = Subcontractor.query.all()
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-    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
-
-        if not subcontractor_id or not ra_bill_no:
-            flash("Please select a subcontractor and enter an RA Bill Number.", "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 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")
-            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 render_template("report.html", subcontractors=subcontractors)
-
-# (ClientBill class and client_vs_all_subcontractor route would follow here...)
-
-
-=======
-    tables = None  # Match the variable name used in HTML
-=======
     tables = None 
->>>>>>> pankaj-dev
     selected_sc_id = None
     ra_bill_no = None
     download_all = False
@@ -264,7 +122,6 @@ def report_file():
             return send_file(output, download_name=file_name, as_attachment=True)
  
         # We add bootstrap classes directly to the pandas output
-        # table_classes = "table table-hover table-bordered table-striped"
         table_classes = "table table-bordered table-striped table-hover table-sm mb-0"
         tables = {
             "tr": bill_gen.df_tr.to_html(classes=table_classes, index=False),
@@ -275,7 +132,7 @@ def report_file():
         selected_sc_id = subcontractor_id
  
     return render_template(
-        "report.html",
+        "subcontractor_report.html",
         subcontractors=subcontractors,
         tables=tables,
         selected_sc_id=selected_sc_id,
@@ -283,190 +140,91 @@ def report_file():
         download_all=download_all
     )
  
-<<<<<<< HEAD
->>>>>>> pankaj-dev
-=======
-# --- client comparison --- 
->>>>>>> pankaj-dev
-@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
+# --- client report only --- 
+@file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
 def client_vs_all_subcontractor():
-    tables = {"tr": None, "mh": None, "dc": None}
+    # Initialize dictionary keys to match HTML variables
+    tables = {"tr": None, "mh": None, "dc": None, "laying": 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("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
+            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)
-<<<<<<< HEAD
 
-        # GROUP SUBCONTRACTOR DATA
-        qty_cols = [
-            "Soft_Murum_0_to_1_5_total",
-            "Soft_Murum_1_5_to_3_0_total",
-            "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 = [
-            "d_0_to_0_75",
-            "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())
-
-        df_sub_mh_grp = (contractorBill.df_mh.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
-
-        df_sub_dc_grp = (contractorBill.df_dc.groupby(["Location", "Node_No"], as_index=False)[mh_dc_qty_cols].sum())
-
-        # MERGE CLIENT VS SUBCONTRACTOR
-        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")
-        )
-
-        if "MH_NO" in clientBill.df_dc.columns:
-            clientBill.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
-
-        df_dc_cmp = clientBill.df_dc.merge(
-            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")
-=======
- 
-        # --- SAFETY CHECK: Verify data exists before merging ---
-        if clientBill.df_tr.empty and clientBill.df_mh.empty:
+        # Safety Check: Verify if data exists
+        if clientBill.df_tr.empty and clientBill.df_mh.empty and clientBill.df_laying.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)
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
 
-        qty_cols = [...] # (Keep your existing list)
-        mh_dc_qty_cols = [...] # (Keep your existing list)
+        # 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"]
 
         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
+                    df[col] = "N/A"
             return df.groupby(group_cols, as_index=False)[existing_cols].sum()
 
-        # Aggregate data
+        # Aggregate data from Subcontractor tables
         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 = 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)
 
-        # --- 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]:
+        # 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]:
             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", "Node_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)}. 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)
+            flash(f"Merge Error: Missing column {str(e)}", "danger")
+            return render_template("client_report.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
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)

app/routes/generate_comparison_report.py

@@ -4,11 +4,15 @@ import io
 
 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
-from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.manhole_excavation_model import ManholeExcavation
-from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
+
+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.models.laying_client_model import LayingClient
+
 from app.utils.helpers import login_required
 
 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
@@ -191,6 +195,13 @@ def comparison_report():
         ).all()]
         df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
 
+        lay_client = [r.serialize() for r in LayingClient.query.all()]
+        lay_sub = [r.serialize() for r in Laying.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()]
+        df_lay = build_comparison(lay_client, lay_sub, "MH_NO")
+
+
         # -------- EXCEL --------
         output = io.BytesIO()
         filename = f"{subcontractor.subcontractor_name}_Comparison_Report.xlsx"
@@ -199,6 +210,7 @@ def comparison_report():
             write_sheet(writer, df_tr, "Tr.Ex", subcontractor.subcontractor_name)
             write_sheet(writer, df_mh, "Mh.Ex", subcontractor.subcontractor_name)
             write_sheet(writer, df_dc, "MH & DC", subcontractor.subcontractor_name)
+            write_sheet(writer, df_lay, "Laying", subcontractor.subcontractor_name)
 
         output.seek(0)
         return send_file(

app/routes/subcontractor_routes.py

@@ -10,21 +10,42 @@ subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontract
 @login_required
 def add_subcontractor():
     return render_template("subcontractor/add.html")
-
 @subcontractor_bp.route("/save", methods=["POST"])
 @login_required
 def save_subcontractor():
-    subcontractor = Subcontractor(
-        subcontractor_name=request.form.get("subcontractor_name"),
-        contact_person=request.form.get("contact_person"),
-        mobile_no=request.form.get("mobile_no"),
-        email_id=request.form.get("email_id"),
-        gst_no=request.form.get("gst_no")
-    )
-    db.session.add(subcontractor)
-    db.session.commit()
+    # 1. Get and clean the name from the form
+    name = request.form.get("subcontractor_name", "").strip()
+ 
+    # 2. Basic validation: Ensure the name isn't empty
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+ 
+    # 3. Check if a subcontractor with this name already exists
+    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
+ 
+    if existing_sub:
+        flash(f"Subcontractor with name '{name}' already exists!", "danger")
+        return redirect("/subcontractor/add")
+ 
+    # 4. If no duplicate is found, proceed to save
+    try:
+        subcontractor = Subcontractor(
+            subcontractor_name=name,
+            contact_person=request.form.get("contact_person"),
+            mobile_no=request.form.get("mobile_no"),
+            email_id=request.form.get("email_id"),
+            gst_no=request.form.get("gst_no")
+        )
+       
+        db.session.add(subcontractor)
+        db.session.commit()
+        flash("Subcontractor added successfully!", "success")
+       
+    except Exception as e:
+        db.session.rollback()
+        flash("An error occurred while saving. Please try again.", "danger")
  
-    flash("Subcontractor added successfully!", "success")
     return redirect("/subcontractor/list")
  
 # ---------------- LIST -----------------
@@ -46,12 +67,19 @@ def edit_subcontractor(id):
 @login_required
 def update_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
+    new_name = request.form.get("subcontractor_name")
  
-    subcontractor.subcontractor_name = request.form.get("subcontractor_name")
-    subcontractor.contact_person = request.form.get("contact_person")
-    subcontractor.mobile_no = request.form.get("mobile_no")
-    subcontractor.email_id = request.form.get("email_id")
-    subcontractor.gst_no = request.form.get("gst_no")
+    # Check if the new name is taken by someone ELSE (not this current ID)
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
+ 
+    if duplicate:
+        flash("Another subcontractor already uses this name.", "danger")
+        return redirect(f"/subcontractor/edit/{id}")
+ 
+    subcontractor.subcontractor_name = new_name
    
     db.session.commit()
    
@@ -69,3 +97,95 @@ def delete_subcontractor(id):
  
     flash("Subcontractor deleted successfully!", "success")
     return redirect("/subcontractor/list")
+from flask import Blueprint, render_template, request, redirect, flash
+from app import db
+from app.models.subcontractor_model import Subcontractor
+from app.utils.helpers import login_required
+ 
+subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
+ 
+# ---------------- ADD -----------------
+@subcontractor_bp.route("/add")
+@login_required
+def add_subcontractor():
+    return render_template("subcontractor/add.html")
+
+@subcontractor_bp.route("/save", methods=["POST"])
+@login_required
+def save_subcontractor():
+    name = request.form.get("subcontractor_name", "").strip()
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
+ 
+    if existing_sub:
+        flash(f"Subcontractor with name '{name}' already exists!", "danger")
+        return redirect("/subcontractor/add")
+    try:
+        subcontractor = Subcontractor(
+            subcontractor_name=name,
+            contact_person=request.form.get("contact_person"),
+            mobile_no=request.form.get("mobile_no"),
+            email_id=request.form.get("email_id"),
+            gst_no=request.form.get("gst_no")
+        )
+       
+        db.session.add(subcontractor)
+        db.session.commit()
+        flash("Subcontractor added successfully!", "success")
+       
+    except Exception as e:
+        db.session.rollback()
+        flash("An error occurred while saving. Please try again.", "danger")
+ 
+    return redirect("/subcontractor/list")
+ 
+# ---------------- LIST -----------------
+@subcontractor_bp.route("/list")
+@login_required
+def subcontractor_list():
+    subcontractors = Subcontractor.query.all()
+    return render_template("subcontractor/list.html", subcontractors=subcontractors)
+ 
+# ---------------- EDIT -----------------
+@subcontractor_bp.route("/edit/<int:id>")
+@login_required
+def edit_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+    return render_template("subcontractor/edit.html", subcontractor=subcontractor)
+ 
+# ---------------- UPDATE -----------------
+@subcontractor_bp.route("/update/<int:id>", methods=["POST"])
+@login_required
+def update_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+    new_name = request.form.get("subcontractor_name")
+ 
+    # Check if the new name is taken by someone ELSE (not this current ID)
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
+ 
+    if duplicate:
+        flash("Another subcontractor already uses this name.", "danger")
+        return redirect(f"/subcontractor/edit/{id}")
+ 
+    subcontractor.subcontractor_name = new_name
+    db.session.commit()
+   
+    flash("Subcontractor updated successfully!", "success")
+    return redirect("/subcontractor/list")
+ 
+# ---------------- DELETE -----------------
+@subcontractor_bp.route("/delete/<int:id>")
+@login_required
+def delete_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+
+    db.session.delete(subcontractor)
+    db.session.commit()
+
+    flash("Subcontractor deleted successfully!", "success")
+    return redirect("/subcontractor/list")

app/templates/base.html

@@ -68,15 +68,22 @@
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
-                                <a class="dropdown-item" href="/file/import">
+                                <a class="dropdown-item" href="/file/import_Subcontractor">
                                     <i class="bi bi-upload me-2"></i> Import File
                                 </a>
                             </li>
                             <li>
-                                <a class="dropdown-item" href="/file/report">
+                                <a class="dropdown-item" href="/file/Subcontractor_report">
                                     <i class="bi bi-download me-2"></i> Show Reports
                                 </a>
                             </li>
+
+                            <li>
+                                <a class="dropdown-item" href="/dashboard/subcontractor_dashboard">
+                                    <i class="bi bi-speedometer2 me-2"></i> Subcontractor Dashboard
+                                </a>
+                            </li>
+
                         </ul>
                     </li>
 
@@ -93,7 +100,7 @@
                             </li>
 
                             <li>
-                                <a class="dropdown-item" href="/file/client_vs_subcont">
+                                <a class="dropdown-item" href="/file/client_report">
                                     <i class="bi bi-arrow-left-right me-2"></i> Show Report
                                 </a>
                             </li>

app/templates/client_report.html

@@ -33,23 +33,26 @@
         </form>
     </div>
 
-    {% if tables.tr or tables.mh or tables.dc %}
+    {% if tables.tr or tables.mh or tables.dc or tables.laying %}
     <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>
+                    type="button">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">Mh.Ex
-                    Comparison</button>
+                    </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>
+                    </button>
             </li>
+            <li class="nav-item">
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                    & Bedding </button>
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">
@@ -68,6 +71,11 @@
                     {{ tables.dc|safe }}
                 </div>
             </div>
+            <div class="tab-pane fade" id="laying" role="tabpanel">
+                <div class="table-responsive" style="max-height: 500px;">
+                    {{ tables.laying|safe }}
+                </div>
+
         </div>
     </div>
     {% endif %}

app/templates/dashboard.html

@@ -13,8 +13,8 @@
         <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">
-                    <h6>Total Work</h6>
-                    <h3 class="fw-bold">410</h3>
+                    <h6>Test Total Work</h6>
+                    <h3 class="fw-bold">30%</h3>
                 </div>
             </div>
         </div>
@@ -23,8 +23,8 @@
         <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">
-                    <h6>Completed</h6>
-                    <h3 class="fw-bold">265</h3>
+                    <h6>test Completed</h6>
+                    <h3 class="fw-bold">35%</h3>
                 </div>
             </div>
         </div>
@@ -34,7 +34,7 @@
             <div class="card text-dark bg-warning shadow h-100">
                 <div class="card-body text-center text-md-start">
                     <h6>Pending</h6>
-                    <h3 class="fw-bold">145</h3>
+                    <h3 class="fw-bold">35%</h3>
                 </div>
             </div>
         </div>

app/templates/subcontractor_dashboard.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<div class="container-fluid px-2 px-md-4">
+
+    <h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
+
+    <!-- Charts -->
+    <div class="row g-3">
+
+        <!-- Bar Chart -->
+        <div class="col-12 col-md-6">
+            <div class="card shadow-sm h-100">
+                <div class="card-header bg-dark text-white text-center text-md-start">
+                    Work Category Bar Chart
+                </div>
+                <div class="card-body text-center">
+                    <img src="data:image/png;base64,{{ bar_chart }}" class="img-fluid" style="max-height:300px;">
+                </div>
+            </div>
+        </div>
+
+
+    </div>
+
+</div>
+
+{% endblock %}

app/templates/subcontractor_report.html

@@ -1,34 +1,6 @@
 {% extends "base.html" %}
 
 {% block content %}
-<<<<<<< HEAD
-<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 %}
-            {% for category, message in messages %}
-                <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-                    {{ message }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                </div>
-            )
-            {% endfor %}
-        {% 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="container my-4">
 
     <h2 class="text-center mb-4">Generate Subcontractor Report</h2>
@@ -37,25 +9,11 @@
     <div class="card shadow-sm p-3 p-md-4 mx-auto" style="max-width:600px;">
         <form method="POST">
 
->>>>>>> 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>
-            </div>
-
-            <div class="mb-3">
-                <label class="form-label fw-semibold">RA Bill Number</label>
-                <input type="text" name="ra_bill_no" class="form-control" placeholder="e.g. 01" required>
-            </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>
@@ -89,11 +47,7 @@
                     </button>
                 </div>
             </div>
-<<<<<<< HEAD
->>>>>>> pankaj-dev
-=======
 
->>>>>>> pankaj-dev
         </form>
     </div>