added client RA bill wise download report

app/routes/auth.py

@@ -0,0 +1,48 @@
+from flask import Blueprint, render_template, request, redirect, url_for, flash, session
+from app.services.user_service import UserService
+
+auth_bp = Blueprint("auth", __name__)
+
+@auth_bp.route("/login", methods=["GET", "POST"])
+def login():
+    if session.get("user_id"):
+        return redirect(url_for("dashboard.dashboard"))
+
+    if request.method == "POST":
+        email = request.form.get("email")
+        password = request.form.get("password")
+
+        user = UserService.validate_login(email, password)
+        if user:
+            session["user_id"] = user.id
+            session["user_name"] = user.name
+            flash("Login successful", "success")
+            return redirect(url_for("dashboard.dashboard"))
+
+        flash("Invalid email or password", "danger")
+
+    return render_template("login.html", title="Login")
+
+
+@auth_bp.route("/logout")
+def logout():
+    session.clear()
+    flash("Logged out successfully", "info")
+    return redirect(url_for("auth.login"))
+
+@auth_bp.route("/register", methods=["GET", "POST"])
+def register():
+    if request.method == "POST":
+        name = request.form.get("name")
+        email = request.form.get("email")
+        password = request.form.get("password")
+
+        user = UserService.register_user(name, email, password)
+        if not user:
+            flash("Email already exists", "danger")
+            return redirect(url_for("auth.register"))
+
+        flash("User registered successfully", "success")
+        return redirect(url_for("auth.login"))
+
+    return render_template("register.html", title="Register")

app/routes/dashboard.py

@@ -0,0 +1,11 @@
+
+from flask import Blueprint, render_template, session, redirect, url_for
+
+dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
+
+@dashboard_bp.route("/")
+def dashboard():
+    if not session.get("user_id"):
+        return redirect(url_for("auth.login"))
+
+    return render_template("dashboard.html", title="Dashboard")

app/routes/file_format.py

@@ -0,0 +1,30 @@
+from flask import Blueprint, render_template, send_from_directory, abort, current_app
+from app.utils.helpers import login_required
+import os
+
+file_format_bp  = Blueprint("file_format", __name__)
+
+@file_format_bp .route("/file_format")
+@login_required
+def download_format():
+    return render_template("file_format.html", title="Download File Formats")
+
+
+@file_format_bp .route("/file_format/download/<filename>")
+@login_required
+def download_excel_format(filename):
+
+    download_folder = os.path.join(
+        current_app.root_path, "static", "downloads/format"
+    )
+
+    file_path = os.path.join(download_folder, filename)
+
+    if not os.path.exists(file_path):
+        abort(404)
+
+    return send_from_directory(
+        directory=download_folder,
+        path=filename,
+        as_attachment=True
+    )

app/routes/file_import.py

@@ -0,0 +1,45 @@
+from flask import Blueprint, render_template, request, flash
+from app.services.file_service import FileService
+from app.models.subcontractor_model import Subcontractor
+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"])
+@login_required
+def import_file():
+    subcontractors = Subcontractor.query.all()
+
+    if request.method == "POST":
+        file = request.files.get("file")
+        subcontractor_id = request.form.get("subcontractor_id")
+        RA_Bill_No = request.form.get("RA_Bill_No")
+
+        service = FileService()
+        success, msg = service.handle_file_upload(file, subcontractor_id, RA_Bill_No)
+
+        flash(msg, "success" if success else "danger")
+
+    return render_template(
+        "file_import.html",
+        title="Sub-cont. File Import",
+        subcontractors=subcontractors
+    )
+
+
+# this route import client files
+@file_import_bp.route("/import_client", methods=["GET", "POST"])
+@login_required
+def client_import_file():
+    subcontractors = Subcontractor.query.all()
+
+    if request.method == "POST":
+        file = request.files.get("file")
+        RA_Bill_No = request.form.get("RA_Bill_No")
+
+        service = FileService()
+        success, msg = service.handle_client_file_upload(file, RA_Bill_No)
+
+        flash(msg, "success" if success else "danger")
+
+    return render_template("file_import_client.html", title="Client File Import", subcontractors=subcontractors)

app/routes/file_report.py

@@ -0,0 +1,222 @@
+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
+from app.models.trench_excavation_model import TrenchExcavation
+from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+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
+
+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 ---
+@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") # 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...)
+
+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
+from app.models.trench_excavation_model import TrenchExcavation
+from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+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
+
+# --- BLUEPRINT DEFINITION ---
+# Ensure this is unique to avoid conflicts
+file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
+
+class ClientBill:
+    def __init__(self):
+        self.df_tr = pd.DataFrame()
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
+
+    def Fetch(self, RA_Bill_No):
+        trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+
+        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+
+        # Standardize columns for merging
+        if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
+            self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
+
+        drop_cols = ["id", "created_at", "_sa_instance_state"]
+        for df in [self.df_tr, self.df_mh, self.df_dc]:
+            if not df.empty:
+                df.drop(columns=drop_cols, errors="ignore", inplace=True)
+
+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):
+        trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        dc = ManholeDomesticChamber.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)
+
+@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
+@login_required
+def client_vs_all_subcontractor():
+    if request.method == "POST":
+        RA_Bill_No = request.form.get("RA_Bill_No")
+
+        if not RA_Bill_No:
+            flash("Please enter RA Bill No.", "danger")
+            return render_template("generate_comparison_client_vs_subcont.html")
+
+        clientBill = ClientBill()
+        clientBill.Fetch(RA_Bill_No=RA_Bill_No)
+        contractorBill = SubcontractorBill()
+        contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
+
+        # Updated QTY lists to match model fields exactly
+        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_to_3_0_total", "Hard_Murum_3_0_to_4_5_total",
+            "Soft_Rock_0_to_1_5_total", "Soft_Rock_1_5_to_3_0_total", "Soft_Rock_3_0_to_4_5_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_1_5", "d_1_5_to_2_0", "d_2_0_to_2_5", "d_2_5_to_3_0",
+            "d_3_0_to_3_5", "d_3_5_to_4_0", "d_4_0_to_4_5", "d_4_5_to_5_0",
+            "d_5_0_to_5_5", "d_5_5_to_6_0", "d_6_0_to_6_5", "Domestic_Chambers"
+        ]
+
+        # Aggregate Subcontractor Data safely
+        def aggregate_df(df, group_cols, sum_cols):
+            if df.empty: return pd.DataFrame()
+            existing_cols = [c for c in sum_cols if c in df.columns]
+            return df.groupby(group_cols, as_index=False)[existing_cols].sum()
+
+        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)
+
+        # Merge and Calculate Difference
+        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"))
+
+        # Calculate Diffs
+        for df in [df_tr_cmp, df_mh_cmp]:
+            for col in qty_cols:
+                if f"{col}_Client" in df.columns:
+                    df[f"{col}_Diff"] = df[f"{col}_Client"].fillna(0) - df[f"{col}_Sub"].fillna(0)
+        
+        for col in mh_dc_qty_cols:
+            if f"{col}_Client" in df_dc_cmp.columns:
+                df_dc_cmp[f"{col}_Diff"] = df_dc_cmp[f"{col}_Client"].fillna(0) - df_dc_cmp[f"{col}_Sub"].fillna(0)
+
+        output = io.BytesIO()
+        file_name = f"Comparison_RA_Bill_{RA_Bill_No}.xlsx"
+        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+            df_tr_cmp.to_excel(writer, sheet_name="Tr.Ex Comparison", index=False)
+            df_mh_cmp.to_excel(writer, sheet_name="Mh.Ex Comparison", index=False)
+            df_dc_cmp.to_excel(writer, sheet_name="MH & DC Comparison", index=False)
+
+        output.seek(0)
+        return send_file(output, download_name=file_name, as_attachment=True, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+
+    return render_template("generate_comparison_client_vs_subcont.html")

app/routes/generate_comparison_report.py

@@ -0,0 +1,213 @@
+from flask import Blueprint, render_template, request, send_file, flash
+import pandas as pd
+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.mh_dc_client_model import ManholeDomesticChamberClient
+from app.utils.helpers import login_required
+
+generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
+
+
+# NORMALIZER
+def normalize_key(value):
+    if value is None:
+        return None
+    return str(value).strip().upper()
+
+
+# HEADER FORMATTER
+def format_header(header):
+    if "-" in header:
+        prefix, rest = header.split("-", 1)
+        prefix = prefix.title()
+    else:
+        prefix, rest = None, header
+
+    parts = rest.split("_")
+    result = []
+    i = 0
+
+    while i < len(parts):
+        if i + 1 < len(parts) and parts[i].isdigit() and parts[i + 1].isdigit():
+            result.append(f"{parts[i]}.{parts[i + 1]}")
+            i += 2
+        else:
+            result.append(parts[i].title())
+            i += 1
+
+    final_text = " ".join(result)
+    return f"{prefix}-{final_text}" if prefix else final_text
+
+
+# LOOKUP CREATOR 
+def make_lookup(rows, key_field):
+    lookup = {}
+    for r in rows:
+        location = normalize_key(r.get("Location"))
+        key_val = normalize_key(r.get(key_field))
+
+        if location and key_val:
+            lookup[(location, key_val)] = r
+
+    return lookup
+
+
+# COMPARISON BUILDER
+def build_comparison(client_rows, contractor_rows, key_field):
+    contractor_lookup = make_lookup(contractor_rows, key_field)
+    output = []
+
+    for c in client_rows:
+        client_location = normalize_key(c.get("Location"))
+        client_key = normalize_key(c.get(key_field))
+
+        if not client_location or not client_key:
+            continue
+
+        s = contractor_lookup.get((client_location, client_key))
+        if not s:
+            continue
+
+        client_total = sum(
+            float(v or 0)
+            for k, v in c.items()
+            if k.endswith("_total")
+        )
+
+        sub_total = sum(
+            float(v or 0)
+            for k, v in s.items()
+            if k.endswith("_total")
+        )
+
+        diff = client_total - sub_total
+
+        row = {
+            "Location": client_location,
+            key_field.replace("_", " "): client_key
+        }
+
+        # CLIENT DATA
+        for k, v in c.items():
+            if k in ["id", "created_at"]:
+                continue
+            row[f"Client-{k}"] = v
+
+        row["Client-Total"] = round(client_total, 2)
+        row[" "] = ""
+
+        # SUBCONTRACTOR DATA
+        for k, v in s.items():
+            if k in ["id", "created_at", "subcontractor_id"]:
+                continue
+            row[f"Subcontractor-{k}"] = v
+
+        row["Subcontractor-Total"] = round(sub_total, 2)
+        row["Diff"] = round(diff, 2)
+
+        output.append(row)
+
+    df = pd.DataFrame(output)
+    df.columns = [format_header(col) for col in df.columns]
+    return df
+
+
+# EXCEL SHEET WRITER
+def write_sheet(writer, df, sheet_name, subcontractor_name):
+    workbook = writer.book
+    df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
+    ws = writer.sheets[sheet_name]
+
+    title_fmt = workbook.add_format({"bold": True, "font_size": 14})
+    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
+    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
+    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
+    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
+    default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})
+
+
+    ws.merge_range(
+        0, 0, 0, len(df.columns) - 1,
+        "CLIENT vs SUBCONTRACTOR",
+        title_fmt
+    )
+    ws.merge_range(
+        1, 0, 1, len(df.columns) - 1,
+        f"Subcontractor Name - {subcontractor_name}",
+        title_fmt
+    )
+
+    for col_num, col_name in enumerate(df.columns):
+        if col_name.startswith("Client-"):
+            ws.write(3, col_num, col_name, client_fmt)
+        elif col_name.startswith("Subcontractor-"):
+            ws.write(3, col_num, col_name, sub_fmt)
+        elif col_name.endswith("Total"):
+            ws.write(3, col_num, col_name, total_fmt)
+        elif col_name == "Diff":
+            ws.write(3, col_num, col_name, diff_fmt)
+        else:
+            ws.write(3, col_num, col_name, default_header_fmt)
+
+        ws.set_column(col_num, col_num, 20)
+
+
+# REPORT ROUTE
+@generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
+@login_required
+def comparison_report():
+    subcontractors = Subcontractor.query.all()
+
+    if request.method == "POST":
+        subcontractor_id = request.form.get("subcontractor_id")
+        if not subcontractor_id:
+            flash("Please select subcontractor", "danger")
+            return render_template("generate_comparison_report.html",subcontractors=subcontractors)
+
+        subcontractor = Subcontractor.query.get_or_404(subcontractor_id)
+
+        # -------- DATA --------
+        tr_client = [r.serialize() for r in TrenchExcavationClient.query.all()]
+        tr_sub = [r.serialize() for r in TrenchExcavation.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()]
+        df_tr = build_comparison(tr_client, tr_sub, "MH_NO")
+
+        mh_client = [r.serialize() for r in ManholeExcavationClient.query.all()]
+        mh_sub = [r.serialize() for r in ManholeExcavation.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()]
+        df_mh = build_comparison(mh_client, mh_sub, "MH_NO")
+
+        dc_client = [r.serialize() for r in ManholeDomesticChamberClient.query.all()]
+        dc_sub = [r.serialize() for r in ManholeDomesticChamber.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()]
+        df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
+
+        # -------- EXCEL --------
+        output = io.BytesIO()
+        filename = f"{subcontractor.subcontractor_name}_Comparison_Report.xlsx"
+
+        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+            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)
+
+        output.seek(0)
+        return send_file(
+            output,
+            as_attachment=True,
+            download_name=filename,
+            mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        )
+
+    return render_template("generate_comparison_report.html",subcontractors=subcontractors)
+
+

app/routes/subcontractor_routes.py

@@ -0,0 +1,71 @@
+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():
+    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()
+
+    flash("Subcontractor added successfully!", "success")
+    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)
+
+    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")
+
+    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/routes/user.py

@@ -0,0 +1,11 @@
+from flask import Blueprint, render_template
+from app.services.user_service import UserService
+from app.utils.helpers import login_required
+
+user_bp = Blueprint("user", __name__, url_prefix="/user")
+
+@user_bp.route("/list")
+@login_required
+def list_users():
+    users = UserService.get_all_users()
+    return render_template("users.html", users=users, title="Users")