log changes

Merge branch 'pankaj-dev'
log changes
2026-08-07 12:33:42 +05:30 · 2026-08-07 12:12:58 +05:30 · 2026-08-07 12:12:07 +05:30 · 2026-08-07 10:29:15 +05:30 · 2026-08-06 13:39:13 +05:30 · 2026-08-06 12:46:16 +05:30
23 changed files with 1175 additions and 529 deletions
--- a/.env
+++ b/.env
@@ -4,7 +4,7 @@
 FLASK_ENV=development
 FLASK_DEBUG=True
 FLASK_HOST=0.0.0.0
-FLASK_PORT=5011
+FLASK_PORT=5015

 # -----------------------------
 # Security
@@ -23,17 +23,15 @@ DB_USER=root
 DB_PASSWORD=root

 # DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
-# -----------------------------
-# LDAP Configuration
-# -----------------------------
-USE_LDAP_AUTH=true

-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 Configuration new
+# -----------------------------
+LDAP_SERVER=ldap://host.docker.internal
+LDAP_PORT=389
+LDAP_USE_SSL=False
+
 LDAP_DOMAIN=lcepl.org
-
-# OpenLDAP standard username attribute
-LDAP_SEARCH_FILTER=(uid={username})
-
+LDAP_BASE_DN=DC=lcepl,DC=org
+LDAP_SEARCH_BASE=OU=Users,DC=lcepl,DC=org
--- a/9
+++ b/9
@@ -5,23 +5,20 @@ 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 gunicorn
+RUN pip install --no-cache-dir -r requirements.txt

 # 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 with Gunicorn (production WSGI server)
-CMD ["gunicorn", "--bind", "0.0.0.0:5001", "run:app"]
+# Run the application
+CMD ["python", "run.py"]
--- a/README.md
+++ b/README.md
@@ -36,7 +36,8 @@ The Comparison Project is designed to:

 ## Tech Stack

-**Backend Framework**: Flask  
+**Frontend Framework**: HTML, CSS, Js, Bootstrap  
+**Backend Framework**: Python Flask  
 **Database**: SQL Database (MySQL/PostgreSQL/SQLite configured via environment variables)  
 **ORM**: SQLAlchemy  
 **File Processing**: Pandas, OpenPyXL, XlsxWriter  
@@ -580,4 +581,4 @@ Open browser: `http://127.0.0.1:5000/`

 For issues, feature requests, or contributions, please contact the development team.

-**Last Updated:** January 2026
+**Last Updated:** April 2026
--- a/app/init.py
+++ b/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, migrate
+from app.services.db_service import db
 from app.services.logger_service import LoggerService

 def create_app():
@@ -9,9 +9,6 @@ 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)
@@ -38,7 +35,10 @@ 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,8 +47,11 @@ 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):
--- a/app/config.py
+++ b/app/config.py
@@ -1,6 +1,4 @@
 import os
-# project base url
-BASE_DIR = os.path.abspath(os.path.dirname(__file__))

 class Config:
    # secret key
@@ -23,23 +21,14 @@ 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 ----------------
-    USE_LDAP_AUTH = os.getenv("USE_LDAP_AUTH", "false").lower() == "true"
-    # e.g. "ldap://192.168.0.25:389" or "ldaps://192.168.0.25:636" (preferred, encrypted)
-    LDAP_SERVER = os.getenv("LDAP_URL", "ldap://192.168.0.25:389")
-    # 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_BIND_DN = os.getenv("LDAP_BIND_DN", "cn=admin,dc=lcepl,dc=org")
-    LDAP_BIND_PASSWORD = os.getenv("LDAP_BIND_PASSWORD", "")
-    # Base DN to search for user entries under
-    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})")
+
+    # LDAP Configuration New
+    LDAP_SERVER = os.getenv("LDAP_SERVER")
+    LDAP_PORT = int(os.getenv("LDAP_PORT", 389))
+    LDAP_USE_SSL = os.getenv("LDAP_USE_SSL", "False").lower() == "true"
+
+    LDAP_BASE_DN = os.getenv("LDAP_BASE_DN")
+    LDAP_DOMAIN = os.getenv("LDAP_DOMAIN")
+
+    LDAP_SEARCH_BASE = os.getenv("LDAP_SEARCH_BASE")
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -7,13 +7,10 @@ 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=True)
-    auth_source = db.Column(db.String(20), nullable=False, default="local")
+    password_hash = db.Column(db.String(255), nullable=False)

    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)
--- a/app/routes/auth.py
+++ b/app/routes/auth.py
@@ -1,49 +1,98 @@
-from flask import Blueprint, render_template, request, redirect, url_for, flash, session
+from flask import (Blueprint, render_template, request, redirect, url_for, flash, session, current_app)
+
 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:
+            email = request.form.get("email", "").strip()
+            password = request.form.get("password", "")
+
+            if not email or not password:
+                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["user_email"] = user.email
-            flash("Login successful", "success")
+                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"))

-        flash("Invalid email or password", "danger")
+            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()
-    flash("Logged out successfully", "info")
+    current_app.logger.info(f"Logout successful. User={username}")
+    flash(SuccessMessage.LOGOUT,"info")
+
    return redirect(url_for("auth.login"))

+
+# ==========================
+# REGISTER
+# ==========================
@auth_bp.route("/register", methods=["GET", "POST"])
 def register():
-    if request.method == "POST":
-        name = request.form.get("name")
-        email = request.form.get("email")
-        password = request.form.get("password")

-        user = UserService.register_user(name, email, password)
-        if not user:
-            flash("Email already exists", "danger")
+    if request.method == "POST":
+        try:
+            name = request.form.get("name", "").strip()
+            email = request.form.get("email", "").strip()
+            password = request.form.get("password", "")
+
+            if not name or not email or not password:
+                flash(ErrorMessage.INVALID_REQUEST,"danger")
                return redirect(url_for("auth.register"))

-        flash("User registered successfully", "success")
+            user = UserService.register_user(name, email, password)
+
+            if not user:
+                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"))

-    return render_template("register.html", title="Register")
+        except Exception:
+            current_app.logger.exception("User Registration Failed" )
+            flash(ErrorMessage.INTERNAL_SERVER_ERROR,"danger")
+
+    return render_template("register.html",title="Register")
--- a/app/routes/engineering_master_routes.py
+++ b/app/routes/engineering_master_routes.py
@@ -4,7 +4,7 @@ from flask import (
    request,
    redirect,
    url_for,
-    flash
+    flash, jsonify
 )

 from app.models.subcontractor_model import Subcontractor
@@ -27,25 +27,7 @@ def engineering_master():
        title="Engineering Masters"
    )
    
-
-@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
-    )
-
+# Client rate model
@engi_bp.route("/client-rate")
 def client_rates():

@@ -54,3 +36,72 @@ 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
+    })
+
--- a/app/routes/file_report.py
+++ b/app/routes/file_report.py
@@ -29,17 +29,24 @@ def add_action_columns(df, model_key):
    if df.empty:
        return df

-    df.insert(0, "Select", df["Id"].apply(
+    # Edit + Delete side by side in one "Action" column, both as icon buttons.
+    df.insert(0, "Action", df["Id"].apply(
+        lambda x: (
+            f'<div class="d-flex gap-1">'
+            f'<a href="/file/edit/{model_key}/{x}" class="btn btn-sm btn-warning edit-btn" title="Edit">'
+            f'<i class="bi bi-pencil-square"></i></a>'
+            f'<button class="btn btn-sm btn-danger delete-btn" data-id="{x}" data-model="{model_key}" title="Delete">'
+            f'<i class="bi bi-trash"></i></button>'
+            f'</div>'
+        )
+    ))
+
+    df.insert(1, "Select", df["Id"].apply(
        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>'
-    )
+    df["Id"] = range(1, len(df) + 1)
+    df = df.rename(columns={"Id": "Sr No"})

    return df

@@ -236,6 +243,30 @@ def report_file():
        else:
            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
        # -----------------------------------------
@@ -256,6 +287,32 @@ def report_file():
            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
+            )
+            
+
        # ===================================================
        # DOWNLOAD EXCEL
        # ===================================================
@@ -267,16 +324,46 @@ 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)
-                bill.df_mh.to_excel(writer,sheet_name="Mh.Ex",index=False)
-                bill.df_dc.to_excel(writer,sheet_name="MH & DC",index=False)
-                bill.df_laying.to_excel(writer,sheet_name="Pipe Laying",index=False)
+             
+                sheet_map = [
+                    (bill.df_tr, "Tr.Ex"),
+                    (bill.df_mh, "Mh.Ex"),
+                    (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= "subcontractor_Report.xlsx",
+                download_name=filename,
                as_attachment=True 
            )

--- a/app/services/ldap_service.py
+++ b/app/services/ldap_service.py
@@ -1,72 +1,130 @@
+from ldap3 import (
+    Server,
+    Connection,
+    ALL,
+    NTLM,
+    SIMPLE,
+    SUBTREE
+)
+
 from flask import current_app
-from ldap3 import Server, Connection, ALL, SUBTREE
-from ldap3.core.exceptions import LDAPException
+from app.config import Config


 class LDAPService:
    """
-    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.
+    LDAP / Active Directory Authentication Service
    """

    @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 None
+            return {
+                "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(
-                server,
-                user=current_app.config["LDAP_BIND_DN"],
-                password=current_app.config["LDAP_BIND_PASSWORD"],
-                auto_bind=True,
+
+            # -----------------------------------
+            # LDAP SERVER
+            # -----------------------------------
+            server = Server(
+                Config.LDAP_SERVER,
+                port=Config.LDAP_PORT,
+                use_ssl=Config.LDAP_USE_SSL,
+                get_info=ALL
            )
-        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 ---
-        try:
-            search_filter = current_app.config["LDAP_SEARCH_FILTER"].format(username=username)
-            admin_conn.search(
-                search_base=current_app.config["LDAP_BASE_DN"],
+            # -----------------------------------
+            # Login Format
+            #
+            # username@domain.com
+            # -----------------------------------
+            user_dn = f"{username}@{Config.LDAP_DOMAIN}"
+
+            conn = Connection(
+                server,
+                user=user_dn,
+                password=password,
+                authentication=SIMPLE,
+                auto_bind=True
+            )
+
+            # -----------------------------------
+            # Search User
+            # -----------------------------------
+            search_filter = f"(sAMAccountName={username})"
+
+            conn.search(
+                search_base=Config.LDAP_SEARCH_BASE,
                search_filter=search_filter,
                search_scope=SUBTREE,
-                attributes=["cn", "mail", "uid"],
+                attributes=[
+                    "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

-        if not admin_conn.entries:
-            current_app.logger.warning(f"LDAP user not found: {username}")
-            admin_conn.unbind()
-            return None
+            display_name = username
+            email = ""

-        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']}"
+            if conn.entries:
+
+                entry = conn.entries[0]
+
+                if "displayName" in entry:
+                    display_name = str(entry.displayName)
+
+                if "mail" in entry:
+                    email = str(entry.mail)
+
+            conn.unbind()
+
+            current_app.logger.info(
+                f"LDAP Login Success : {username}"
            )
-        admin_conn.unbind()

-        # --- 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
+            return {
+                "success": True,
+                "user": {
+                    "username": username,
+                    "name": display_name,
+                    "email": email
+                }
+            }

-        return {"username": username, "name": 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."
+            }
--- a/app/services/subcontractor_rate_service.py
+++ b/app/services/subcontractor_rate_service.py
@@ -1,28 +1,66 @@
 from app.services.db_service import db
 from app.models.subcontractor_rate_model import SubcontractorRate
+from sqlalchemy import func


 class SubcontractorRateService:

    @staticmethod
-    def save_rate(form):
+    def save_or_update(form):

-        rate = SubcontractorRate(
-            subcontractor_id=form.get("subcontractor_id"),
-            category=form.get("category"),
-            item_code=form.get("item_code"),
-            item_name=form.get("item_name"),
-            unit=form.get("unit"),
-            rate=form.get("rate"),
-            effective_from=form.get("effective_from"),
-            effective_to=form.get("effective_to") or None,
-            status=form.get("status")
+        rate_id = form.get("id")
+
+        subcontractor_id = form.get("subcontractor_id")
+        category = form.get("category")
+        item_name = form.get("item_name").strip()
+
+        # -----------------------------
+        # Duplicate Validation
+        # -----------------------------
+        duplicate = (
+            SubcontractorRate.query
+            .filter(
+                SubcontractorRate.subcontractor_id == subcontractor_id,
+                SubcontractorRate.category == category,
+                func.lower(SubcontractorRate.item_name) == item_name.lower()
+            )
+            .first()
        )

-        db.session.add(rate)
-        db.session.commit()
-        return rate
+        # Ignore current record while editing
+        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 {
+            "success": True,
+            "message": "Saved Successfully."
+        }
    
    @staticmethod
    def get_all_rates():
@@ -32,34 +70,33 @@ class SubcontractorRateService:
            .order_by(SubcontractorRate.created_at.desc())
            .all()
        )
+        
+        
    @staticmethod
    def get_rate(rate_id):

        return SubcontractorRate.query.get_or_404(rate_id)
    
-    @staticmethod
-    def update_rate(rate_id, form):
-
-        rate = SubcontractorRate.query.get_or_404(rate_id)
-
-        rate.subcontractor_id = form.get("subcontractor_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")
-
-        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()
+        
+
+    @staticmethod
+    def check_duplicate(subcontractor_id, category, item_name, rate_id=None):
+
+        query = SubcontractorRate.query.filter(
+            SubcontractorRate.subcontractor_id == subcontractor_id,
+            SubcontractorRate.category == category,
+            func.lower(SubcontractorRate.item_name) == item_name.strip().lower()
+        )
+
+        if rate_id:
+            query = query.filter(SubcontractorRate.id != int(rate_id))
+
+        return query.first() is not None
+    
+    
+    
+    
--- a/app/services/user_service.py
+++ b/app/services/user_service.py
@@ -1,7 +1,6 @@
-from flask import current_app
 from app.models.user_model import User
 from app.services.db_service import db
-from app.services.ldap_service import LDAPService
+from flask import current_app

 class UserService:

@@ -10,57 +9,21 @@ class UserService:
        if User.query.filter_by(email=email).first():
            return None

-        user = User(name=name, email=email, auth_source="local")
+        user = User(name=name, email=email)
        user.set_password(password)

        db.session.add(user)
        db.session.commit()
+        current_app.logger.info("User list viewed")
        return user

    @staticmethod
-    def validate_login(identifier, password):
-        """
-        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()
+    def validate_login(email, password):
+        user = User.query.filter_by(email=email).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()
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -124,10 +124,21 @@
                                    <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">
@@ -144,21 +155,12 @@
                            <!-- 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 Standard Rates
+                                    <i class="bi bi-file-earmark-text me-1"></i> Client Rates
                                </a>
                            </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 -->
                    <li class="nav-item dropdown">

@@ -185,10 +187,10 @@
                                </small>
                            </li>

-                            <!-- Dashboard -->
+                            <!-- Masters -->
                            <li>
-                                <a class="dropdown-item text-light py-2" href="{{ url_for('dashboard.dashboard') }}">
-                                    <i class="bi bi-speedometer2 me-2"></i> Dashboard
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('engineering.engineering_master') }}">
+                                    <i class="bi bi-gear me-2"></i> Masters
                                </a>
                            </li>

@@ -199,12 +201,13 @@
                                </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>

@@ -223,9 +226,7 @@
                                    Secured by <strong>LCEPL</strong>
                                </small>
                            </li>
-
                        </ul>
-
                    </li>

                </ul>
@@ -379,6 +380,7 @@

                    showLoader();
                    const btn = this.querySelector("button[type='submit']");
+                    const originalBtnHtml = btn ? btn.innerHTML : null;

                    if(btn){
                        btn.disabled = true;
@@ -388,10 +390,24 @@
                        `;
                    }

+                   
+                    setTimeout(function () {
+                        hideLoader();
+                        if (btn) {
+                            btn.disabled = false;
+                            btn.innerHTML = originalBtnHtml;
+                        }
+                    }, 3000);
+
                });
            });
        });

+
+        window.addEventListener("pageshow", function () {
+            hideLoader();
+        });
+
    </script>


--- a/app/templates/client_report.html
+++ b/app/templates/client_report.html
@@ -31,6 +31,24 @@
                    type="button">Tr.Ex </button>
            </li>
            <li class="nav-item">
+<<<<<<< HEAD
+                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="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>
+            </li>
+            <li class="nav-item">
+<<<<<<< HEAD
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
+                    type="button">Laying
+                    & Bedding Comparison</button>
+=======
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                    & Bedding </button>
+>>>>>>> 1dceb640bd930c37888799f10f02fe90b219be67
+=======
                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">
                    Mh.Ex</button>
            </li>
@@ -41,6 +59,7 @@
            <li class="nav-item">
                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"type="button">
                    Laying & Bedding </button>
+>>>>>>> pankaj-dev
        </ul>

        <div class="tab-content mt-3" id="reportTabsContent">
--- a/app/templates/engineering/add_rate.html
+++ b/app/templates/engineering/add_rate.html
@@ -1,236 +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">
-            <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 %}
--- a/app/templates/engineering/client_rate.html
+++ b/app/templates/engineering/client_rate.html
@@ -0,0 +1,20 @@
+{% 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 %}
--- a/app/templates/engineering/contractor_rate.html
+++ b/app/templates/engineering/contractor_rate.html
@@ -0,0 +1,384 @@
+{% 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 %}
--- a/app/templates/engineering/list.html
+++ b/app/templates/engineering/list.html
--- a/app/templates/subcontractor_report.html
+++ b/app/templates/subcontractor_report.html
@@ -88,7 +88,7 @@

                            <option value="dc"
                            {% if request.form.get('category')=='dc' %}selected{% endif %}>
-                                Manhole Domestic Chamber 
+                                Domestic Chamber
                            </option>

                            <option value="laying"
@@ -155,51 +155,61 @@
    </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 active" data-bs-toggle="tab" data-bs-target="#abstract">
+                    <button class="nav-link {% if show_all %}active{% endif %}" 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 "  data-bs-toggle="tab" data-bs-target="#tr">
+                    <button class="nav-link {% if selected_category == 'tr' %}active{% endif %}" 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" data-bs-toggle="tab" data-bs-target="#mh">
+                    <button class="nav-link {% if selected_category == 'mh' %}active{% endif %}" 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" data-bs-toggle="tab" data-bs-target="#dc">
+                    <button class="nav-link {% if selected_category == 'dc' %}active{% endif %}" 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" data-bs-toggle="tab" data-bs-target="#laying">
+                    <button class="nav-link {% if selected_category == 'laying' %}active{% endif %}" 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 show active" id="abstract">
+                <div class="tab-pane fade {% if show_all %}show active{% endif %}" id="abstract">
                    {{ abstract_html|safe }}
                </div>

+                {% if show_all or selected_category == 'tr' %}
                <!-- Trench -->
-                <div class="tab-pane fade "id="tr">
+                <div class="tab-pane fade {% if selected_category == 'tr' %}show active{% endif %}" id="tr">
                    <div class="mb-3">
                        <button onclick="deleteSelected('tr')" class="btn btn-danger">
                            <i class="bi bi-trash"></i> Delete Selected
@@ -209,9 +219,11 @@
                        {{ tables.tr|safe }}
                    </div>
                </div>
+                {% endif %}

+                {% if show_all or selected_category == 'mh' %}
                <!-- MH -->
-                <div class="tab-pane fade" id="mh">
+                <div class="tab-pane fade {% if selected_category == 'mh' %}show active{% endif %}" id="mh">
                    <div class="mb-3">
                        <button onclick="deleteSelected('mh')" class="btn btn-danger">
                            <i class="bi bi-trash"></i>Delete Selected
@@ -221,9 +233,11 @@
                        {{ tables.mh|safe }}
                    </div>
                </div>
+                {% endif %}

+                {% if show_all or selected_category == 'dc' %}
                <!-- DC -->
-                <div class="tab-pane fade" id="dc">
+                <div class="tab-pane fade {% if selected_category == 'dc' %}show active{% endif %}" id="dc">
                    <div class="mb-3">
                        <button onclick="deleteSelected('dc')"class="btn btn-danger">
                            <i class="bi bi-trash"></i>
@@ -234,9 +248,11 @@
                        {{ tables.dc|safe }}
                    </div>
                </div>  
+                {% endif %}

+                {% if show_all or selected_category == 'laying' %}
                <!-- Laying -->
-                <div class="tab-pane fade" id="laying">
+                <div class="tab-pane fade {% if selected_category == 'laying' %}show active{% endif %}" id="laying">
                    <div class="mb-3">
                        <button onclick="deleteSelected('laying')"
                                class="btn btn-danger">
@@ -248,6 +264,7 @@
                        {{ tables.laying|safe }}
                    </div>
                </div>
+                {% endif %}
            </div>
        </div>
    </div>
@@ -256,31 +273,45 @@
 </div>

 <script>
-    // Reset 
-    document.getElementById("resetBtn").addEventListener("click", function () {location.reload();});
+    
+    document.getElementById("resetBtn").addEventListener("click", function () {
+        window.location.href = window.location.pathname;
+    });

    // DATATABLE
    $(document).ready(function () {
-        $('.datatable').DataTable({
+       
+        $('.datatable').each(function () {
+            $(this).DataTable({
                pageLength: 10,
                dom: 'Bfrtip',
-            buttons: ['copy', 'csv', 'excel', 'print']
+                buttons: ['copy', 'csv', 'excel', 'print'],
+                initComplete: function () {
+                   
+                    $(this).closest('.dataTables_wrapper')
+                        .find('thead tr th:first-child')
+                        .html('<input type="checkbox" class="select-all" title="Select All">');
+                }
+            });
+        });
    });

-        setTimeout(() => {
-            $("table thead tr th:first-child").html('<input type="checkbox" id="select-all">');
-        }, 500);
+    // SELECT ALL — scoped to the checkbox's own table only
+    $(document).on("change", ".select-all", function () {
+        $(this).closest("table").find(".row-check").prop("checked", this.checked);
    });

-    // SELECT ALL
-    $(document).on("change", "#select-all", function () {
-        $(".row-check").prop("checked", this.checked);
+    // If a row checkbox is unchecked manually, uncheck that table's select-all
+    $(document).on("change", ".row-check", function () {
+        if (!this.checked) {
+            $(this).closest("table").find(".select-all").prop("checked", false);
+        }
    });

-    // GET IDS
-    function getSelectedIds() {
+
+    function getSelectedIds(model) {
        let ids = [];
-        $(".row-check:checked").each(function () {
+        $("#" + model + " .row-check:checked").each(function () {
            ids.push($(this).data("id"));
        });
        return ids;
@@ -288,7 +319,7 @@

    // BULK DELETE
    function deleteSelected(model) {
-        let ids = getSelectedIds();
+        let ids = getSelectedIds(model);
        if (ids.length === 0) return alert("Select records");

        if (!confirm(`Delete ${ids.length} record(s)?`)) return;
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,11 +17,9 @@ services:
    build: .
    container_name: comparison_app
    restart: always
-    env_file:
-      - .env
    environment:
-      FLASK_ENV: production
-      FLASK_DEBUG: "False"
+      FLASK_ENV: development
+      FLASK_DEBUG: "True"
      FLASK_HOST: "0.0.0.0"
      FLASK_PORT: "5001"

--- a/logs/app.log
+++ b/logs/app.log
@@ -0,0 +1,180 @@
+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=- | - | - | ======================================================================
+<<<<<<< HEAD
+=======
+2026-08-07 11:46:57 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 11:46:57 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 11:46:57 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 11:47:12 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 11:47:12 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 11:47:12 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 11:47:14 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 11:47:14 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 11:47:14 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 11:47:18 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:18 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:19 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/static/images/lcepl.png | Request Started
+2026-08-07 11:47:19 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/static/images/lcepl.png | Request Completed | Status=200
+2026-08-07 11:47:22 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/logout | Request Started
+2026-08-07 11:47:22 | INFO     | User=Anonymous | IP=192.168.0.142 | GET | http://192.168.0.142:5015/logout | Logout successful. User=Laxmi
+2026-08-07 11:47:22 | INFO     | User=Anonymous | IP=192.168.0.142 | GET | http://192.168.0.142:5015/logout | Request Completed | Status=302
+2026-08-07 11:47:22 | INFO     | User=Anonymous | IP=192.168.0.142 | GET | http://192.168.0.142:5015/login | Request Started
+2026-08-07 11:47:22 | INFO     | User=Anonymous | IP=192.168.0.142 | GET | http://192.168.0.142:5015/login | Request Completed | Status=200
+2026-08-07 11:47:22 | INFO     | User=Anonymous | IP=192.168.0.142 | GET | http://192.168.0.142:5015/static/images/lcepl.png | Request Started
+2026-08-07 11:47:22 | INFO     | User=Anonymous | IP=192.168.0.142 | GET | http://192.168.0.142:5015/static/images/lcepl.png | Request Completed | Status=304
+2026-08-07 11:47:30 | INFO     | User=Anonymous | IP=192.168.0.142 | POST | http://192.168.0.142:5015/login | Request Started
+2026-08-07 11:47:30 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/login | Login successful. User=Laxmi
+2026-08-07 11:47:30 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/login | Request Completed | Status=302
+2026-08-07 11:47:30 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/dashboard/ | Request Started
+2026-08-07 11:47:30 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 11:47:30 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/dashboard/api/live-stats | Request Started
+2026-08-07 11:47:30 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 11:47:35 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:35 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:40 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:40 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:41 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:42 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:44 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:44 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:46 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:46 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:49 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:49 | INFO     | User=Laxmi | IP=192.168.0.142 | GET | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:54 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:54 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:47:57 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:47:57 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:48:07 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:48:07 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 11:48:11 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Started
+2026-08-07 11:48:11 | INFO     | User=Laxmi | IP=192.168.0.142 | POST | http://192.168.0.142:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 12:02:57 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:02:57 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:02:57 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:03:04 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:03:04 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:03:04 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/ | Request Started
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/ | Request Completed | Status=302
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Started
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | User already logged in.
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Completed | Status=302
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Started
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:04:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:04:33 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:04:33 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:04:37 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/client-rate | Request Started
+2026-08-07 12:04:37 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/client-rate | Request Completed | Status=200
+2026-08-07 12:04:39 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Started
+2026-08-07 12:04:39 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Completed | Status=200
+2026-08-07 12:04:40 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Started
+2026-08-07 12:04:40 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Completed | Status=200
+2026-08-07 12:04:41 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Started
+2026-08-07 12:04:41 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Completed | Status=200
+2026-08-07 12:04:42 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Started
+2026-08-07 12:04:42 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Completed | Status=200
+2026-08-07 12:04:42 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Started
+2026-08-07 12:04:42 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Completed | Status=200
+2026-08-07 12:04:44 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/import_client | Request Started
+2026-08-07 12:04:44 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/import_client | Request Completed | Status=200
+2026-08-07 12:04:46 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/Subcontractor_report | Request Started
+2026-08-07 12:04:46 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 12:04:49 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/Subcontractor_report | Request Started
+2026-08-07 12:04:49 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 12:04:52 | INFO     | User=Admin | IP=192.168.0.118 | POST | http://192.168.0.118:5015/file/Subcontractor_report | Request Started
+2026-08-07 12:04:52 | INFO     | User=Admin | IP=192.168.0.118 | POST | http://192.168.0.118:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 12:04:54 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/Subcontractor_report | Request Started
+2026-08-07 12:04:54 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file/Subcontractor_report | Request Completed | Status=200
+2026-08-07 12:05:01 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Started
+2026-08-07 12:05:01 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 12:05:01 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:05:01 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:05:02 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/activity/ | Request Started
+2026-08-07 12:05:02 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/activity/ | Request Completed | Status=200
+2026-08-07 12:07:06 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:07:06 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:07:06 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:07:07 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:07:07 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:07:07 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:07:09 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/activity/ | Request Started
+2026-08-07 12:07:09 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/activity/ | Request Completed | Status=200
+2026-08-07 12:07:10 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:07:11 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
+2026-08-07 12:07:11 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/static/images/lcepl.png | Request Started
+2026-08-07 12:07:11 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/static/images/lcepl.png | Request Completed | Status=304
+2026-08-07 12:07:14 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/client-rate | Request Started
+2026-08-07 12:07:14 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/client-rate | Request Completed | Status=200
+2026-08-07 12:07:16 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Started
+2026-08-07 12:07:16 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/file_format | Request Completed | Status=200
+2026-08-07 12:07:16 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:07:16 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
+2026-08-07 12:07:18 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:07:18 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
+2026-08-07 12:07:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Started
+2026-08-07 12:07:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 12:07:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:07:23 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:07:24 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:07:24 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
+>>>>>>> pankaj-dev
+2026-08-07 12:23:45 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:23:45 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:23:45 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:23:47 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:23:47 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:23:47 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/ | Request Started
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/ | Request Completed | Status=302
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Started
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | User already logged in.
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Completed | Status=302
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Started
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:23:51 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:23:54 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/logout | Request Started
+2026-08-07 12:23:54 | INFO     | User=Anonymous | IP=192.168.0.118 | GET | http://192.168.0.118:5015/logout | Logout successful. User=Admin
+2026-08-07 12:23:54 | INFO     | User=Anonymous | IP=192.168.0.118 | GET | http://192.168.0.118:5015/logout | Request Completed | Status=302
+2026-08-07 12:23:54 | INFO     | User=Anonymous | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Started
+2026-08-07 12:23:54 | INFO     | User=Anonymous | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Completed | Status=200
+2026-08-07 12:23:54 | INFO     | User=Anonymous | IP=192.168.0.118 | GET | http://192.168.0.118:5015/static/images/lcepl.png | Request Started
+2026-08-07 12:23:54 | INFO     | User=Anonymous | IP=192.168.0.118 | GET | http://192.168.0.118:5015/static/images/lcepl.png | Request Completed | Status=304
+2026-08-07 12:24:06 | INFO     | User=Anonymous | IP=192.168.0.118 | POST | http://192.168.0.118:5015/login | Request Started
+2026-08-07 12:24:07 | INFO     | User=Admin | IP=192.168.0.118 | POST | http://192.168.0.118:5015/login | Login successful. User=Admin
+2026-08-07 12:24:07 | INFO     | User=Admin | IP=192.168.0.118 | POST | http://192.168.0.118:5015/login | Request Completed | Status=302
+2026-08-07 12:24:07 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Started
+2026-08-07 12:24:07 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 12:24:07 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:24:07 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:24:12 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:24:12 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
+2026-08-07 12:32:52 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:32:52 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:32:52 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:32:54 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:32:54 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-07 12:32:54 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/ | Request Started
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/ | Request Completed | Status=302
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Started
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | User already logged in.
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/login | Request Completed | Status=302
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Started
+2026-08-07 12:32:55 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/ | Request Completed | Status=200
+2026-08-07 12:32:56 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Started
+2026-08-07 12:32:56 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/dashboard/api/live-stats | Request Completed | Status=200
+2026-08-07 12:33:00 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/ | Request Started
+2026-08-07 12:33:00 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/ | Request Completed | Status=200
+2026-08-07 12:33:02 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/activity/ | Request Started
+2026-08-07 12:33:02 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/activity/ | Request Completed | Status=200
+2026-08-07 12:33:04 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:33:04 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
+2026-08-07 12:33:05 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/client-rate | Request Started
+2026-08-07 12:33:05 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/client-rate | Request Completed | Status=200
+2026-08-07 12:33:08 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Started
+2026-08-07 12:33:08 | INFO     | User=Admin | IP=192.168.0.118 | GET | http://192.168.0.118:5015/engi/subcontractor-rate | Request Completed | Status=200
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 Flask
-ldap3
 pandas
 openpyxl
 xlrd
@@ -10,3 +9,4 @@ xlsxwriter
 matplotlib 
 flask_sqlalchemy
 flask_migrate
+weasyprint
--- a/run.py
+++ b/run.py
@@ -1,11 +1,15 @@
 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")),
Author	SHA1	Message	Date
pjpatil12	aa9f5f0ebf	log changes	2026-08-07 12:33:42 +05:30
pjpatil12	861a61c6ec	Merge branch 'pankaj-dev'	2026-08-07 12:12:58 +05:30
pjpatil12	375e899857	log changes	2026-08-07 12:12:07 +05:30
pjpatil12	18874cc84e	changes of rate model of sub-cont and there functions	2026-08-07 10:29:15 +05:30
pjpatil12	de7b85034d	replace	2026-08-06 13:39:13 +05:30
pjpatil12	2f99c290df	Merge branch 'pankaj-dev'	2026-08-06 12:46:16 +05:30
Pankaj J Patil	5577576112	Update README.md update readme file	2026-04-07 11:42:23 +00:00
Pankaj J Patil	ce0e4f90cf	Merge pull request 'updateds folder path and regex' (#14 ) from pankaj-dev into main Reviewed-on: #14	2026-03-18 04:51:41 +00:00
Pankaj J Patil	446778a50c	Merge pull request 'pankaj-dev' (#13 ) from pankaj-dev into main Reviewed-on: #13	2026-03-17 12:54:08 +00:00
Pankaj J Patil	310ab40bf9	Merge pull request 'dataase field updateds and model updateds' (#12 ) from pankaj-dev into main Reviewed-on: #12	2026-03-11 08:04:07 +00:00
pjpatil12	bb56f00a6c	Resolved merge conflicts	2026-02-28 16:59:24 +05:30
pjpatil12	8353bb6426	Merge branch 'pankaj-dev'	2026-02-28 16:55:19 +05:30
pjpatil12	1dceb640bd	Merge pull request 'Dowload report of client report fix' (#10 ) from dev-anish into main Reviewed-on: #10	2026-01-19 06:54:02 +00:00
anishd100	359847958d	Dowload report of client report fix	2026-01-17 18:06:58 +05:30