Add LDAP Aunthentication

.env

@@ -4,7 +4,7 @@
 FLASK_ENV=development
 FLASK_DEBUG=True
 FLASK_HOST=0.0.0.0
-FLASK_PORT=5015
+FLASK_PORT=5011
 
 # -----------------------------
 # Security
@@ -23,15 +23,17 @@ DB_USER=root
 DB_PASSWORD=root
 
 # DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
-
-
 # -----------------------------
-# LDAP Configuration new
+# LDAP Configuration
 # -----------------------------
-LDAP_SERVER=ldap://host.docker.internal
+USE_LDAP_AUTH=true
-LDAP_PORT=389
-LDAP_USE_SSL=False
 
+LDAP_URL=ldap://192.168.0.25:389
+LDAP_BIND_DN=cn=admin,dc=lcepl,dc=org
+LDAP_BIND_PASSWORD=Lcepl1950@2026
+LDAP_BASE_DN=dc=lcepl,dc=org
 LDAP_DOMAIN=lcepl.org
-LDAP_BASE_DN=DC=lcepl,DC=org
+
-LDAP_SEARCH_BASE=OU=Users,DC=lcepl,DC=org
+# OpenLDAP standard username attribute
+LDAP_SEARCH_FILTER=(uid={username})
+

Dockerfile

@@ -5,20 +5,23 @@ WORKDIR /app
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     gcc \
+    default-libmysqlclient-dev \
+    pkg-config \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy requirements and install Python dependencies
 COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt gunicorn
 
 # Copy application code
 COPY . .
 
 # Create necessary directories
 RUN mkdir -p app/logs app/static/uploads app/static/downloads
+ENV FLASK_APP=run.py
 
 # Expose port
 EXPOSE 5001
 
-# Run the application
+# Run the application with Gunicorn (production WSGI server)
-CMD ["python", "run.py"]
+CMD ["gunicorn", "--bind", "0.0.0.0:5001", "run:app"]

README.md

@@ -36,8 +36,7 @@ The Comparison Project is designed to:
 
 ## Tech Stack
 
-**Frontend Framework**: HTML, CSS, Js, Bootstrap  
+**Backend Framework**: Flask  
-**Backend Framework**: Python Flask  
 **Database**: SQL Database (MySQL/PostgreSQL/SQLite configured via environment variables)  
 **ORM**: SQLAlchemy  
 **File Processing**: Pandas, OpenPyXL, XlsxWriter  
@@ -581,4 +580,4 @@ Open browser: `http://127.0.0.1:5000/`
 
 For issues, feature requests, or contributions, please contact the development team.
 
-**Last Updated:** April 2026
+**Last Updated:** January 2026

app/__init__.py

@@ -1,6 +1,6 @@
 from flask import Flask, redirect, url_for
 from app.config import Config
-from app.services.db_service import db
+from app.services.db_service import db, migrate
 from app.services.logger_service import LoggerService
 
 def create_app():
@@ -9,6 +9,9 @@ def create_app():
 
     # Initialize extensions
     db.init_app(app)
+    migrate.init_app(app, db)
+    with app.app_context():
+        db.create_all()
 
     # Initialize Logger
     LoggerService.init_app(app)
@@ -35,10 +38,7 @@ def register_blueprints(app):
     from app.routes.file_report import file_report_bp
     from app.routes.generate_comparison_report import generate_report_bp
     from app.routes.file_format import file_format_bp 
-
-    # new
     from app.routes.activity_routes import activity_bp
-    from app.routes.engineering_master_routes import engi_bp
 
     app.register_blueprint(auth_bp) 
     app.register_blueprint(user_bp)
@@ -47,12 +47,9 @@ def register_blueprints(app):
     app.register_blueprint(file_import_bp)
     app.register_blueprint(file_report_bp)
     app.register_blueprint(generate_report_bp)
-    app.register_blueprint(file_format_bp)
+    app.register_blueprint(file_format_bp )
-
-    # new
     app.register_blueprint(activity_bp)
-    app.register_blueprint(engi_bp)
+
-    
 
 def register_error_handlers(app):
 

app/config.py

@@ -1,4 +1,6 @@
 import os
+# project base url
+BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 
 class Config:
     # secret key
@@ -21,14 +23,23 @@ class Config:
     )
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False
+    # uploads folder path
+    UPLOAD_FOLDER = os.path.join(BASE_DIR, "static", "uploads")
+    # file extension
+    ALLOWED_EXTENSIONS = {"xlsx", "xls", "csv"}
 
-
+    # ---------------- LDAP settings ----------------
-    # LDAP Configuration New
+    USE_LDAP_AUTH = os.getenv("USE_LDAP_AUTH", "false").lower() == "true"
-    LDAP_SERVER = os.getenv("LDAP_SERVER")
+    # e.g. "ldap://192.168.0.25:389" or "ldaps://192.168.0.25:636" (preferred, encrypted)
-    LDAP_PORT = int(os.getenv("LDAP_PORT", 389))
+    LDAP_SERVER = os.getenv("LDAP_URL", "ldap://192.168.0.25:389")
-    LDAP_USE_SSL = os.getenv("LDAP_USE_SSL", "False").lower() == "true"
+    # Service/admin account used only to SEARCH for a user's real DN.
-
+    # The user's own password is never used for this bind.
-    LDAP_BASE_DN = os.getenv("LDAP_BASE_DN")
+    LDAP_BIND_DN = os.getenv("LDAP_BIND_DN", "cn=admin,dc=lcepl,dc=org")
-    LDAP_DOMAIN = os.getenv("LDAP_DOMAIN")
+    LDAP_BIND_PASSWORD = os.getenv("LDAP_BIND_PASSWORD", "")
-
+    # Base DN to search for user entries under
-    LDAP_SEARCH_BASE = os.getenv("LDAP_SEARCH_BASE")
+    LDAP_BASE_DN = os.getenv("LDAP_BASE_DN", "dc=lcepl,dc=org")
+    # Used only as a fallback to build an email if the directory entry has none
+    LDAP_DOMAIN = os.getenv("LDAP_DOMAIN", "lcepl.org")
+    # Filter used to find the user's entry by their login username.
+    # Standard OpenLDAP attribute is "uid". Active Directory would use sAMAccountName.
+    LDAP_SEARCH_FILTER = os.getenv("LDAP_SEARCH_FILTER", "(uid={username})")

app/models/user_model.py

@@ -7,10 +7,13 @@ class User(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(200), nullable=False)
     email = db.Column(db.String(120), unique=True, nullable=False)
-    password_hash = db.Column(db.String(255), nullable=False)
+    password_hash = db.Column(db.String(255), nullable=True)
+    auth_source = db.Column(db.String(20), nullable=False, default="local")
 
     def set_password(self, password):
         self.password_hash = generate_password_hash(password)
 
     def check_password(self, password):
+        if not self.password_hash:
+            return False
         return check_password_hash(self.password_hash, password)

app/routes/auth.py

@@ -1,98 +1,49 @@
-from flask import (Blueprint, render_template, request, redirect, url_for, flash, session, current_app)
+from flask import Blueprint, render_template, request, redirect, url_for, flash, session
-
 from app.services.user_service import UserService
-from app.constants.messages import SuccessMessage, ErrorMessage
-from app.constants.http_status import HTTPStatus
 
 auth_bp = Blueprint("auth", __name__)
 
-
-# ==========================
-# LOGIN
-# ==========================
 @auth_bp.route("/login", methods=["GET", "POST"])
 def login():
-
     if session.get("user_id"):
-        current_app.logger.info("User already logged in.")
         return redirect(url_for("dashboard.dashboard"))
 
     if request.method == "POST":
+        email = request.form.get("email")
+        password = request.form.get("password")
 
-        try:
+        user = UserService.validate_login(email, password)
-            email = request.form.get("email", "").strip()
+        if user:
-            password = request.form.get("password", "")
+            session["user_id"] = user.id
+            session["user_name"] = user.name
+            session["user_email"] = user.email
+            flash("Login successful", "success")
+            return redirect(url_for("dashboard.dashboard"))
 
-            if not email or not password:
+        flash("Invalid email or password", "danger")
-                flash(ErrorMessage.INVALID_REQUEST, "danger")
-                current_app.logger.warning("Login failed. Email or password missing.")
-                return render_template("login.html", title="Login")
-
-            user = UserService.validate_login(email, password)
-
-            if user:
-                session.clear()
-                session["user_id"] = user.id
-                session["user_name"] = user.name
-                session["email"] = user.email
-                session.permanent = True
-                
-                current_app.logger.info(f"Login successful. User={user.name}")
-                flash(SuccessMessage.LOGIN, "success")
-                return redirect(url_for("dashboard.dashboard"))
-
-            current_app.logger.warning(f"Invalid login attempt. Email={email}")
-            flash(ErrorMessage.LOGIN_FAILED,"danger")
-
-        except Exception as e:
-            current_app.logger.exception("Login Error" )
-            flash(ErrorMessage.INTERNAL_SERVER_ERROR,"danger")
 
     return render_template("login.html", title="Login")
 
 
-# ==========================
-# LOGOUT
-# ==========================
 @auth_bp.route("/logout")
 def logout():
-    username = session.get("user_name", "Unknown")
     session.clear()
-    current_app.logger.info(f"Logout successful. User={username}")
+    flash("Logged out successfully", "info")
-    flash(SuccessMessage.LOGOUT,"info")
-
     return redirect(url_for("auth.login"))
 
-
-# ==========================
-# REGISTER
-# ==========================
 @auth_bp.route("/register", methods=["GET", "POST"])
 def register():
-
     if request.method == "POST":
-        try:
+        name = request.form.get("name")
-            name = request.form.get("name", "").strip()
+        email = request.form.get("email")
-            email = request.form.get("email", "").strip()
+        password = request.form.get("password")
-            password = request.form.get("password", "")
 
-            if not name or not email or not password:
+        user = UserService.register_user(name, email, password)
-                flash(ErrorMessage.INVALID_REQUEST,"danger")
+        if not user:
-                return redirect(url_for("auth.register"))
+            flash("Email already exists", "danger")
+            return redirect(url_for("auth.register"))
 
-            user = UserService.register_user(name, email, password)
+        flash("User registered successfully", "success")
+        return redirect(url_for("auth.login"))
 
-            if not user:
+    return render_template("register.html", title="Register")
-                current_app.logger.warning(f"Duplicate Registration: {email}")
-                flash(ErrorMessage.DUPLICATE_ENTRY,"danger")
-                return redirect(url_for("auth.register"))
-
-            current_app.logger.info(f"New user registered: {email}")
-            flash(SuccessMessage.CREATED,"success")
-            return redirect(url_for("auth.login"))
-
-        except Exception:
-            current_app.logger.exception("User Registration Failed" )
-            flash(ErrorMessage.INTERNAL_SERVER_ERROR,"danger")
-
-    return render_template("register.html",title="Register")

app/routes/engineering_master_routes.py

@@ -4,7 +4,7 @@ from flask import (
     request,
     redirect,
     url_for,
-    flash, jsonify
+    flash
 )
 
 from app.models.subcontractor_model import Subcontractor
@@ -26,8 +26,26 @@ def engineering_master():
         "engineering/index.html",
         title="Engineering Masters"
     )
-    
+
-# Client rate model
+
+@engi_bp.route("/subcontractor-rate")
+def add_subcontractor_rates():
+    subcontractors = Subcontractor.query.filter_by(status="Active").all()
+
+    if request.method == "POST":
+        try:
+            SubcontractorRateService.save_rate(request.form)
+            flash(SuccessMessage.SAVE, "success")
+            return redirect(url_for("engineering.add_subcontractor_rates"))
+        except Exception as e:
+            flash(ErrorMessage.INTERNAL_SERVER_ERROR, "danger")
+
+    return render_template(
+        "engineering/add_rate.html",
+        title="Subcontractor Rate Master",
+        subcontractors=subcontractors
+    )
+
 @engi_bp.route("/client-rate")
 def client_rates():
 
@@ -36,72 +54,3 @@ def client_rates():
         title="Client Rate Master"
     )
 
-@engi_bp.route("/subcontractor-rate", methods=["GET", "POST"])
-def add_subcontractor_rates():
-
-    subcontractors = Subcontractor.query.filter_by(status="Active").all()
-
-    if request.method == "POST":
-        result = SubcontractorRateService.save_or_update(request.form)
-        if result["success"]:
-            flash(result["message"], "success")
-            return redirect(url_for("engineering.add_subcontractor_rates"))
-        else:
-            flash(result["message"], "danger")
-
-    rates = SubcontractorRateService.get_all_rates()
-
-    return render_template(
-        "engineering/contractor_rate.html",
-        title="Subcontractor Rate Master",
-        subcontractors=subcontractors,
-        rates=rates
-    )
-
-@engi_bp.route("/subcontractor-rate/edit/<int:rate_id>", methods=["GET", "POST"])
-def edit_rate(rate_id):
-
-    subcontractors = Subcontractor.query.filter_by(status="Active").all()
-
-    if request.method == "POST":
-
-        result = SubcontractorRateService.save_or_update(request.form)
-
-        if result["success"]:
-            flash(result["message"], "success")
-            return redirect(url_for("engineering.add_subcontractor_rates"))
-
-        flash(result["message"], "danger")
-
-    rate = SubcontractorRateService.get_rate(rate_id)
-
-    rates = SubcontractorRateService.get_all_rates()
-
-    return render_template(
-        "engineering/contractor_rate.html",
-        subcontractors=subcontractors,
-        rate=rate,
-        rates=rates
-    )
-
-@engi_bp.route("/subcontractor-rate/delete/<int:rate_id>")
-def delete_rate(rate_id):
-    SubcontractorRateService.delete_rate(rate_id)
-    flash("Rate deleted successfully.", "success")
-    return redirect(url_for("engineering.add_subcontractor_rates"))
-
-
-@engi_bp.route("/check-rate")
-def check_rate():
-
-    exists = SubcontractorRateService.check_duplicate(
-        subcontractor_id=request.args.get("subcontractor_id"),
-        category=request.args.get("category"),
-        item_name=request.args.get("item_name"),
-        rate_id=request.args.get("rate_id")
-    )
-
-    return jsonify({
-        "exists": exists
-    })
-

app/routes/file_report.py

@@ -4,7 +4,6 @@ from flask import Blueprint, render_template, request, send_file, flash, jsonify
 from app.utils.helpers import login_required
 from app.utils.regex_utils import RegularExpression
 from app import db
-from sqlalchemy import func
 import re
 
 from app.models.subcontractor_model import Subcontractor
@@ -23,74 +22,7 @@ from app.services.abstract_service import AbstractReportService
  
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
-
+ 
-
-# ---------------- LOCATION HELPERS ----------------
-WORK_MODELS = [TrenchExcavation, ManholeExcavation, ManholeDomesticChamber, Laying]
-
-
-def get_distinct_locations():
-    """Union of distinct, non-empty Location values across all 4 work tables."""
-    locations = set()
-    for Model in WORK_MODELS:
-        rows = db.session.query(Model.Location).distinct().all()
-        for (loc,) in rows:
-            if loc and loc.strip():
-                locations.add(loc.strip())
-    return sorted(locations)
-
-
-def get_subcontractors_for_location(location):
-    """Return Subcontractor objects that have at least one work record
-    (in any of the 4 category tables) at the given location. If no
-    location is given, returns every subcontractor. Shared by the AJAX
-    endpoint below and by the server-rendered dropdown so the list is
-    correct even before/without JS running (e.g. on page reload or a
-    validation-error re-render).
-
-    Matching is case- and whitespace-insensitive, since Location is a
-    free-text field and stored values can drift ("Pune" vs "PUNE " etc.)
-    even though the dropdown options themselves come from a distinct
-    query and look identical."""
-    location = (location or "").strip()
-
-    if not location:
-        return Subcontractor.query.order_by(Subcontractor.subcontractor_name).all()
-
-    target = location.upper()
-    sc_ids = set()
-    for Model in WORK_MODELS:
-        rows = (
-            db.session.query(Model.subcontractor_id)
-            .filter(func.upper(func.trim(Model.Location)) == target)
-            .distinct()
-            .all()
-        )
-        for (sid,) in rows:
-            if sid:
-                sc_ids.add(sid)
-
-    if not sc_ids:
-        return []
-
-    return (
-        Subcontractor.query.filter(Subcontractor.id.in_(sc_ids))
-        .order_by(Subcontractor.subcontractor_name)
-        .all()
-    )
-
-
-@file_report_bp.route("/get_subcontractors_by_location")
-@login_required
-def get_subcontractors_by_location():
-    """AJAX endpoint: return subcontractors that have at least one work
-    record (in any of the 4 category tables) at the given location."""
-    location = request.args.get("location", "").strip()
-    subs = get_subcontractors_for_location(location)
-
-    return jsonify([{"id": s.id, "name": s.subcontractor_name} for s in subs])
-
-
 
 # ---------------- ACTION COLUMN ----------------
 def add_action_columns(df, model_key):
@@ -98,13 +30,13 @@ def add_action_columns(df, model_key):
         return df
 
     df.insert(0, "Select", df["Id"].apply(
-        lambda x: f'<input type="checkbox" class="row-check" data-model="{model_key}" data-id="{x}">'
+        lambda x: f'<input type="checkbox" class="row-check" data-id="{x}">'
     ))
-
+    
     df["Update"] = df["Id"].apply(
         lambda x: f'<a href="/file/edit/{model_key}/{x}" class="btn btn-sm btn-warning edit-btn"><i class="bi bi-pencil-square"></i> Edit</a>'
     )
-
+    
     df["Delete"] = df["Id"].apply(
         lambda x: f'<button class="btn btn-sm btn-danger delete-btn" data-id="{x}" data-model="{model_key}">Delete</button>'
     )
@@ -112,76 +44,6 @@ def add_action_columns(df, model_key):
     return df
 
 
-# ---------------- SELECT-ALL HEADER ----------------
-def add_select_all_header(table_html, model_key):
-    """Swap pandas' plain 'Select' column header for a select-all checkbox
-    scoped to this table (via data-model), so checking it only toggles
-    rows in this table - not the other 3 category tables on the page."""
-    return table_html.replace(
-        "<th>Select</th>",
-        f'<th><input type="checkbox" class="select-all-checkbox" '
-        f'data-model="{model_key}" title="Select All"></th>',
-        1
-    )
-
-
-# ---------------- TABLE OR EMPTY-STATE ----------------
-def add_data_field_attrs(table_html, raw_fields):
-    """Tag each editable data <td> with a data-field attribute naming its
-    underlying database column, so bulk-edit mode on the frontend knows
-    exactly which field to submit for each input it creates. The 'id'
-    column is deliberately skipped - it's the primary key and must never
-    be editable.
-
-    Uses match spans (not string search-and-replace) to rebuild each row,
-    because a naive .replace() on duplicate cell text (e.g. two cells
-    that both just say "0.00") would edit the wrong cell."""
-    total_cols = 1 + len(raw_fields) + 2  # Select + data columns + Update + Delete
-
-    def process_row(m):
-        row_html = m.group(0)
-        matches = list(re.finditer(r"<td>.*?</td>", row_html, flags=re.S))
-        if len(matches) != total_cols:
-            return row_html  # shape mismatch - leave untouched rather than guess
-
-        pieces = []
-        last_end = 0
-        for i, mt in enumerate(matches):
-            pieces.append(row_html[last_end:mt.start()])
-            cell = mt.group(0)
-            if 1 <= i <= len(raw_fields):
-                field = raw_fields[i - 1]
-                if field.lower() != "id":
-                    cell = f'<td data-field="{field}">' + cell[len("<td>"):]
-            pieces.append(cell)
-            last_end = mt.end()
-        pieces.append(row_html[last_end:])
-        return "".join(pieces)
-
-    return re.sub(r"<tr>.*?</tr>", process_row, table_html, flags=re.S)
-
-
-def render_table_or_empty(df, model_key, table_class, raw_fields=None):
-    """Render a table, or a friendly placeholder if there's no data.
-
-    IMPORTANT: pandas' to_html() on a fully empty DataFrame (0 rows AND
-    0 columns, which is what we get when a category has no matching
-    records) still emits a <table class="datatable"> - just with a
-    header row that has zero <th> cells. jQuery DataTables then tries to
-    initialize on a table with no columns and throws, which (since the
-    init code runs as one synchronous block) silently kills every bit of
-    JS registered after it - including the select-all checkbox handler
-    for the OTHER tables on the page. Returning a plain message instead
-    of an empty <table class="datatable"> avoids ever handing DataTables
-    something it can't initialize."""
-    if df.empty:
-        return '<div class="alert alert-info mb-0">No records found.</div>'
-    html = df.to_html(classes=table_class, index=False, escape=False)
-    html = add_select_all_header(html, model_key)
-    html = add_data_field_attrs(html, raw_fields or [])
-    return html
-
-
 
 
 
@@ -194,7 +56,7 @@ class SubcontractorBill:
         self.df_laying = pd.DataFrame()
         # self.df_abstract = pd.DataFrame()   # NEW
 
-    def Fetch(self, RA_Bill_No=None, subcontractor_id=None, location=None, mh_no=None):
+    def Fetch(self, RA_Bill_No=None, subcontractor_id=None, location=None):
 
         filters = {}
         if subcontractor_id:
@@ -211,6 +73,7 @@ class SubcontractorBill:
         # LOCATION FILTER
         if location:
             search = location.strip().lower()
+            print("location::",search)
             trench = [
                 t for t in trench
                 if search in (t.Location or "").strip().lower()
@@ -230,30 +93,7 @@ class SubcontractorBill:
                 t for t in lay
                 if search in (t.Location or "").strip().lower()
             ]
-
+        
-        # MH NO FILTER
-        if mh_no:
-            mh_search = mh_no.strip().lower()
-            trench = [
-                t for t in trench
-                if mh_search in (t.MH_NO or "").strip().lower()
-            ]
-
-            mh = [
-                t for t in mh
-                if mh_search in (t.MH_NO or "").strip().lower()
-            ]
-
-            dc = [
-                t for t in dc
-                if mh_search in (t.MH_NO or "").strip().lower()
-            ]
-
-            lay = [
-                t for t in lay
-                if mh_search in (t.MH_NO or "").strip().lower()
-            ]
-
         # Set dataframe
         self.df_tr = pd.DataFrame([c.serialize() for c in trench])
         self.df_mh = pd.DataFrame([c.serialize() for c in mh])
@@ -262,24 +102,9 @@ class SubcontractorBill:
         
         drop_cols = ["11", "_sa_instance_state", "subcontractor_id" , "created_at"]
 
-        # Raw (pre-format_column_names) column names for each table, e.g.
+        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
-        # "MH_NO" rather than the display label "MH No". Bulk-edit mode
-        # needs these to know which real database column each input maps
-        # to, since the table only shows the prettified header text.
-        self.tr_fields = []
-        self.mh_fields = []
-        self.dc_fields = []
-        self.laying_fields = []
-
-        for df, attr in [
-            (self.df_tr, "tr_fields"),
-            (self.df_mh, "mh_fields"),
-            (self.df_dc, "dc_fields"),
-            (self.df_laying, "laying_fields"),
-        ]:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
-                setattr(self, attr, list(df.columns))
                 format_column_names(df)
                 
         name = ""
@@ -327,60 +152,6 @@ def delete_records():
         return jsonify({"status": "error", "message": str(e)}), 500
 
 
-@file_report_bp.route("/bulk_update", methods=["POST"])
-@login_required
-def bulk_update():
-    """Bulk-edit save endpoint. Expects JSON shaped like:
-    { "tr": { "5": {"MH_NO": "12A", "Location": "Pune"}, ... }, "mh": {...}, ... }
-
-    Field names are validated against each model's real table columns
-    server-side - the frontend sending a field name is not enough on its
-    own to permit writing it; id/subcontractor_id/created_at are always
-    refused regardless of what's submitted.
-    """
-    data = request.json or {}
-
-    model_map = {
-        "tr": TrenchExcavation,
-        "mh": ManholeExcavation,
-        "dc": ManholeDomesticChamber,
-        "laying": Laying
-    }
-    PROTECTED_FIELDS = {"id", "subcontractor_id", "created_at"}
-
-    updated = 0
-    errors = []
-
-    try:
-        for model_key, records in data.items():
-            ModelClass = model_map.get(model_key)
-            if not ModelClass:
-                errors.append(f"Unknown table '{model_key}'")
-                continue
-
-            valid_columns = {c.name for c in ModelClass.__table__.columns} - PROTECTED_FIELDS
-
-            for record_id, fields in (records or {}).items():
-                obj = ModelClass.query.get(record_id)
-                if not obj:
-                    errors.append(f"{model_key} #{record_id}: record not found")
-                    continue
-
-                for field, value in (fields or {}).items():
-                    if field not in valid_columns:
-                        errors.append(f"{model_key} #{record_id}: '{field}' is not editable")
-                        continue
-                    setattr(obj, field, value)
-                    updated += 1
-
-        db.session.commit()
-    except Exception as e:
-        db.session.rollback()
-        return jsonify({"status": "error", "message": str(e)}), 500
-
-    return jsonify({"status": "success", "updated": updated, "errors": errors})
-
-
 @file_report_bp.route("/edit/<string:model>/<int:record_id>", methods=["GET", "POST"])
 @login_required
 def edit_record(model, record_id):
@@ -433,40 +204,28 @@ def edit_record(model, record_id):
 def report_file():
     # get all subcontractor data
     subcontractors = Subcontractor.query.all()
-    locations = get_distinct_locations()
     
     tables = None
     abstract_html = ""
     selected_sc_id = None
-    has_data = {"tr": False, "mh": False, "dc": False, "laying": False}
     ra_bill_no = ""
     location = ""
-    mh_no = ""
     category = ""
 
     # Search or load data
     if request.method == "POST":
         # get from data
-        subcontractor_id = request.form.get("subcontractor_id") or None
+        subcontractor_id = request.form.get("subcontractor_id")
         ra_bill_no = request.form.get("ra_bill_no", "").strip()
         location = request.form.get("location", "").strip()
-        mh_no = request.form.get("mh_no", "").strip()
         category = request.form.get("category", "")
         action = request.form.get("action", "preview")
 
-        # Keep the subcontractor dropdown scoped to the chosen location
+        if not subcontractor_id:
-        # even on a plain (non-JS) page render.
+            flash("Select Subcontractor", "danger")
-        subcontractors = get_subcontractors_for_location(location)
-
-        # Subcontractor is now optional - at least one other filter must
-        # be given so the search isn't a "return everything" query.
-        if not subcontractor_id and not location and not ra_bill_no and not mh_no:
-            flash("Enter at least a Location, RA Bill No, MH No, or Subcontractor to search", "danger")
             return render_template(
                 "subcontractor_report.html",
-                subcontractors=subcontractors,
+                subcontractors=subcontractors
-                locations=locations,
-                has_data=has_data
             )
         
         selected_sc_id = subcontractor_id
@@ -475,31 +234,7 @@ def report_file():
         if action == "excel_all":
             bill.Fetch(subcontractor_id=subcontractor_id)
         else:
-            bill.Fetch(ra_bill_no, subcontractor_id, location, mh_no)
+            bill.Fetch(ra_bill_no,subcontractor_id,location)
-
-        
-        # ---------------------------------------------------------
-        if (
-            bill.df_tr.empty and
-            bill.df_mh.empty and
-            bill.df_dc.empty and
-            bill.df_laying.empty
-        ):
-            flash(
-                f"No records found for RA Bill No '{ra_bill_no}'. "
-                "Please check the RA Bill No and try again."
-                if ra_bill_no else
-                "No records found for the selected filters.",
-                "warning"
-            )
-            return render_template(
-                "subcontractor_report.html",
-                subcontractors=subcontractors,
-                selected_sc_id=selected_sc_id,
-                selected_ra_bill=ra_bill_no,
-                selected_location=location,
-                selected_category=category
-            )
             
         # -----------------------------------------
         # Generate Abstract Report for Web
@@ -519,32 +254,6 @@ def report_file():
             bill.df_tr = bill.df_mh = bill.df_laying = pd.DataFrame()
         elif category == "laying":
             bill.df_tr = bill.df_mh = bill.df_dc = pd.DataFrame()
-
-       
-        if (
-            category in ("tr", "mh", "dc", "laying")
-            and bill.df_tr.empty and bill.df_mh.empty
-            and bill.df_dc.empty and bill.df_laying.empty
-        ):
-            category_labels = {
-                "tr": "Trench Excavation",
-                "mh": "Manhole Excavation",
-                "dc": "Domestic Chamber",
-                "laying": "Pipe Laying",
-            }
-            flash(
-                f"No {category_labels[category]} records found for the "
-                "selected filters.",
-                "warning"
-            )
-            return render_template(
-                "subcontractor_report.html",
-                subcontractors=subcontractors,
-                selected_sc_id=selected_sc_id,
-                selected_ra_bill=ra_bill_no,
-                selected_location=location,
-                selected_category=category
-            )
             
 
         # ===================================================
@@ -558,46 +267,16 @@ def report_file():
                 abstract = AbstractReportService(subcontractor_id=subcontractor_id,ra_bill_no=ra_bill_no)
                 abstract.generate(workbook)
                 
-             
+                bill.df_tr.to_excel(writer,sheet_name="Tr.Ex",index=False)
-                sheet_map = [
+                bill.df_mh.to_excel(writer,sheet_name="Mh.Ex",index=False)
-                    (bill.df_tr, "Tr.Ex"),
+                bill.df_dc.to_excel(writer,sheet_name="MH & DC",index=False)
-                    (bill.df_mh, "Mh.Ex"),
+                bill.df_laying.to_excel(writer,sheet_name="Pipe Laying",index=False)
-                    (bill.df_dc, "MH & DC"),
-                    (bill.df_laying, "Pipe Laying"),
-                ]
-                for df, sheet_name in sheet_map:
-                    if not df.empty:
-                        df.to_excel(writer, sheet_name=sheet_name, index=False)
                 writer.close()
             output.seek(0)
-
+            
-           
-            sc_obj = next(
-                (s for s in subcontractors if str(s.id) == str(subcontractor_id)),
-                None
-            )
-            sc_name = sc_obj.subcontractor_name if sc_obj else "Subcontractor"
-            sc_name = re.sub(r'[^A-Za-z0-9_-]+', '_', sc_name).strip('_')
-
-            name_parts = [sc_name]
-
-            if ra_bill_no:
-                name_parts.append(f"RA{re.sub(r'[^A-Za-z0-9_-]+', '_', ra_bill_no)}")
-
-            if location:
-                name_parts.append(re.sub(r'[^A-Za-z0-9_-]+', '_', location).strip('_'))
-
-            if category and category != "all":
-                name_parts.append(category.upper())
-
-            if action == "excel_all":
-                name_parts.append("All")
-
-            filename = "_".join(name_parts) + "_Report.xlsx"
-
             return send_file(
                 output,
-                download_name=filename,
+                download_name= "subcontractor_Report.xlsx",
                 as_attachment=True 
             )
 
@@ -617,15 +296,6 @@ def report_file():
         bill.df_mh = add_action_columns(bill.df_mh, "mh")
         bill.df_dc = add_action_columns(bill.df_dc, "dc")
         bill.df_laying = add_action_columns(bill.df_laying, "laying")
-
-        # Used by the template to hide Delete Selected / Bulk Edit for a
-        # category that has no rows to act on.
-        has_data = {
-            "tr": not bill.df_tr.empty,
-            "mh": not bill.df_mh.empty,
-            "dc": not bill.df_dc.empty,
-            "laying": not bill.df_laying.empty,
-        }
         
         # this are html classes
         # table_class = ( "table " "table-bordered" "table-hover " "table-striped " "table-sm " "align-middle " "datatable " "mb-0")
@@ -643,24 +313,21 @@ def report_file():
         
         # This are showing on web tables
         tables = {
-            "tr": render_table_or_empty(bill.df_tr, "tr", table_class, bill.tr_fields),
+            "tr": bill.df_tr.to_html(classes=table_class, index=False, escape=False),
-            "mh": render_table_or_empty(bill.df_mh, "mh", table_class, bill.mh_fields),
+            "mh": bill.df_mh.to_html(classes=table_class, index=False, escape=False),
-            "dc": render_table_or_empty(bill.df_dc, "dc", table_class, bill.dc_fields),
+            "dc": bill.df_dc.to_html(classes=table_class, index=False, escape=False ),
-            "laying": render_table_or_empty(bill.df_laying, "laying", table_class, bill.laying_fields)
+            "laying": bill.df_laying.to_html(classes=table_class, index=False, escape=False)
         }
 
     return render_template(
         "subcontractor_report.html",
         subcontractors=subcontractors,
-        locations=locations,
         selected_sc_id=selected_sc_id,
         selected_ra_bill=ra_bill_no,
         selected_location=location,
-        selected_mh_no=mh_no,
         selected_category=category,
         tables=tables,
-        abstract_html=abstract_html,
+        abstract_html=abstract_html
-        has_data=has_data
     )
 
 

app/services/ldap_service.py

@@ -1,130 +1,72 @@
-from ldap3 import (
-    Server,
-    Connection,
-    ALL,
-    NTLM,
-    SIMPLE,
-    SUBTREE
-)
-
 from flask import current_app
-from app.config import Config
+from ldap3 import Server, Connection, ALL, SUBTREE
+from ldap3.core.exceptions import LDAPException
 
 
 class LDAPService:
     """
-    LDAP / Active Directory Authentication Service
+    Handles authentication against an LDAP / OpenLDAP server using the
+    standard "search + bind" pattern:
+      1. Bind with a service/admin account just to SEARCH for the user's DN.
+      2. Re-bind using that DN + the password the user typed, to verify it.
+    The user's typed password is only ever used in step 2, never sent
+    anywhere else.
     """
 
     @staticmethod
     def authenticate(username, password):
-        """
-        Authenticate LDAP User
-
-        Returns:
-            {
-                "success": True,
-                "user": {
-                    "username": "...",
-                    "name": "...",
-                    "email": "..."
-                }
-            }
-
-        OR
-
-            {
-                "success": False,
-                "message": "Invalid username or password"
-            }
-        """
-
         if not username or not password:
-            return {
+            return None
-                "success": False,
-                "message": "Username and Password are required."
-            }
 
+        server = Server(current_app.config["LDAP_SERVER"], get_info=ALL)
+
+        # --- Step 1: bind as the admin/service account to search the directory ---
         try:
-
+            admin_conn = Connection(
-            # -----------------------------------
-            # LDAP SERVER
-            # -----------------------------------
-            server = Server(
-                Config.LDAP_SERVER,
-                port=Config.LDAP_PORT,
-                use_ssl=Config.LDAP_USE_SSL,
-                get_info=ALL
-            )
-
-            # -----------------------------------
-            # Login Format
-            #
-            # username@domain.com
-            # -----------------------------------
-            user_dn = f"{username}@{Config.LDAP_DOMAIN}"
-
-            conn = Connection(
                 server,
-                user=user_dn,
+                user=current_app.config["LDAP_BIND_DN"],
-                password=password,
+                password=current_app.config["LDAP_BIND_PASSWORD"],
-                authentication=SIMPLE,
+                auto_bind=True,
-                auto_bind=True
             )
+        except LDAPException as e:
+            current_app.logger.error(f"LDAP service account bind failed: {e}")
+            return None
 
-            # -----------------------------------
+        # --- Step 2: find the user's real DN + profile attributes ---
-            # Search User
+        try:
-            # -----------------------------------
+            search_filter = current_app.config["LDAP_SEARCH_FILTER"].format(username=username)
-            search_filter = f"(sAMAccountName={username})"
+            admin_conn.search(
-
+                search_base=current_app.config["LDAP_BASE_DN"],
-            conn.search(
-                search_base=Config.LDAP_SEARCH_BASE,
                 search_filter=search_filter,
                 search_scope=SUBTREE,
-                attributes=[
+                attributes=["cn", "mail", "uid"],
-                    "displayName",
-                    "mail",
-                    "givenName",
-                    "sn",
-                    "cn"
-                ]
             )
+        except LDAPException as e:
+            current_app.logger.error(f"LDAP search failed for '{username}': {e}")
+            admin_conn.unbind()
+            return None
 
-            display_name = username
+        if not admin_conn.entries:
-            email = ""
+            current_app.logger.warning(f"LDAP user not found: {username}")
+            admin_conn.unbind()
+            return None
 
-            if conn.entries:
+        entry = admin_conn.entries[0]
+        user_dn = entry.entry_dn
+        name = str(entry.cn) if "cn" in entry and entry.cn.value else username
+        email = (
+            str(entry.mail)
+            if "mail" in entry and entry.mail.value
+            else f"{username}@{current_app.config['LDAP_DOMAIN']}"
+        )
+        admin_conn.unbind()
 
-                entry = conn.entries[0]
+        # --- Step 3: the actual auth check - bind AS the user with their password ---
+        try:
+            user_conn = Connection(server, user=user_dn, password=password, auto_bind=True)
+            user_conn.unbind()
+        except LDAPException as e:
+            current_app.logger.warning(f"LDAP authentication failed for '{username}': {e}")
+            return None
 
-                if "displayName" in entry:
+        return {"username": username, "name": name, "email": email}
-                    display_name = str(entry.displayName)
-
-                if "mail" in entry:
-                    email = str(entry.mail)
-
-            conn.unbind()
-
-            current_app.logger.info(
-                f"LDAP Login Success : {username}"
-            )
-
-            return {
-                "success": True,
-                "user": {
-                    "username": username,
-                    "name": display_name,
-                    "email": email
-                }
-            }
-
-        except Exception as ex:
-
-            current_app.logger.warning(
-                f"LDAP Login Failed : {username} : {str(ex)}"
-            )
-
-            return {
-                "success": False,
-                "message": "Invalid Username or Password."
-            }

app/services/subcontractor_rate_service.py

@@ -1,66 +1,28 @@
 from app.services.db_service import db
 from app.models.subcontractor_rate_model import SubcontractorRate
-from sqlalchemy import func
 
 
 class SubcontractorRateService:
 
     @staticmethod
-    def save_or_update(form):
+    def save_rate(form):
 
-        rate_id = form.get("id")
+        rate = SubcontractorRate(
-
+            subcontractor_id=form.get("subcontractor_id"),
-        subcontractor_id = form.get("subcontractor_id")
+            category=form.get("category"),
-        category = form.get("category")
+            item_code=form.get("item_code"),
-        item_name = form.get("item_name").strip()
+            item_name=form.get("item_name"),
-
+            unit=form.get("unit"),
-        # -----------------------------
+            rate=form.get("rate"),
-        # Duplicate Validation
+            effective_from=form.get("effective_from"),
-        # -----------------------------
+            effective_to=form.get("effective_to") or None,
-        duplicate = (
+            status=form.get("status")
-            SubcontractorRate.query
-            .filter(
-                SubcontractorRate.subcontractor_id == subcontractor_id,
-                SubcontractorRate.category == category,
-                func.lower(SubcontractorRate.item_name) == item_name.lower()
-            )
-            .first()
         )
 
-        # Ignore current record while editing
+        db.session.add(rate)
-        if duplicate and (not rate_id or duplicate.id != int(rate_id)):
-            return {
-                "success": False,
-                "message": "Category and Rate already exists for this Subcontractor."
-            }
-
-        # -----------------------------
-        # Insert / Update
-        # -----------------------------
-        if rate_id:
-            rate = SubcontractorRate.query.get_or_404(rate_id)
-        else:
-            rate = SubcontractorRate()
-
-        rate.subcontractor_id = subcontractor_id
-        rate.category = category
-        rate.item_code = form.get("item_code")
-        rate.item_name = item_name
-        rate.unit = form.get("unit")
-        rate.rate = form.get("rate")
-        rate.effective_from = form.get("effective_from")
-        rate.effective_to = form.get("effective_to") or None
-        rate.status = form.get("status")
-
-        if not rate_id:
-            db.session.add(rate)
-
         db.session.commit()
-
+        return rate
-        return {
+    
-            "success": True,
-            "message": "Saved Successfully."
-        }
     
     @staticmethod
     def get_all_rates():
@@ -70,33 +32,34 @@ class SubcontractorRateService:
             .order_by(SubcontractorRate.created_at.desc())
             .all()
         )
-        
-        
     @staticmethod
     def get_rate(rate_id):
 
         return SubcontractorRate.query.get_or_404(rate_id)
     
-    def delete_rate(rate_id):
-        rate = SubcontractorRate.query.get_or_404(rate_id)
-        db.session.delete(rate)
-        db.session.commit()
-        
-
     @staticmethod
-    def check_duplicate(subcontractor_id, category, item_name, rate_id=None):
+    def update_rate(rate_id, form):
 
-        query = SubcontractorRate.query.filter(
+        rate = SubcontractorRate.query.get_or_404(rate_id)
-            SubcontractorRate.subcontractor_id == subcontractor_id,
-            SubcontractorRate.category == category,
-            func.lower(SubcontractorRate.item_name) == item_name.strip().lower()
-        )
 
-        if rate_id:
+        rate.subcontractor_id = form.get("subcontractor_id")
-            query = query.filter(SubcontractorRate.id != int(rate_id))
+        rate.category = form.get("category")
+        rate.item_code = form.get("item_code")
+        rate.item_name = form.get("item_name")
+        rate.unit = form.get("unit")
+        rate.rate = form.get("rate")
+        rate.effective_from = form.get("effective_from")
+        rate.effective_to = form.get("effective_to") or None
+        rate.status = form.get("status")
 
-        return query.first() is not None
+        db.session.commit()
+        return rate
     
-    
+    @staticmethod
-    
+    def delete_rate(rate_id):
-    
+
+        rate = SubcontractorRate.query.get_or_404(rate_id)
+
+        db.session.delete(rate)
+
+        db.session.commit()

app/services/user_service.py

@@ -1,6 +1,7 @@
+from flask import current_app
 from app.models.user_model import User
 from app.services.db_service import db
-from flask import current_app
+from app.services.ldap_service import LDAPService
 
 class UserService:
 
@@ -9,21 +10,57 @@ class UserService:
         if User.query.filter_by(email=email).first():
             return None
 
-        user = User(name=name, email=email)
+        user = User(name=name, email=email, auth_source="local")
         user.set_password(password)
 
         db.session.add(user)
         db.session.commit()
-        current_app.logger.info("User list viewed")
         return user
 
     @staticmethod
-    def validate_login(email, password):
+    def validate_login(identifier, password):
-        user = User.query.filter_by(email=email).first()
+        """
+        identifier = whatever was typed in the login form. Can be an email
+        (local users) or an LDAP username, depending on USE_LDAP_AUTH.
+        """
+        if current_app.config.get("USE_LDAP_AUTH"):
+            ldap_user = UserService._validate_ldap_login(identifier, password)
+            if ldap_user:
+                return ldap_user
+            return None
+        user = User.query.filter_by(email=identifier).first()
         if user and user.check_password(password):
             return user
         return None
 
+    @staticmethod
+    def _validate_ldap_login(username, password):
+        ldap_info = LDAPService.authenticate(username, password)
+        if not ldap_info:
+            return None
+        return UserService._get_or_create_ldap_user(ldap_info)
+
+    @staticmethod
+    def _get_or_create_ldap_user(ldap_info):
+        """
+        LDAP is the source of truth for the password. We still keep a row in
+        our local `users` table (no password) so the rest of the app - which
+        expects a User with an id - keeps working unchanged.
+        """
+        user = User.query.filter_by(email=ldap_info["email"]).first()
+        if user is None:
+            user = User(
+                name=ldap_info["name"],
+                email=ldap_info["email"],
+                auth_source="ldap",
+            )
+            db.session.add(user)
+            db.session.commit()
+        elif user.name != ldap_info["name"]:
+            user.name = ldap_info["name"]
+            db.session.commit()
+        return user
+
     @staticmethod
     def get_all_users():
         return User.query.all()

app/templates/base.html

@@ -124,21 +124,10 @@
                                     <i class="bi bi-arrow-left-right me-2"></i> Client vs Subcontractor
                                 </a>
                             </li>
-                            <!-- <li>
+                            
-                                <a class="dropdown-item" href="/file/client_vs_subcont">
-                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
-                                </a>
-                            </li> -->
                         </ul>
                     </li>
 
-                    <!-- Formats -->
-                    <li class="nav-item">
-                        <a class="nav-link" href="/file_format">
-                            <i class="bi bi-file-earmark-text me-1"></i> Formats
-                        </a>
-                    </li>
-
                     <!-- Masters -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/engi">
@@ -155,13 +144,22 @@
                             <!-- Client Standard Rates -->
                             <li class="nav-item">
                                 <a class="nav-link" href="/engi/client-rate">
-                                    <i class="bi bi-file-earmark-text me-1"></i> Client Rates
+                                    <i class="bi bi-file-earmark-text me-1"></i> Client Standard Rates
                                 </a>
-                            </li>            
+                            </li>
+
+                            <!-- Formats -->
+                            <li class="nav-item">
+                                <a class="nav-link" href="/file_format">
+                                    <i class="bi bi-file-earmark-text me-1"></i> Formats
+                                </a>
+                            </li>
+                            
                         </ul>
                     </li>
 
-                    <!-- USER DROPDOWN -->
+
+                    <!-- USER DROPDOWN -->   
                     <li class="nav-item dropdown">
 
                         <a class="nav-link dropdown-toggle d-flex align-items-center text-white"
@@ -187,10 +185,10 @@
                                 </small>
                             </li>
 
-                            <!-- Masters -->
+                            <!-- Dashboard -->
                             <li>
-                                <a class="dropdown-item text-light py-2" href="{{ url_for('engineering.engineering_master') }}">
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('dashboard.dashboard') }}">
-                                    <i class="bi bi-gear me-2"></i> Masters
+                                    <i class="bi bi-speedometer2 me-2"></i> Dashboard
                                 </a>
                             </li>
 
@@ -201,13 +199,12 @@
                                 </a>
                             </li>
 
-                            <!--  Manage Account 
+                            <!--  Manage Account -->
                             <li>
                                 <a class="dropdown-item py-2" href="#">
                                     <i class="bi bi-gear me-2"></i> Manage Account
                                 </a>
                             </li>
-                            -->
                             
                             <li><hr class="dropdown-divider border-secondary m-0"></li>
 
@@ -226,7 +223,9 @@
                                     Secured by <strong>LCEPL</strong>
                                 </small>
                             </li>
+
                         </ul>
+
                     </li>
 
                 </ul>
@@ -380,7 +379,6 @@
 
                     showLoader();
                     const btn = this.querySelector("button[type='submit']");
-                    const originalBtnHtml = btn ? btn.innerHTML : null;
 
                     if(btn){
                         btn.disabled = true;
@@ -390,24 +388,10 @@
                         `;
                     }
 
-                   
-                    setTimeout(function () {
-                        hideLoader();
-                        if (btn) {
-                            btn.disabled = false;
-                            btn.innerHTML = originalBtnHtml;
-                        }
-                    }, 3000);
-
                 });
             });
         });
 
-
-        window.addEventListener("pageshow", function () {
-            hideLoader();
-        });
-
     </script>
 
 

app/templates/client_report.html

@@ -31,17 +31,16 @@
                     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
+                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">
-                    </button>
+                    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 class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">
-                    </button>
+                    MH & DC</button>
             </li>
             <li class="nav-item">
-                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"type="button">
-                    & Bedding </button>
+                    Laying & Bedding </button>
-            </li>
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">

app/templates/engineering/add_rate.html

@@ -0,0 +1,236 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="container-fluid mt-4">
+
+    <div class="card shadow">
+
+        <div class="card-header bg-primary text-white">
+            <h4 class="mb-0">
+                <i class="bi bi-currency-rupee"></i>
+                Subcontractor Rate Master
+            </h4>
+        </div>
+
+        <div class="card-body">
+
+            <form method="POST">
+
+                <div class="row">
+
+                    <!-- Subcontractor -->
+                    <div class="col-md-4 mb-3">
+                        <label class="form-label fw-bold">
+                            Subcontractor
+                        </label>
+
+                        <select name="subcontractor_id"
+                                class="form-select"
+                                required>
+
+                            <option value="">
+                                Select Subcontractor
+                            </option>
+
+                            {% for sub in subcontractors %}
+                            <option value="{{ sub.id }}">
+                                {{ sub.subcontractor_name }}
+                            </option>
+                            {% endfor %}
+
+                        </select>
+                    </div>
+
+                    <!-- Category -->
+                    <div class="col-md-4 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Category
+                        </label>
+
+                        <select name="category"
+                                class="form-select"
+                                required>
+
+                            <option value="">
+                                Select Category
+                            </option>
+
+                            <option value="TR_EX">
+                                Trench Excavation
+                            </option>
+
+                            <option value="MH_EX">
+                                Manhole Excavation
+                            </option>
+
+                            <option value="MH_DC">
+                                Manhole & Domestic Chamber
+                            </option>
+
+                            <option value="LAYING">
+                                Pipe Laying
+                            </option>
+
+                        </select>
+
+                    </div>
+
+                    <!-- Status -->
+                    <div class="col-md-4 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Status
+                        </label>
+
+                        <select name="status"
+                                class="form-select">
+
+                            <option value="Active">
+                                Active
+                            </option>
+
+                            <option value="Inactive">
+                                Inactive
+                            </option>
+
+                        </select>
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <!-- Item Code -->
+                    <div class="col-md-3 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Item Code
+                        </label>
+
+                        <input type="text"
+                               name="item_code"
+                               class="form-control"
+                               placeholder="SM01"
+                               required>
+
+                    </div>
+
+                    <!-- Item Name -->
+                    <div class="col-md-5 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Item Name
+                        </label>
+
+                        <input type="text"
+                               name="item_name"
+                               class="form-control"
+                               placeholder="Soft Murum 0-1.5"
+                               required>
+
+                    </div>
+
+                    <!-- Unit -->
+                    <div class="col-md-2 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Unit
+                        </label>
+
+                        <select name="unit"
+                                class="form-select">
+
+                            <option value="Cum">Cum</option>
+                            <option value="Nos">Nos</option>
+                            <option value="Rmt">Rmt</option>
+                            <option value="Sqm">Sqm</option>
+
+                        </select>
+
+                    </div>
+
+                    <!-- Rate -->
+                    <div class="col-md-2 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Rate (₹)
+                        </label>
+
+                        <input type="number"
+                               step="0.01"
+                               min="0"
+                               name="rate"
+                               class="form-control"
+                               placeholder="0.00"
+                               required>
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <!-- Effective From -->
+                    <div class="col-md-3 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Effective From
+                        </label>
+
+                        <input type="date"
+                               name="effective_from"
+                               class="form-control"
+                               required>
+
+                    </div>
+
+                    <!-- Effective To -->
+                    <div class="col-md-3 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Effective To
+                        </label>
+
+                        <input type="date"
+                               name="effective_to"
+                               class="form-control">
+
+                    </div>
+
+                </div>
+
+                <hr>
+
+                <div class="text-end">
+
+                    <button type="reset"
+                            class="btn btn-secondary">
+
+                        <i class="bi bi-arrow-clockwise"></i>
+
+                        Reset
+
+                    </button>
+
+                    <button type="submit"
+                            class="btn btn-success">
+
+                        <i class="bi bi-check-circle"></i>
+
+                        Save Rate
+
+                    </button>
+
+                </div>
+
+            </form>
+
+        </div>
+
+    </div>
+
+</div>
+
+
+{% endblock %}

app/templates/engineering/client_rate.html

@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-
-<div class="container-fluid mt-4">
-
-    <div class="card shadow">
-
-        <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
-
-            <h4 class="mb-0">
-                <i class="bi bi-currency-rupee"></i>
-                Client Rate Master
-            </h4>
-
-        </div>
-
-    </div>
-
-
-{% endblock %}

app/templates/engineering/contractor_rate.html

@@ -1,384 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-
-<div class="container-fluid mt-4">
-
-    <div class="card shadow">
-
-        <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
-
-            <h4 class="mb-0">
-                <i class="bi bi-currency-rupee"></i>
-                Subcontractor Rate Master
-            </h4>
-
-        </div>
-
-        <div class="card-body">
-
-            <form method="POST" id="rateForm">
-
-                <!-- Hidden ID -->
-                <input type="hidden" id="rate_id" name="id" value="{{ rate.id if rate else '' }}">
-
-                <div class="row">
-
-                    <!-- Subcontractor -->
-                    <div class="col-md-4 mb-3">
-                        <label class="form-label fw-bold"> Subcontractor </label>
-                        <select id="subcontractor_id" name="subcontractor_id" class="form-select"  required>
-                            <option value="">-- Select Subcontractor --</option>
-                            {% for sub in subcontractors %}
-                            <option value="{{ sub.id }}"
-                            {% if rate and rate.subcontractor_id==sub.id %}
-                                selected
-                            {% endif %}>
-                                {{ sub.subcontractor_name }}
-                            </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-
-                    <!-- Category -->
-                    <div class="col-md-4 mb-3">
-                        <label class="form-label fw-bold"> Category  </label>
-                        <select id="category" name="category" class="form-select" required>
-                            <option value="">-- Select Category --</option>
-
-                            <option value="trench_excavation"
-                            {% if rate and rate.category=="trench_excavation" %}selected{% endif %}>
-                                Trench Excavation
-                            </option>
-                            <option value="manhole_excavation"
-                            {% if rate and rate.category=="manhole_excavation" %}selected{% endif %}>
-                                Manhole Excavation
-                            </option>
-
-                            <option value="Manhole_Domestic_Chamber"
-                            {% if rate and rate.category=="Manhole_Domestic_Chamber" %}selected{% endif %}>
-                                MH & Domestic Chamber
-                            </option>
-
-                            <option value="Laying"
-                            {% if rate and rate.category=="Laying" %}selected{% endif %}>
-                                Pipe Laying
-                            </option>
-
-                        </select>
-                    </div>
-
-                    <!-- Status -->
-                    <div class="col-md-4 mb-3">
-                        <label class="form-label fw-bold"> Status </label>
-
-                        <select name="status" class="form-select">
-                            <option value="Active"
-                            {% if not rate or rate.status=="Active" %}selected{% endif %}>
-                                Active
-                            </option>
-
-                            <option value="Inactive"
-                            {% if rate and rate.status=="Inactive" %}selected{% endif %}>
-                                Inactive
-                            </option>
-
-                        </select>
-                    </div>
-                </div>
-
-                <div class="row">
-
-                    <!-- Item Code -->
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label fw-bold"> Item Code </label>
-                        <input type="text" name="item_code" class="form-control" value="{{ rate.item_code if rate else '' }}" required>
-                    </div>
-
-                    <!-- Item Name -->
-                    <div class="col-md-5 mb-3">
-                        <label class="form-label fw-bold"> Item Name </label>
-                        <input type="text"
-                            id="item_name"
-                            name="item_name"
-                            class="form-control"
-                            autocomplete="off"
-                            value="{{ rate.item_name if rate else '' }}"
-                            required>
-
-                            <small id="duplicateMessage"
-                                class="text-danger"
-                                style="display:none;">
-                            </small>
-                    </div>
-
-
-                    <!-- Unit -->
-                    <div class="col-md-2 mb-3">
-                        <label class="form-label fw-bold">Unit</label>
-                        <select name="unit" class="form-select">
-                            <option value="Cum"
-                            {% if not rate or rate.unit=="Cum" %}selected{% endif %}>
-                                Cum
-                            </option>
-                            <option value="Nos"
-                            {% if rate and rate.unit=="Nos" %}selected{% endif %}>
-                                Nos
-                            </option>
-                            <option value="Rmt"
-                            {% if rate and rate.unit=="Rmt" %}selected{% endif %}>
-                                Rmt
-                            </option>
-                            <option value="Sqm"
-                            {% if rate and rate.unit=="Sqm" %}selected{% endif %}>
-                                Sqm
-                            </option>
-                        </select>
-                    </div>
-
-                    <!-- Rate -->
-                    <div class="col-md-2 mb-3">
-                        <label class="form-label fw-bold">Rate</label>
-                        <input type="number" step="0.01" name="rate" class="form-control" value="{{ rate.rate if rate else '' }}" required>
-                    </div>
-                </div>
-
-                <div class="row">
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label fw-bold"> Effective From </label>
-                        <input type="date" name="effective_from" class="form-control" value="{{ rate.effective_from if rate else '' }}" required>
-                    </div>
-
-                    <div class="col-md-3 mb-3">
-                        <label class="form-label fw-bold"> Effective To </label>
-                        <input type="date" name="effective_to" class="form-control" value="{{ rate.effective_to if rate else '' }}">
-                    </div>
-                </div>
-
-                <hr>
-
-                <div class="text-end">
-                    <a href="{{ url_for('engineering.add_subcontractor_rates') }}" class="btn btn-secondary">
-                        <i class="bi bi-arrow-clockwise"></i> Reset
-                    </a>
-
-                    <button type="submit" id="saveBtn" class="btn btn-success">
-                        {% if rate %}
-                        <i class="bi bi-pencil-square"></i>
-                        Update Rate
-                        {% else %}
-                        <i class="bi bi-check-circle"></i>
-                        Save Rate
-                        {% endif %}
-                    </button>
-                </div>
-            </form>
-        </div>
-    </div>
-
-    <!-- Table -->
-    <div class="card shadow mt-4">
-        <div class="card-header bg-dark text-white">
-            <h5 class="mb-0">
-                <i class="bi bi-table"></i>Rate List
-            </h5>
-        </div>
-
-        <div class="card-body">
-            <table class="table table-bordered table-hover table-striped" id="rateTable">
-                <thead class="table-primary">
-                    <tr>
-                        <th>#</th>
-                        <th>Subcontractor</th>
-                        <th>Category</th>
-                        <th>Item Code</th>
-                        <th>Item Name</th>
-                        <th>Unit</th>
-                        <th>Rate</th>
-                        <th>Status</th>
-                        <th width="130">Action</th>
-                    </tr>
-                </thead>
-                <tbody>
-
-                {% for row in rates %}
-                    <tr>
-                        <td>{{ loop.index }}</td>
-                        <td>{{ row.subcontractor.subcontractor_name }}</td>
-                        <td>{{ row.category }}</td>
-                        <td>{{ row.item_code }}</td>
-                        <td>{{ row.item_name }}</td>
-                        <td>{{ row.unit }}</td>
-                        <td>{{ row.rate }}</td>
-                        <td>
-                            {% if row.status=="Active" %}
-                                <span class="badge bg-success">
-                                    Active
-                                </span>
-                            {% else %}
-                                <span class="badge bg-danger">
-                                    Inactive
-                                </span>
-                            {% endif %}
-                        </td>
-
-                        <td>
-                            <a href="{{ url_for('engineering.edit_rate', rate_id=row.id) }}" class="btn btn-warning btn-sm">
-                                <i class="bi bi-pencil-square"></i>
-                            </a>
-
-                            <a href="{{ url_for('engineering.delete_rate', rate_id=row.id) }}"
-                                class="btn btn-danger btn-sm" onclick="return confirm('Delete this Item:{{row.item_name}} & Rate:{{row.rate}} ?')">
-                                <i class="bi bi-trash"></i>
-                            </a>
-                        </td>
-                    </tr>
-                {% endfor %}
-
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-
-<script>
-
-    $(document).ready(function () {
-
-        // ----------------------------
-        // DataTable
-        // ----------------------------
-        $("#rateTable").DataTable({
-            responsive: true,
-            pageLength: 10,
-            destroy: true
-        });
-
-        // ----------------------------
-        // Validate on field change
-        // ----------------------------
-        $("#subcontractor_id, #category").on("change", function () {
-            clearValidation();
-            checkDuplicateRate();
-
-        });
-
-        // ----------------------------
-        // Validate while typing
-        // ----------------------------
-        let timer;
-
-        $("#item_name").on("keyup input", function () {
-            clearTimeout(timer);
-            timer = setTimeout(function () {
-                checkDuplicateRate();
-            }, 300);
-
-        });
-
-        // Edit Mode
-        checkDuplicateRate();
-
-        // ----------------------------
-        // Prevent Submit
-        // ----------------------------
-        $("#rateForm").submit(function (e) {
-
-            if ($("#saveBtn").prop("disabled")) {
-                e.preventDefault();
-                $("#item_name").focus();
-                return false;
-
-            }
-
-        });
-
-    });
-
-
-    //=========================================
-    // Reset Validation
-    //=========================================
-    function clearValidation() {
-        $("#duplicateMessage")
-            .hide()
-            .text("")
-            .removeClass("text-success text-danger");
-
-        $("#item_name")
-            .removeClass("is-valid is-invalid");
-        $("#saveBtn").prop("disabled", false);
-    }
-
-
-
-    //=========================================
-    // Duplicate Validation
-    //=========================================
-    function checkDuplicateRate() {
-        let subcontractor = $("#subcontractor_id").val();
-        let category      = $("#category").val();
-        let item_name     = $("#item_name").val().trim();
-        let rate_id       = $("#rate_id").val();
-
-        // Mandatory fields
-        if (
-            subcontractor == "" ||
-            category == "" ||
-            item_name.length < 2
-        ) {
-            clearValidation();
-            return;
-        }
-
-        $.ajax({
-
-            url: "{{ url_for('engineering.check_rate') }}",
-            type: "GET",
-            dataType: "json",
-            data: {
-                subcontractor_id: subcontractor,
-                category: category,
-                item_name: item_name,
-                rate_id: rate_id
-            },
-
-            success: function (response) {
-                if (response.exists) {
-                    $("#duplicateMessage")
-                        .text("This Item Name already exists for the selected Subcontractor and Category.")
-                        .removeClass("text-success")
-                        .addClass("text-danger")
-                        .show();
-
-                    $("#item_name")
-                        .removeClass("is-valid")
-                        .addClass("is-invalid");
-
-                    $("#saveBtn").prop("disabled", true);
-
-                }
-                else {
-                    $("#duplicateMessage")
-                        .text("Item Name is available.")
-                        .removeClass("text-danger")
-                        .addClass("text-success")
-                        .show();
-
-                    $("#item_name")
-                        .removeClass("is-invalid")
-                        .addClass("is-valid");
-
-                    $("#saveBtn").prop("disabled", false);
-                }
-            },
-
-            error: function () {
-                clearValidation();
-            }
-        });
-
-    }
-
-</script>
-
-{% endblock %}

app/templates/subcontractor_report.html

@@ -33,26 +33,13 @@
             <form method="POST" class="loading-form">
 
                 <div class="row g-3">
-                    <div class="col-lg-3">
-                        <label class="form-label fw-semibold"> Location </label>
-                        <select name="location" id="location" class="form-select">
-                            <option value="">--- Select Location ---</option>
-                            {% for loc in locations %}
-                            <option value="{{ loc }}"
-                                {% if selected_location == loc %}selected{% endif %}>
-                                {{ loc }}
-                            </option>
-                            {% endfor %}
-                        </select>
-                    </div>
-
                     <div class="col-lg-3">
                         <label class="form-label fw-semibold">
                             Subcontractor
-                            <span class="text-muted fw-normal"></span>
+                            <span class="text-danger">*</span>
                         </label>
-                        <select name="subcontractor_id" id="subcontractor_id" class="form-select">
+                        <select name="subcontractor_id" class="form-select" required>
-                            <option value="">--- All Subcontractors ---</option>
+                            <option value="">--- Select Contractor ---</option>
                             {% for sc in subcontractors %}
                             <option value="{{ sc.id }}"
                                 {% if selected_sc_id|string == sc.id|string %}selected{% endif %}>
@@ -74,13 +61,13 @@
                     </div>
 
                     <div class="col-lg-3">
-                        <label class="form-label fw-semibold"> MH No </label>
+                        <label class="form-label fw-semibold"> Location </label>
                         <input
                             type="text"
-                            name="mh_no"
+                            name="location"
                             class="form-control"
-                            placeholder="Enter MH No"
+                            placeholder="Project Location"
-                            value="{{ selected_mh_no or '' }}">
+                            value="{{ selected_location or '' }}">
                     </div>
 
                     <div class="col-lg-3">
@@ -101,7 +88,7 @@
 
                             <option value="dc"
                             {% if request.form.get('category')=='dc' %}selected{% endif %}>
-                                Manhole Domestic Chamber
+                                Manhole Domestic Chamber 
                             </option>
 
                             <option value="laying"
@@ -168,148 +155,99 @@
     </div>
 
     {% if tables %}
-    {% set show_all = (not selected_category) or selected_category == 'all' %}
     <!-- Tabs -->
     <div class="card shadow-sm border-0 mt-4">
         <div class="card-header bg-light">
             <ul class="nav nav-pills">
                 <li class="nav-item">
-                    <button class="nav-link {% if show_all %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#abstract">
+                    <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#abstract">
                         <i class="bi bi-file-earmark-text"></i> Abstract 
                     </button>
                 </li>
 
-                {% if show_all or selected_category == 'tr' %}
                 <li class="nav-item">
-                    <button class="nav-link {% if selected_category == 'tr' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#tr">
+                    <button class="nav-link "  data-bs-toggle="tab" data-bs-target="#tr">
                         <i class="bi bi-cone-striped"></i> Trench Excavation
                     </button>
                 </li>
-                {% endif %}
 
-                {% if show_all or selected_category == 'mh' %}
                 <li class="nav-item">
-                    <button class="nav-link {% if selected_category == 'mh' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#mh">
+                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#mh">
                         <i class="bi bi-nut"></i> Manhole Excavation
                     </button>
                 </li>
-                {% endif %}
 
-                {% if show_all or selected_category == 'dc' %}
                 <li class="nav-item">
-                    <button class="nav-link {% if selected_category == 'dc' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#dc">
+                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#dc">
                         <i class="bi bi-grid-3x3"></i> Manhole & Domestic Chambers Construction
                     </button>
                 </li>
-                {% endif %}
 
-                {% if show_all or selected_category == 'laying' %}
                 <li class="nav-item">
-                    <button class="nav-link {% if selected_category == 'laying' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#laying">
+                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#laying">
                         <i class="bi bi-bezier2"></i> Pipe Laying
                     </button>
                 </li>
-                {% endif %}
             </ul>
         </div>
 
         <div class="card-body">
             <div class="tab-content">
 
-                <div class="tab-pane fade {% if show_all %}show active{% endif %}" id="abstract">
+                <div class="tab-pane fade show active" id="abstract">
                     {{ abstract_html|safe }}
                 </div>
 
-                {% if show_all or selected_category == 'tr' %}
                 <!-- Trench -->
-                <div class="tab-pane fade {% if selected_category == 'tr' %}show active{% endif %}" id="tr">
+                <div class="tab-pane fade "id="tr">
-                    {% if has_data.tr %}
+                    <div class="mb-3">
-                    <div class="mb-3 d-flex gap-2 flex-wrap">
                         <button onclick="deleteSelected('tr')" class="btn btn-danger">
                             <i class="bi bi-trash"></i> Delete Selected
                         </button>
-                        <button type="button" class="btn btn-outline-primary bulk-edit-toggle-btn" data-model="tr">
-                            <i class="bi bi-pencil-square"></i> Bulk Edit
-                        </button>
-                        <button type="button" class="btn btn-outline-secondary bulk-edit-cancel-btn d-none" data-model="tr">
-                            Cancel
-                        </button>
                     </div>
-                    {% endif %}
                     <div class="table-responsive border rounded shadow-sm">
                         {{ tables.tr|safe }}
                     </div>
                 </div>
-                {% endif %}
 
-                {% if show_all or selected_category == 'mh' %}
                 <!-- MH -->
-                <div class="tab-pane fade {% if selected_category == 'mh' %}show active{% endif %}" id="mh">
+                <div class="tab-pane fade" id="mh">
-                    {% if has_data.mh %}
+                    <div class="mb-3">
-                    <div class="mb-3 d-flex gap-2 flex-wrap">
                         <button onclick="deleteSelected('mh')" class="btn btn-danger">
                             <i class="bi bi-trash"></i>Delete Selected
                         </button>
-                        <button type="button" class="btn btn-outline-primary bulk-edit-toggle-btn" data-model="mh">
-                            <i class="bi bi-pencil-square"></i> Bulk Edit
-                        </button>
-                        <button type="button" class="btn btn-outline-secondary bulk-edit-cancel-btn d-none" data-model="mh">
-                            Cancel
-                        </button>
                     </div>
-                    {% endif %}
                     <div class="table-responsive border rounded shadow-sm">
                         {{ tables.mh|safe }}
                     </div>
                 </div>
-                {% endif %}
 
-                {% if show_all or selected_category == 'dc' %}
                 <!-- DC -->
-                <div class="tab-pane fade {% if selected_category == 'dc' %}show active{% endif %}" id="dc">
+                <div class="tab-pane fade" id="dc">
-                    {% if has_data.dc %}
+                    <div class="mb-3">
-                    <div class="mb-3 d-flex gap-2 flex-wrap">
                         <button onclick="deleteSelected('dc')"class="btn btn-danger">
                             <i class="bi bi-trash"></i>
                             Delete Selected
                         </button>
-                        <button type="button" class="btn btn-outline-primary bulk-edit-toggle-btn" data-model="dc">
-                            <i class="bi bi-pencil-square"></i> Bulk Edit
-                        </button>
-                        <button type="button" class="btn btn-outline-secondary bulk-edit-cancel-btn d-none" data-model="dc">
-                            Cancel
-                        </button>
                     </div>
-                    {% endif %}
                     <div class="table-responsive border rounded shadow-sm">
                         {{ tables.dc|safe }}
                     </div>
                 </div>  
-                {% endif %}
 
-                {% if show_all or selected_category == 'laying' %}
                 <!-- Laying -->
-                <div class="tab-pane fade {% if selected_category == 'laying' %}show active{% endif %}" id="laying">
+                <div class="tab-pane fade" id="laying">
-                    {% if has_data.laying %}
+                    <div class="mb-3">
-                    <div class="mb-3 d-flex gap-2 flex-wrap">
                         <button onclick="deleteSelected('laying')"
                                 class="btn btn-danger">
                             <i class="bi bi-trash"></i>
                             Delete Selected
                         </button>
-                        <button type="button" class="btn btn-outline-primary bulk-edit-toggle-btn" data-model="laying">
-                            <i class="bi bi-pencil-square"></i> Bulk Edit
-                        </button>
-                        <button type="button" class="btn btn-outline-secondary bulk-edit-cancel-btn d-none" data-model="laying">
-                            Cancel
-                        </button>
                     </div>
-                    {% endif %}
                     <div class="table-responsive border rounded shadow-sm">
                         {{ tables.laying|safe }}
                     </div>
                 </div>
-                {% endif %}
             </div>
         </div>
     </div>
@@ -318,290 +256,39 @@
 </div>
 
 <script>
-    // NOTE: this content block renders before base.html's bottom-of-body
+    // Reset 
-    // <script src="jquery..."> tag, so $ is not defined yet if this runs
+    document.getElementById("resetBtn").addEventListener("click", function () {location.reload();});
-    // immediately - that was silently breaking the location cascade
-    // (and DataTable init) below. Deferring to DOMContentLoaded (native
-    // JS, no jQuery needed to register it) guarantees jQuery has loaded
-    // by the time this code actually runs.
-    document.addEventListener("DOMContentLoaded", function () {
 
-        // Remember which tab is active so that actions which reload the
+    // DATATABLE
-        // page (Delete Selected, bulk delete, bulk-edit Save) bring you
+    $(document).ready(function () {
-        // back to the tab you were working on instead of resetting to
+        $('.datatable').DataTable({
-        // the Abstract tab (the default "active" one in the markup).
+            pageLength: 10,
-        const TAB_STORAGE_KEY = "subReportActiveTab";
+            dom: 'Bfrtip',
-
+            buttons: ['copy', 'csv', 'excel', 'print']
-        $(document).on("shown.bs.tab", '[data-bs-toggle="tab"]', function (e) {
-            let target = $(e.target).attr("data-bs-target"); // e.g. "#tr"
-            if (target) sessionStorage.setItem(TAB_STORAGE_KEY, target);
-        });
-
-        (function restoreActiveTab() {
-            let target = sessionStorage.getItem(TAB_STORAGE_KEY);
-            if (!target) return;
-            let btn = document.querySelector(`[data-bs-toggle="tab"][data-bs-target="${target}"]`);
-            if (btn) {
-                bootstrap.Tab.getOrCreateInstance(btn).show();
-            }
-        })();
-
-        // Reset
-        document.getElementById("resetBtn").addEventListener("click", function () {
-            sessionStorage.removeItem(TAB_STORAGE_KEY);
-            location.reload();
-        });
-
-        // LOCATION -> SUBCONTRACTOR CASCADE
-        $(document).on("change", "#location", function () {
-            let location = $(this).val();
-            let $sc = $("#subcontractor_id");
-            let currentVal = $sc.val();
-
-            $.getJSON("/file/get_subcontractors_by_location", { location: location }, function (data) {
-                $sc.empty().append('<option value="">--- All Subcontractors ---</option>');
-
-                data.forEach(function (sc) {
-                    $sc.append(`<option value="${sc.id}">${sc.name}</option>`);
-                });
-
-                if (data.some(sc => String(sc.id) === String(currentVal))) {
-                    $sc.val(currentVal);
-                }
-            }).fail(function () {
-                alert("Failed to load subcontractors for this location.");
-            });
-        });
-
-        // DATATABLE
-        // Initialize each table independently and wrap in try/catch: if
-        // one table is malformed for any reason, it logs an error but
-        // does NOT stop the rest of this script (select-all handlers,
-        // delete handlers, etc.) from registering for the other tables.
-        // Instances are kept in dtInstances (keyed by model) so bulk-edit
-        // mode can force "show all rows" and disable search on demand.
-        const dtInstances = {};
-        $('.datatable').each(function () {
-            try {
-                let model = $(this).find('.select-all-checkbox').data('model');
-                let dt = $(this).DataTable({
-                    pageLength: 10,
-                    dom: 'Bfrtip',
-                    buttons: ['copy', 'csv', 'excel', 'print'],
-                    columnDefs: [
-                        { orderable: false, targets: [0, -1, -2] } // Select, Update, Delete columns
-                    ]
-                });
-                if (model) dtInstances[model] = dt;
-            } catch (err) {
-                console.error("DataTable init failed for a table:", err);
-            }
-        });
-
-        // SELECT ALL (per table)
-        // The header checkbox is rendered server-side with
-        // class="select-all-checkbox" and data-model="tr|mh|dc|laying"
-        // (see add_select_all_header in file_report.py), and each row
-        // checkbox carries the same data-model. Scoping by data-model
-        // means checking "select all" on the Trench Excavation tab only
-        // toggles Trench Excavation rows, not the other 3 tables.
-        $(document).on("change", ".select-all-checkbox", function () {
-            let model = $(this).data("model");
-            $(`.row-check[data-model="${model}"]`).prop("checked", this.checked);
-        });
-
-        // Keep a table's select-all checkbox in sync if a row is
-        // unchecked/checked individually.
-        $(document).on("change", ".row-check", function () {
-            let model = $(this).data("model");
-            let $rows = $(`.row-check[data-model="${model}"]`);
-            let allChecked = $rows.length > 0 && $rows.length === $rows.filter(":checked").length;
-            $(`.select-all-checkbox[data-model="${model}"]`).prop("checked", allChecked);
-        });
-
-        // ============== BULK EDIT (per table) ==============
-        // Each of the 4 tables has its own Bulk Edit / Cancel button
-        // (data-model="tr|mh|dc|laying"). Editing one table never
-        // touches the others - each is entered, tracked, saved, and
-        // cancelled independently, and multiple tables can be in edit
-        // mode at the same time if you click more than one toggle.
-        //
-        // Every <td data-field="..."> (see add_data_field_attrs in
-        // file_report.py) is an editable data cell whose data-field
-        // names the real database column. Tab-pane ids ("tr", "mh",
-        // "dc", "laying") match the model keys 1:1, so `#${model}` scopes
-        // every selector below to just that one table.
-        let bulkEditActiveModels = {};
-        let pendingBulkChanges = {};
-
-        function bulkEditButtons(model) {
-            return {
-                $toggle: $(`.bulk-edit-toggle-btn[data-model="${model}"]`),
-                $cancel: $(`.bulk-edit-cancel-btn[data-model="${model}"]`)
-            };
-        }
-
-        function enterBulkEditMode(model) {
-            bulkEditActiveModels[model] = true;
-            pendingBulkChanges[model] = {};
-
-            // Show every row and disable search for THIS table only -
-            // otherwise DataTables pagination/filtering could redraw
-            // this table using its own stored (unedited) data and
-            // silently wipe out edits on a row that's since scrolled
-            // off-page.
-            let dt = dtInstances[model];
-            if (dt) {
-                dt.page.len(-1).draw(false);
-                $(dt.table().container()).find('.dataTables_filter input').prop('disabled', true);
-            }
-
-            $(`#${model} td[data-field]`).each(function () {
-                let original = $(this).text().trim();
-                $(this).data('original', original);
-                $(this).empty().append(
-                    $('<input>', {
-                        type: 'text',
-                        class: 'form-control form-control-sm bulk-edit-input',
-                        value: original
-                    })
-                );
-            });
-
-            let { $toggle, $cancel } = bulkEditButtons(model);
-            $toggle.html('<i class="bi bi-save"></i> Save All Changes')
-                .removeClass('btn-outline-primary').addClass('btn-success');
-            $cancel.removeClass('d-none');
-        }
-
-        function exitBulkEditMode(model, { revert }) {
-            bulkEditActiveModels[model] = false;
-            pendingBulkChanges[model] = {};
-
-            $(`#${model} td[data-field]`).each(function () {
-                let $td = $(this);
-                let $input = $td.find('.bulk-edit-input');
-                if ($input.length) {
-                    let value = revert ? ($td.data('original') ?? '') : $input.val();
-                    $td.empty().text(value);
-                }
-            });
-
-            let dt = dtInstances[model];
-            if (dt) {
-                dt.page.len(10).draw(false);
-                $(dt.table().container()).find('.dataTables_filter input').prop('disabled', false);
-            }
-
-            let { $toggle, $cancel } = bulkEditButtons(model);
-            $toggle.html('<i class="bi bi-pencil-square"></i> Bulk Edit')
-                .removeClass('btn-success').addClass('btn-outline-primary');
-            $cancel.addClass('d-none');
-        }
-
-        $(document).on('input', '.bulk-edit-input', function () {
-            let $td = $(this).closest('td');
-            let $tr = $(this).closest('tr');
-            let field = $td.data('field');
-            let model = $tr.find('.delete-btn').data('model');
-            let id = $tr.find('.delete-btn').data('id');
-            if (!model || id === undefined) return;
-
-            if (!pendingBulkChanges[model]) pendingBulkChanges[model] = {};
-            if (!pendingBulkChanges[model][id]) pendingBulkChanges[model][id] = {};
-            pendingBulkChanges[model][id][field] = $(this).val();
-        });
-
-        function saveBulkChanges(model) {
-            let changes = pendingBulkChanges[model] || {};
-            if (Object.keys(changes).length === 0) {
-                alert("No changes to save.");
-                return;
-            }
-            if (!confirm("Save all changes?")) return;
-
-            let payload = {};
-            payload[model] = changes;
-
-            fetch("/file/bulk_update", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify(payload)
-            })
-            .then(res => res.json().then(data => ({ ok: res.ok, data })))
-            .then(({ ok, data }) => {
-                if (ok && data.status === "success") {
-                    let msg = `Updated ${data.updated} field(s).`;
-                    if (data.errors && data.errors.length) {
-                        msg += "\n\nSome entries were skipped:\n" + data.errors.join("\n");
-                    }
-                    alert(msg);
-                    location.reload();
-                } else {
-                    alert("Update failed: " + (data.message || "Unknown error"));
-                }
-            })
-            .catch(err => alert("Update request failed: " + err));
-        }
-
-        $(document).on('click', '.bulk-edit-toggle-btn', function () {
-            let model = $(this).data('model');
-            if (!bulkEditActiveModels[model]) {
-                enterBulkEditMode(model);
-            } else {
-                saveBulkChanges(model);
-            }
-        });
-
-        $(document).on('click', '.bulk-edit-cancel-btn', function () {
-            let model = $(this).data('model');
-            exitBulkEditMode(model, { revert: true });
-        });
-
-        // SINGLE DELETE
-        $(document).on("click", ".delete-btn", function () {
-            let id = $(this).data("id");
-            let model = $(this).data("model");
-
-            if (!confirm("Are you sure you want to delete this record?")) return;
-
-            fetch("/file/delete_records", {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ model: model, ids: [id] })
-            })
-            .then(res => res.json().then(data => ({ ok: res.ok, data })))
-            .then(({ ok, data }) => {
-                if (ok && data.status === "success") {
-                    alert("Deleted Successfully");
-                    location.reload();
-                } else {
-                    alert("Delete failed: " + (data.message || "Unknown error"));
-                }
-            })
-            .catch(err => {
-                alert("Delete request failed: " + err);
-            });
         });
 
+        setTimeout(() => {
+            $("table thead tr th:first-child").html('<input type="checkbox" id="select-all">');
+        }, 500);
     });
 
-    // GET IDS - scoped to a single table via data-model, so "Delete
+    // SELECT ALL
-    // Selected" on one tab never picks up checked rows from another tab.
+    $(document).on("change", "#select-all", function () {
-    // (kept global - called from deleteSelected below)
+        $(".row-check").prop("checked", this.checked);
-    function getSelectedIds(model) {
+    });
+
+    // GET IDS
+    function getSelectedIds() {
         let ids = [];
-        $(`.row-check[data-model="${model}"]:checked`).each(function () {
+        $(".row-check:checked").each(function () {
             ids.push($(this).data("id"));
         });
         return ids;
     }
 
     // BULK DELETE
-    // Exposed on window because it's invoked from inline onclick="" attributes
+    function deleteSelected(model) {
-    // in the markup above, which always resolve names in the global scope.
+        let ids = getSelectedIds();
-    window.deleteSelected = function (model) {
-        let ids = getSelectedIds(model);
         if (ids.length === 0) return alert("Select records");
 
         if (!confirm(`Delete ${ids.length} record(s)?`)) return;
@@ -625,6 +312,33 @@
         });
     }
 
+    // SINGLE DELETE
+    $(document).on("click", ".delete-btn", function () {
+        let id = $(this).data("id");
+        let model = $(this).data("model");
+
+        if (!confirm("Are you sure you want to delete this record?")) return;
+
+        fetch("/file/delete_records", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ model: model, ids: [id] })
+        })
+        .then(res => res.json().then(data => ({ ok: res.ok, data })))
+        .then(({ ok, data }) => {
+            if (ok && data.status === "success") {
+                alert("Deleted Successfully");
+                location.reload();
+            } else {
+                alert("Delete failed: " + (data.message || "Unknown error"));
+            }
+        })
+        .catch(err => {
+            alert("Delete request failed: " + err);
+        });
+    });
+
+
 </script>
 
 {% endblock %}

docker-compose.yml

@@ -17,9 +17,11 @@ services:
     build: .
     container_name: comparison_app
     restart: always
+    env_file:
+      - .env
     environment:
-      FLASK_ENV: development
+      FLASK_ENV: production
-      FLASK_DEBUG: "True"
+      FLASK_DEBUG: "False"
       FLASK_HOST: "0.0.0.0"
       FLASK_PORT: "5001"
 

logs/app.log

@@ -1,3 +0,0 @@
-2026-08-06 12:44:45 | INFO     | User=System | IP=- | - | - | ======================================================================
-2026-08-06 12:44:45 | INFO     | User=System | IP=- | - | - | Application Started Successfully
-2026-08-06 12:44:45 | INFO     | User=System | IP=- | - | - | ======================================================================

requirements.txt

@@ -1,4 +1,5 @@
 Flask
+ldap3
 pandas
 openpyxl
 xlrd
@@ -8,5 +9,4 @@ cryptography
 xlsxwriter
 matplotlib 
 flask_sqlalchemy
-flask_migrate
+flask_migrate
-weasyprint

run.py

@@ -1,17 +1,13 @@
 from dotenv import load_dotenv
 load_dotenv()
 from app import create_app
-from app.services.db_service import db
 import os
 
 app = create_app()
 
 if __name__ == "__main__":
-    with app.app_context():
-        db.create_all() 
-
     app.run(
         host=os.getenv("FLASK_HOST"),
         port=int(os.getenv("FLASK_PORT")),
         debug=os.getenv("FLASK_DEBUG") == "True"
-    )
+    )