Add LDAP Aunthentication

.env

@@ -23,4 +23,17 @@ 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_DOMAIN=lcepl.org
+
+# OpenLDAP standard username attribute
+LDAP_SEARCH_FILTER=(uid={username})
 

Dockerfile

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

app/__init__.py

@@ -1,6 +1,6 @@
 from flask import Flask, redirect, url_for
 from app.config import Config
-from app.services.db_service import db
+from app.services.db_service import db, migrate
 from app.services.logger_service import LoggerService
 
 def create_app():
@@ -9,6 +9,9 @@ def create_app():
 
     # Initialize extensions
     db.init_app(app)
+    migrate.init_app(app, db)
+    with app.app_context():
+        db.create_all()
 
     # Initialize Logger
     LoggerService.init_app(app)
@@ -28,13 +31,14 @@ def create_app():
 
 def register_blueprints(app):
     from app.routes.auth import auth_bp
-    from app.routes.user import user_bp
+    from app.routes.user_routes import user_bp
     from app.routes.dashboard import dashboard_bp
     from app.routes.subcontractor_routes import subcontractor_bp
     from app.routes.file_import import file_import_bp
     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 
+    from app.routes.activity_routes import activity_bp
 
     app.register_blueprint(auth_bp) 
     app.register_blueprint(user_bp)
@@ -44,6 +48,7 @@ def register_blueprints(app):
     app.register_blueprint(file_report_bp)
     app.register_blueprint(generate_report_bp)
     app.register_blueprint(file_format_bp )
+    app.register_blueprint(activity_bp)
 
 
 def register_error_handlers(app):

app/config.py

@@ -27,3 +27,19 @@ class Config:
     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})")

app/constants/http_status.py

@@ -1,11 +1,29 @@
 class HTTPStatus:
-    OK = 200
-    CREATED = 201
-    BAD_REQUEST = 400
-    UNAUTHORIZED = 401
-    FORBIDDEN = 403
-    NOT_FOUND = 404
-    METHOD_NOT_ALLOWED = 405
-    CONFLICT = 409
-    UNPROCESSABLE_ENTITY = 422
-    INTERNAL_SERVER_ERROR = 500
+    # ==========================
+    # 2xx Success
+    # ==========================
+    OK = 200                      # Request successful
+    CREATED = 201                 # Resource created successfully
+    ACCEPTED = 202                # Request accepted for processing
+    NO_CONTENT = 204              # Success, no response body
+
+    # ==========================
+    # 4xx Client Errors
+    # ==========================
+    BAD_REQUEST = 400             # Invalid request
+    UNAUTHORIZED = 401            # Authentication required
+    FORBIDDEN = 403               # Access denied
+    NOT_FOUND = 404               # Resource not found
+    METHOD_NOT_ALLOWED = 405      # HTTP method not allowed
+    CONFLICT = 409                # Resource conflict (e.g., duplicate)
+    UNPROCESSABLE_ENTITY = 422    # Validation error
+    TOO_MANY_REQUESTS = 429       # Rate limit exceeded
+
+    # ==========================
+    # 5xx Server Errors
+    # ==========================
+    INTERNAL_SERVER_ERROR = 500   # Internal server error
+    NOT_IMPLEMENTED = 501         # Feature not implemented
+    BAD_GATEWAY = 502             # Invalid response from upstream server
+    SERVICE_UNAVAILABLE = 503     # Server temporarily unavailable
+    GATEWAY_TIMEOUT = 504         # Upstream server timeout

app/constants/messages.py

@@ -1,17 +1,65 @@
 class SuccessMessage:
-    FETCHED = "Data fetched successfully"
-    CREATED = "Resource created successfully"
-    UPDATED = "Resource updated successfully"
-    DELETED = "Resource deleted successfully"
-    LOGIN = "Login successful"
-    LOGOUT = "Logout successful"
+    FETCHED = "Data fetched successfully."
+    CREATED = "Resource created successfully."
+    UPDATED = "Resource updated successfully."
+    DELETED = "Resource deleted successfully."
+
+    SAVED = "Data saved successfully."
+    IMPORTED = "Data imported successfully."
+    EXPORTED = "Data exported successfully."
+    UPLOADED = "File uploaded successfully."
+    DOWNLOADED = "File downloaded successfully."
+
+    LOGIN = "Login successful."
+    LOGOUT = "Logout successful."
+    PASSWORD_CHANGED = "Password changed successfully."
+    PASSWORD_RESET = "Password reset successfully."
+
+    EMAIL_SENT = "Email sent successfully."
+    STATUS_UPDATED = "Status updated successfully."
 
 
 class ErrorMessage:
-    INVALID_REQUEST = "Invalid request data"
-    UNAUTHORIZED = "Unauthorized access"
-    FORBIDDEN = "Access forbidden"
-    NOT_FOUND = "Resource not found"
-    VALIDATION_FAILED = "Validation failed"
-    INTERNAL_ERROR = "Internal server error"
-    DUPLICATE_ENTRY = "Duplicate record found"
+    INVALID_REQUEST = "Invalid request."
+    INVALID_DATA = "Invalid data provided."
+    VALIDATION_FAILED = "Validation failed."
+
+    UNAUTHORIZED = "Unauthorized access."
+    FORBIDDEN = "Access denied."
+    NOT_FOUND = "Resource not found."
+    METHOD_NOT_ALLOWED = "Method not allowed."
+
+    DUPLICATE_ENTRY = "Duplicate record found."
+    RECORD_EXISTS = "Record already exists."
+    RECORD_NOT_FOUND = "Record does not exist."
+
+    FILE_NOT_FOUND = "File not found."
+    FILE_UPLOAD_FAILED = "File upload failed."
+    FILE_IMPORT_FAILED = "File import failed."
+
+    DATABASE_ERROR = "Database operation failed."
+    INTERNAL_SERVER_ERROR = "Internal server error."
+    SERVICE_UNAVAILABLE = "Service temporarily unavailable."
+
+    LOGIN_FAILED = "Invalid username or password."
+    SESSION_EXPIRED = "Session expired. Please login again."
+
+    PASSWORD_MISMATCH = "Passwords do not match."
+    INVALID_TOKEN = "Invalid or expired token."
+
+
+class WarningMessage:
+    NO_DATA_FOUND = "No data found."
+    ALREADY_EXISTS = "Record already exists."
+    UNSAVED_CHANGES = "You have unsaved changes."
+    DELETE_CONFIRMATION = "Are you sure you want to delete the selected record(s)?"
+    INVALID_FILTER = "No records match the selected filters."
+
+
+class InfoMessage:
+    PROCESSING = "Request is being processed."
+    LOADING = "Loading data..."
+    SAVING = "Saving data..."
+    DELETING = "Deleting record..."
+    IMPORTING = "Importing data..."
+    EXPORTING = "Preparing export..."

app/models/laying_client_model.py

@@ -1,9 +1,8 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
-import re
-# REGEX PATTERN
-PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class LayingClient(db.Model):
     __tablename__ = "laying_client"
@@ -11,39 +10,47 @@ class LayingClient(db.Model):
     id = db.Column(db.Integer, primary_key=True)
 
     # Basic Fields
+    RA_Bill_No = db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
     # Bedding Qty.
-    Outer_dia_of_MH_m = db.Column(db.Float, default=0)
-    Bedding_Length = db.Column(db.Float, default=0)
-    Width = db.Column(db.Float, default=0)
-    Depth = db.Column(db.Float, default=0)
-    Qty = db.Column(db.Float, default=0)
+    Outer_dia_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Bedding_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Qty = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
  
     #  PIPE LAYING Qty. 
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
-    Laying_Length = db.Column(db.Float, default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    ID_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Laying_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    pipe_150_mm = db.Column(db.Float, default=0)
-    pipe_200_mm = db.Column(db.Float, default=0)
-    pipe_250_mm = db.Column(db.Float, default=0)
-    pipe_300_mm = db.Column(db.Float, default=0)
-    pipe_350_mm = db.Column(db.Float, default=0)
-    pipe_400_mm = db.Column(db.Float, default=0)
-    pipe_450_mm = db.Column(db.Float, default=0)
-    pipe_500_mm = db.Column(db.Float, default=0)
-    pipe_600_mm = db.Column(db.Float, default=0)
-    pipe_700_mm = db.Column(db.Float, default=0)
-    pipe_900_mm = db.Column(db.Float, default=0)
-    pipe_1200_mm = db.Column(db.Float, default=0)
+    pipe_150_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_200_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_250_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_300_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_350_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_400_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_450_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_500_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_600_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_700_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_900_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_1200_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
     
-    Total = db.Column(db.Float, default=0)
-    Remarks = db.Column(db.String(500))
-    RA_Bill_No=db.Column(db.String(500))
+    np4_pipe_200_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_250_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_300_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_350_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_400_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_450_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_500_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    np4_pipe_600_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))    
     
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
 
     def __repr__(self):
@@ -52,26 +59,16 @@ class LayingClient(db.Model):
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
-    
-    def sum_laying_fields():
-        return [
-            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
-            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
-            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
-            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
-        ]
-    
-# ===============================
+
 # AUTO TOTAL USING REGEX
-# ===============================
 def calculate_laying_total(mapper, connection, target):
-    total = 0
-
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if PIPE_MM_PATTERN.match(column.name):
-            total += getattr(target, column.name) or 0
-
-    target.Total = total
-
+        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
+ 
 event.listen(LayingClient, "before_insert", calculate_laying_total)
 event.listen(LayingClient, "before_update", calculate_laying_total)

app/models/laying_model.py

@@ -1,9 +1,8 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
-import re
-# REGEX PATTERN
-PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class Laying(db.Model):
     __tablename__ = "laying"
@@ -15,31 +14,30 @@ class Laying(db.Model):
     subcontractor = db.relationship("Subcontractor", backref="laying_records")
 
     # Pipe Laying Fields
+    RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
-    Laying_Length = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    ID_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Laying_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    pipe_150_mm = db.Column(db.Float, default=0)
-    pipe_200_mm = db.Column(db.Float, default=0)
-    pipe_250_mm = db.Column(db.Float, default=0)
-    pipe_300_mm = db.Column(db.Float, default=0)
-    pipe_350_mm = db.Column(db.Float, default=0)
-    pipe_400_mm = db.Column(db.Float, default=0)
-    pipe_450_mm = db.Column(db.Float, default=0)
-    pipe_500_mm = db.Column(db.Float, default=0)
-    pipe_600_mm = db.Column(db.Float, default=0)
-    pipe_700_mm = db.Column(db.Float, default=0)
-    pipe_900_mm = db.Column(db.Float, default=0)
-    pipe_1200_mm = db.Column(db.Float, default=0)
+    pipe_150_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_200_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_250_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_300_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_350_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_400_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_450_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_500_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_600_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_700_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_900_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    pipe_1200_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
     
-    Total = db.Column(db.Float, default=0)
-    Remarks = db.Column(db.String(500))
-    RA_Bill_No=db.Column(db.String(500))
-    
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
 
     def __repr__(self):
@@ -49,25 +47,15 @@ class Laying(db.Model):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
     
 
-    def sum_laying_fields():
-        return [
-            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
-            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
-            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
-            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
-        ]
-
-# ===============================
 # AUTO TOTAL USING REGEX
-# ===============================
 def calculate_laying_total(mapper, connection, target):
-    total = 0
-
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if PIPE_MM_PATTERN.match(column.name):
-            total += getattr(target, column.name) or 0
-
-    target.Total = total
+        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 event.listen(Laying, "before_insert", calculate_laying_total)
 event.listen(Laying, "before_update", calculate_laying_total)

app/models/manhole_domestic_chamber_model.py

@@ -1,10 +1,8 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
-import re
-
-# REGEX PATTERN
-D_RANGE_PATTERN = re.compile(r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class ManholeDomesticChamber(db.Model):
     __tablename__ = "manhole_domestic_chamber"
@@ -16,38 +14,40 @@ class ManholeDomesticChamber(db.Model):
     subcontractor = db.relationship("Subcontractor", backref="manhole_domestic_chamber_records")
 
     # Basic Fields
+    RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Depth_of_MH = db.Column(db.Float, default=0)
- 
-    # Excavation categories 
-    d_0_to_0_75 = db.Column(db.Float, default=0)
-    d_0_76_to_1_05 = db.Column(db.Float, default=0)
-    d_1_06_to_1_65 = db.Column(db.Float, default=0)
-    d_1_66_to_2_15 = db.Column(db.Float, default=0)
-    d_2_16_to_2_65 = db.Column(db.Float, default=0)
-    d_2_66_to_3_15 = db.Column(db.Float, default=0)
-    d_3_16_to_3_65= db.Column(db.Float, default=0)
-    d_3_66_to_4_15 = db.Column(db.Float, default=0)
-    d_4_16_to_4_65 = db.Column(db.Float, default=0)
-    d_4_66_to_5_15 = db.Column(db.Float, default=0)
-    d_5_16_to_5_65 = db.Column(db.Float, default=0)
-    d_5_66_to_6_15 = db.Column(db.Float, default=0)
-    d_6_16_to_6_65 = db.Column(db.Float, default=0)
-    d_6_66_to_7_15 = db.Column(db.Float, default=0)
-    d_7_16_to_7_65 = db.Column(db.Float, default=0)
-    d_7_66_to_8_15 = db.Column(db.Float, default=0)
-    d_8_16_to_8_65 = db.Column(db.Float, default=0)
-    d_8_66_to_9_15 = db.Column(db.Float, default=0)
-    d_9_16_to_9_65 = db.Column(db.Float, default=0)
+    Depth_of_MH = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Domestic_Chambers = db.Column(db.Float, default=0)
-    DWC_Pipe_Length = db.Column(db.Float, default=0)
-    UPVC_Pipe_Length = db.Column(db.Float, default=0)
-    RA_Bill_No=db.Column(db.String(500))
+    # Excavation categories
+    d_0_to_0_75 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_0_76_to_1_05 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_1_06_to_1_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_1_66_to_2_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_2_16_to_2_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_2_66_to_3_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_3_16_to_3_65= db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_3_66_to_4_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_4_16_to_4_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_4_66_to_5_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_5_16_to_5_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_5_66_to_6_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_6_16_to_6_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_6_66_to_7_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_7_16_to_7_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_7_66_to_8_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_8_16_to_8_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_8_66_to_9_15 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_9_16_to_9_65 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Total = db.Column(db.Float, default=0)
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Domestic_Chambers = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    DWC_Pipe_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    UPVC_Pipe_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    
+
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
     def __repr__(self):
         return f"<HanholeDomesticChamberConstruction {self.Location}>"
@@ -56,28 +56,15 @@ class ManholeDomesticChamber(db.Model):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
     
     
-    def sum_mh_dc_fields():
-        return [
-            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
-            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
-            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
-            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
-            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
-            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
-            "d_9_16_to_9_65"]
-
-# ===============================
 # AUTO TOTAL USING REGEX
-# ===============================
 def calculate_mh_dc_total(mapper, connection, target):
-    total = 0
-
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if D_RANGE_PATTERN.match(column.name):
-            total += getattr(target, column.name) or 0
-
-    target.Total = total
-
+        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 event.listen(ManholeDomesticChamber, "before_insert", calculate_mh_dc_total)
 event.listen(ManholeDomesticChamber, "before_update", calculate_mh_dc_total)

app/models/manhole_excavation_model.py

@@ -1,6 +1,8 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class ManholeExcavation(db.Model):
     __tablename__ = "manhole_excavation"
@@ -12,54 +14,53 @@ class ManholeExcavation(db.Model):
     subcontractor = db.relationship("Subcontractor", backref="manhole_records")
 
     # Basic Fields
+    RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
    
-    Upto_IL_Depth = db.Column(db.Float, default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
-    Ex_Dia_of_Manhole = db.Column(db.Float, default=0)
-    Area_of_Manhole = db.Column(db.Float, default=0)
+    Upto_IL_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Cutting_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    ID_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Ex_Dia_of_Manhole = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Area_of_Manhole = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
    
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Total = db.Column(db.Float, default=0)
-    Remarks = db.Column(db.String(500))
-    RA_Bill_No=db.Column(db.String(500))
-
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
     def __repr__(self):
         return f"<HanholeExcavation {self.Location}>"
@@ -67,15 +68,15 @@ class ManholeExcavation(db.Model):
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
-# ==========================================
-# AUTO CALCULATE GRAND TOTAL
-# ==========================================
+# AUTO TOTAL USING REGEX
 def calculate_Manhole_total(mapper, connection, target):
-    total = 0
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if column.name.endswith("_total"):
-            total += getattr(target, column.name) or 0
-    target.Total = total
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 
 event.listen(ManholeExcavation, "before_insert", calculate_Manhole_total)

app/models/mh_dc_client_model.py

@@ -1,46 +1,40 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
-import re
-
-# REGEX PATTERN
-D_RANGE_PATTERN = re.compile(r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class ManholeDomesticChamberClient(db.Model):
     __tablename__ = "mh_dc_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor table
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="mh_dc_records")
 
     # Basic Fields
-    RA_Bill_No=db.Column(db.String(500))
+    RA_Bill_No = db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    MH_TOP_LEVEL = db.Column(db.Float, default=0)
-    MH_IL_LEVEL = db.Column(db.Float, default=0)
-    Depth_of_MH = db.Column(db.Float, default=0)
+    MH_TOP_LEVEL = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    MH_IL_LEVEL = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Depth_of_MH = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
    
- 
     # Excavation categories 
-    d_0_to_1_5 = db.Column(db.Float, default=0)
-    d_1_5_to_2_0 = db.Column(db.Float, default=0)
-    d_2_0_to_2_5 = db.Column(db.Float, default=0)
-    d_2_5_to_3_0 = db.Column(db.Float, default=0)
-    d_3_0_to_3_5 = db.Column(db.Float, default=0)
-    d_3_5_to_4_0 = db.Column(db.Float, default=0)
-    d_4_0_to_4_5= db.Column(db.Float, default=0)
-    d_4_5_to_5_0 = db.Column(db.Float, default=0)
-    d_5_0_to_5_5 = db.Column(db.Float, default=0)
-    d_5_5_to_6_0 = db.Column(db.Float, default=0)
-    d_6_0_to_6_5 = db.Column(db.Float, default=0)
+    d_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_1_5_to_2_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_2_0_to_2_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_2_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_3_0_to_3_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_3_5_to_4_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_4_0_to_4_5= db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_4_5_to_5_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_5_0_to_5_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_5_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    d_6_0_to_6_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Domestic_Chambers = db.Column(db.Float, default=0)
+    Domestic_Chambers = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Total = db.Column(db.Float, default=0)
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
     def __repr__(self):
         return f"<HanholeDomesticChamberConstruction {self.Location}>"
@@ -49,29 +43,16 @@ class ManholeDomesticChamberClient(db.Model):
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
-    
-    def sum_mh_dc_fields():
-        return [
-            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
-            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
-            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
-            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
-            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
-            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
-            "d_9_16_to_9_65" ]
-    
-# ===============================
+
 # AUTO TOTAL USING REGEX
-# ===============================
 def calculate_mh_dc_total(mapper, connection, target):
-    total = 0
-
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if D_RANGE_PATTERN.match(column.name):
-            total += getattr(target, column.name) or 0
-
-    target.Total = total
-
+        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 event.listen(ManholeDomesticChamberClient, "before_insert", calculate_mh_dc_total)
 event.listen(ManholeDomesticChamberClient, "before_update", calculate_mh_dc_total)

app/models/mh_ex_client_model.py

@@ -1,81 +1,79 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class ManholeExcavationClient(db.Model):
     __tablename__ = "mh_ex_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor table
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="mh_ex_records")
 
     # Basic Fields
-    RA_Bill_No=db.Column(db.String(500))
+    RA_Bill_No = db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Ground_Level = db.Column(db.Float, default=0)
-    MH_Invert_Level = db.Column(db.Float, default=0)
-    MH_Top_Level = db.Column(db.Float, default=0)
-    Ex_Level = db.Column(db.Float, default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
-    MH_Depth = db.Column(db.Float, default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
+    Ground_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    MH_Invert_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    MH_Top_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Ex_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Cutting_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    MH_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    ID_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Dia_of_MH_Cutting = db.Column(db.Float, default=0)
-    Area_of_Manhole = db.Column(db.Float, default=0)
+    Dia_of_MH_Cutting = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Area_of_Manhole = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
    
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Remarks = db.Column(db.String(500))
-    Total = db.Column(db.Float, default=0)
-
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
     def __repr__(self):
         return f"<HanholeExcavation {self.Location}>"
@@ -84,16 +82,15 @@ class ManholeExcavationClient(db.Model):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
 
-# ==========================================
-# AUTO CALCULATE GRAND TOTAL
-# ==========================================
+# AUTO TOTAL USING REGEX 
 def calculate_Manhole_total(mapper, connection, target):
-    total = 0
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if column.name.endswith("_total"):
-            total += getattr(target, column.name) or 0
-    target.Total = total
-
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 event.listen(ManholeExcavationClient, "before_insert", calculate_Manhole_total)
 event.listen(ManholeExcavationClient, "before_update", calculate_Manhole_total)

app/models/subcontractor_rate_model.py

@@ -0,0 +1,23 @@
+from app import db
+from datetime import datetime
+
+class SubcontractorRate(db.Model):
+    __tablename__ = "subcontractor_rates"
+
+    id = db.Column(db.Integer, primary_key=True)
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    subcontractor = db.relationship("Subcontractor", backref="rate_master")
+
+    category = db.Column(db.String(50), nullable=False)
+    item_code = db.Column(db.String(50), nullable=False)
+    item_name = db.Column(db.String(200), nullable=False)
+    unit = db.Column(db.String(20))
+    rate = db.Column(db.Numeric(12,2), nullable=False)
+    effective_from = db.Column(db.Date, nullable=False)
+    effective_to = db.Column(db.Date)
+    status = db.Column(db.String(20), default="Active")
+    created_at = db.Column(db.DateTime, default=datetime.now)
+
+    def __repr__(self):
+        return f"<subcontractor Rate {self.item_name}>"
+    

app/models/tr_ex_client_model.py

@@ -1,6 +1,9 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
+
 
 class TrenchExcavationClient(db.Model):
     __tablename__ = "tr_ex_client"
@@ -11,72 +14,71 @@ class TrenchExcavationClient(db.Model):
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
-    Actual_Trench_Length = db.Column(db.Float, default=0)
-    Ground_Level = db.Column(db.Float, default=0)
-    Invert_Level = db.Column(db.Float, default=0)
-    Excavated_level = db.Column(db.Float, default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
-    Avg_Depth = db.Column(db.Float, default=0)
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Actual_Trench_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Ground_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Invert_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Excavated_level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Cutting_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Avg_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
  
     # width
-    Width_0_to_1_5_m = db.Column(db.Float, default=0)
-    Width_1_5_to_3_0_m = db.Column(db.Float, default=0)
-    Width_3_0_to_4_5_m = db.Column(db.Float, default=0)
-    Width_4_5_to_6_0_m = db.Column(db.Float, default=0)
-    Width_6_0_to_7_5_m = db.Column(db.Float, default=0)
+    Width_0_to_1_5_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_1_5_to_3_0_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_3_0_to_4_5_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_4_5_to_6_0_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_6_0_to_7_5_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Soft_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Total = db.Column(db.Float, default=0)
-    Remarks = db.Column(db.String(500))
-
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
     def __repr__(self):
         return f"<TrenchExcavation {self.Location}>"
@@ -85,17 +87,15 @@ class TrenchExcavationClient(db.Model):
             return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
 
-# ==========================================
-# AUTO CALCULATE GRAND TOTAL
-# ==========================================
-
+# AUTO TOTAL USING REGEX
 def calculate_trench_client_total(mapper, connection, target):
-    total = 0
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if column.name.endswith("_total"):
-            total += getattr(target, column.name) or 0
-    target.Total = total
-
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 event.listen(TrenchExcavationClient, "before_insert", calculate_trench_client_total)
 event.listen(TrenchExcavationClient, "before_update", calculate_trench_client_total)

app/models/trench_excavation_model.py

@@ -1,6 +1,8 @@
 from app import db
 from datetime import datetime
 from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
+from decimal import Decimal
 
 class TrenchExcavation(db.Model):
     __tablename__ = "trench_excavation"
@@ -12,65 +14,64 @@ class TrenchExcavation(db.Model):
     subcontractor = db.relationship("Subcontractor", backref="trench_records")
 
     # Basic Fields
+    RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float, default=0)
-    Invert_Level = db.Column(db.Float, default=0)
-    MH_Top_Level = db.Column(db.Float, default=0)
-    Ground_Level = db.Column(db.Float, default=0)
-    ID_of_MH_m = db.Column(db.Float, default=0)
-    Actual_Trench_Length = db.Column(db.Float, default=0)
-    Pipe_Dia_mm = db.Column(db.Float, default=0)
+    CC_length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Invert_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    MH_Top_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Ground_Level = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    ID_of_MH_m = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Actual_Trench_Length = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # width
-    Width_0_to_2_5 = db.Column(db.Float, default=0)
-    Width_2_5_to_3_0 = db.Column(db.Float, default=0)
-    Width_3_0_to_4_5 = db.Column(db.Float, default=0)
-    Width_4_5_to_6_0 = db.Column(db.Float, default=0)
+    Width_0_to_2_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_2_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Width_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Upto_IL_Depth = db.Column(db.Float, default=0)
-    Cutting_Depth = db.Column(db.Float, default=0)
-    Avg_Depth = db.Column(db.Float, default=0)
+    Upto_IL_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Cutting_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Avg_Depth = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float, default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Float, default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Float, default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float, default=0)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float, default=0)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float, default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 2), default=Decimal("0.00"))
 
-    Total = db.Column(db.Float, default=0)
-    Remarks = db.Column(db.String(500))
-    RA_Bill_No=db.Column(db.String(500))
-    
-    created_at = db.Column(db.DateTime, default=datetime.today)
+    Total = db.Column(db.Numeric(12, 2), default=Decimal("0.00"))
+    Remarks = db.Column(db.String(500), default="Import File")
+    created_at = db.Column(db.DateTime,default=datetime.now,nullable=False)
 
 
     def __repr__(self):
@@ -79,47 +80,16 @@ class TrenchExcavation(db.Model):
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
     
-    def excavation_category_sums(self):
 
-        def safe(val):
-            return val or 0
-
-        return {
-            "Soft_Murum_Total": (
-                safe(self.Soft_Murum_0_to_1_5)
-                + safe(self.Soft_Murum_1_5_to_3_0)
-                + safe(self.Soft_Murum_3_0_to_4_5)
-            ),
-
-            "Hard_Murum_Total": (
-                safe(self.Hard_Murum_0_to_1_5)
-                + safe(self.Hard_Murum_1_5_to_3_0)
-            ),
-
-            "Soft_Rock_Total": (
-                safe(self.Soft_Rock_0_to_1_5)
-                + safe(self.Soft_Rock_1_5_to_3_0)
-            ),
-
-            "Hard_Rock_Total": (
-                safe(self.Hard_Rock_0_to_1_5)
-                + safe(self.Hard_Rock_1_5_to_3_0)
-                + safe(self.Hard_Rock_3_0_to_4_5)
-                + safe(self.Hard_Rock_4_5_to_6_0)
-                + safe(self.Hard_Rock_6_0_to_7_5)
-            ),
-        }
-
-# ==========================================
-# AUTO CALCULATE GRAND TOTAL
-# ==========================================
+# AUTO TOTAL USING REGEX
 def calculate_trench_total(mapper, connection, target):
-    total = 0
+    total = Decimal("0.00")
     for column in target.__table__.columns:
-        if column.name.endswith("_total"):
-            total += getattr(target, column.name) or 0
-    target.Total = total
-
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            value = getattr(target, column.name)
+            if value is not None:
+                total += Decimal(value)
+    target.Total = total.quantize(Decimal("0.01"))
 
 event.listen(TrenchExcavation, "before_insert", calculate_trench_total)
 event.listen(TrenchExcavation, "before_update", calculate_trench_total)

app/models/user_model.py

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

app/models/width_model.py

@@ -0,0 +1,21 @@
+from app import db
+
+class Width(db.Model):
+    __tablename__ = "width"
+
+    id = db.Column(db.Integer, primary_key=True)
+    Dia_mm = db.Column(db.Numeric(10, 2), default=0)
+
+    pipe_150_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_200_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_250_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_300_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_350_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_400_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_450_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_500_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_600_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_700_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_900_mm = db.Column(db.Numeric(10, 2), default=0)
+    pipe_1200_mm = db.Column(db.Numeric(10, 2), default=0)
+

app/routes/activity_routes.py

@@ -0,0 +1,59 @@
+from flask import Blueprint, render_template, request, send_file, abort
+import os
+
+from app.utils.helpers import login_required
+from app.utils.file_utils import get_logs_folder , ALLOWED_LOG_FILE
+from app.services.activity_service import ActivityService
+
+activity_bp = Blueprint("activity", __name__, url_prefix="/activity")
+
+# call activity_log page
+@activity_bp.route("/")
+@login_required
+def activity():
+    file_name = request.args.get("file", "app.log")
+    search = request.args.get("search", "")
+    level = request.args.get("level", "").upper()
+    user = request.args.get("user", "")
+    from_date = request.args.get("from_date", "")
+    to_date = request.args.get("to_date", "")
+
+    logs = ActivityService.read_logs(
+        file_name=file_name,
+        search=search,
+        level=level,
+        user=user,
+        from_date=from_date,
+        to_date=to_date
+    )
+
+    return render_template(
+        "activity/activity_log.html",
+        logs=logs,
+        file_name=file_name,
+        search=search,
+        level=level,
+        user=user,
+        from_date=from_date,
+        to_date=to_date
+    )
+
+# Download  activity_log files
+@activity_bp.route("/logs")
+@login_required
+def download_log():
+
+    filename = request.args.get("file", "app.log")
+    if filename not in ALLOWED_LOG_FILE:
+        abort(400, "Invalid log file.")
+
+    file_path = os.path.join(get_logs_folder(), filename)
+    if not os.path.isfile(file_path):
+        abort(404, "Log file not found.")
+
+    return send_file(
+        file_path,
+        as_attachment=True,
+        download_name=filename,
+        mimetype="text/plain"
+    )

app/routes/auth.py

@@ -16,6 +16,7 @@ def login():
         if user:
             session["user_id"] = user.id
             session["user_name"] = user.name
+            session["user_email"] = user.email
             flash("Login successful", "success")
             return redirect(url_for("dashboard.dashboard"))
 

app/routes/dashboard.py

@@ -1,19 +1,31 @@
+
 import matplotlib
 matplotlib.use("Agg")
 
-from flask import Blueprint, render_template, session, redirect, url_for, jsonify
+from flask import Blueprint, render_template, session, redirect, url_for, jsonify, request
 import matplotlib.pyplot as plt
 import io
 import base64
 from app.utils.plot_utils import plot_to_base64
+from app.utils.helpers import login_required
 from app.services.dashboard_service import DashboardService
 from sqlalchemy import func
 from app import db
+from sqlalchemy import tuple_
+
+# Subcontractor models import
+from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
+from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
 from app.models.laying_model import Laying
 
-from app.models.subcontractor_model import Subcontractor
+# client models import
+from app.models.tr_ex_client_model import TrenchExcavationClient
+from app.models.mh_ex_client_model import ManholeExcavationClient
+from app.models.mh_dc_client_model import ManholeDomesticChamberClient
+from app.models.laying_client_model import LayingClient
+
 
 dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
 
@@ -26,6 +38,7 @@ def dashboard():
 
 
 @dashboard_bp.route("/api/live-stats")
+@login_required
 def live_stats():
     try:
         # 1. Overall Volume
@@ -61,9 +74,9 @@ def live_stats():
 
 
 
-
 # subcontractor dashboard
 @dashboard_bp.route("/subcontractor_dashboard")
+@login_required
 def subcontractor_dashboard():
 
     if not session.get("user_id"):
@@ -76,36 +89,526 @@ def subcontractor_dashboard():
         subcontractors=subcontractors
     )
 
-
-# API FOR CHART DATA
-@dashboard_bp.route("/api/subcontractor-chart")
-def subcontractor_chart():
+#  API: Get Unique RA Bills
+@dashboard_bp.route("/api/get-ra-bills")
+@login_required
+def get_ra_bills():
 
     subcontractor_id = request.args.get("subcontractor")
     category = request.args.get("category")
-    ra_bill = request.args.get("ra_bill")
 
-    query = db.session.query(
-        TrenchExcavation.excavation_category,
-        func.sum(TrenchExcavation.Total)
-    )
+    if not subcontractor_id or not category:
+        return {"ra_bills": []}
 
-    if subcontractor_id:
-        query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
+    match category:
 
+        case "trench_excavation":
+            results = db.session.query(
+                TrenchExcavation.RA_Bill_No
+            ).filter(
+                TrenchExcavation.subcontractor_id == subcontractor_id
+            ).distinct().order_by(TrenchExcavation.RA_Bill_No).all()
+
+        # (Add others same pattern later)
+        case "manhole_excavation":
+            results = db.session.query(
+                ManholeExcavation.RA_Bill_No
+            ).filter(
+                ManholeExcavation.subcontractor_id == subcontractor_id
+            ).distinct().order_by(ManholeExcavation.RA_Bill_No).all()
+            
+        case "Manhole_Domestic_Chamber":
+            results = db.session.query(
+                ManholeDomesticChamber.RA_Bill_No
+            ).filter(
+                ManholeDomesticChamber.subcontractor_id == subcontractor_id
+            ).distinct().order_by(ManholeDomesticChamber.RA_Bill_No).all()
+            
+        case "Laying":
+            results = db.session.query(
+                Laying.RA_Bill_No
+            ).filter(
+                Laying.subcontractor_id == subcontractor_id
+            ).distinct().order_by(Laying.RA_Bill_No).all()
+            
+    ra_bills = [r[0] for r in results if r[0]]
+
+    return {"ra_bills": ra_bills}
+
+
+def total(records, field):
+    return float(sum(getattr(r, field) or 0 for r in records))
+
+# category= trench_excavation
+@dashboard_bp.route("/api/tr-analysis")
+def trench_analysis():
+
+    subcontractor_id = request.args.get("subcontractor", "").strip()
+    ra_bill = request.args.get("ra_bill", "").strip()
+
+    # Convert "1,2,3" -> ["1", "2", "3"]
+    ra_bill_list = []
     if ra_bill:
-        query = query.filter(TrenchExcavation.RA_Bill_No == ra_bill)
+        ra_bill_list = [x.strip() for x in ra_bill.split(",") if x.strip()]
 
-    results = query.group_by(TrenchExcavation.excavation_category).all()
+    # Subcontractor Query
+    sub_query = TrenchExcavation.query
+    if subcontractor_id:
+        sub_query = sub_query.filter(
+            TrenchExcavation.subcontractor_id == int(subcontractor_id)
+        )
 
-    labels = []
-    values = []
+    if ra_bill_list:
+        sub_query = sub_query.filter(
+            TrenchExcavation.RA_Bill_No.in_(ra_bill_list)
+        )
 
-    for r in results:
-        labels.append(r[0])
-        values.append(float(r[1] or 0))
+    sub_records = sub_query.all()
+
+    sub_keys = [
+        (
+            (r.MH_NO or "").strip().upper(),
+            (r.Location or "").strip().upper()
+        )
+        for r in sub_records
+    ]
+
+    client_query = TrenchExcavationClient.query
+
+    if sub_keys:
+
+        client_query = client_query.filter(
+            tuple_(
+                func.upper(func.trim(TrenchExcavationClient.MH_NO)),
+                func.upper(func.trim(TrenchExcavationClient.Location))
+            ).in_(sub_keys)
+
+        )
+
+    client_records = client_query.all()
+
+    chart_data = [
+        {
+            "label": "Marshi 0 to 1.5",
+            "client": total(client_records, "Marshi_Muddy_Slushy_0_to_1_5_total"),
+            "sub": 0
+        },
+        {
+            "label": "Marshi 1.5 to 3.0",
+            "client": total(client_records, "Marshi_Muddy_Slushy_1_5_to_3_0_total"),
+            "sub": 0
+        },
+        {
+            "label": "Marshi 3.0 to 4.5",
+            "client": total(client_records, "Marshi_Muddy_Slushy_3_0_to_4_5_total"),
+            "sub": 0
+        },
+
+        {
+            "label": "Soft Murum 0 to 1.5",
+            "client": total(client_records, "Soft_Murum_0_to_1_5_total"),
+            "sub": total(sub_records, "Soft_Murum_0_to_1_5_total")
+        },
+        {
+            "label": "Soft Murum 1.5 to 3.0",
+            "client": total(client_records, "Soft_Murum_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Soft_Murum_1_5_to_3_0_total")
+        },
+        {
+            "label": "Soft Murum 3.0 to 4.5",
+            "client": total(client_records, "Soft_Murum_3_0_to_4_5_total"),
+            "sub": total(sub_records, "Soft_Murum_3_0_to_4_5_total")
+        },
+
+        {
+            "label": "Hard Murum 0 to 1.5",
+            "client": total(client_records, "Hard_Murum_0_to_1_5_total"),
+            "sub": total(sub_records, "Hard_Murum_0_to_1_5_total")
+        },
+        {
+            "label": "Hard Murum 1.5 to 3.0",
+            "client": total(client_records, "Hard_Murum_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Hard_Murum_1_5_and_above_total")
+        },
+
+        {
+            "label": "Soft Rock 0 to 1.5",
+            "client": total(client_records, "Soft_Rock_0_to_1_5_total"),
+            "sub": total(sub_records, "Soft_Rock_0_to_1_5_total")
+        },
+        {
+            "label": "Soft Rock 1.5 to 3.0",
+            "client": total(client_records, "Soft_Rock_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Soft_Rock_1_5_and_above_total")
+        },
+
+        {
+            "label": "Hard Rock 0 to 1.5",
+            "client": total(client_records, "Hard_Rock_0_to_1_5_total"),
+            "sub": total(sub_records, "Hard_Rock_0_to_1_5_total")
+        },
+        {
+            "label": "Hard Rock 1.5 to 3.0",
+            "client": total(client_records, "Hard_Rock_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Hard_Rock_1_5_to_3_0_total")
+        },
+        {
+            "label": "Hard Rock 3.0 to 4.5",
+            "client": total(client_records, "Hard_Rock_3_0_to_4_5_total"),
+            "sub": total(sub_records, "Hard_Rock_3_0_to_4_5_total")
+        },
+        {
+            "label": "Hard Rock 4.5 to 6.0",
+            "client": total(client_records, "Hard_Rock_4_5_to_6_0_total"),
+            "sub": total(sub_records, "Hard_Rock_4_5_to_6_0_total")
+        },
+        {
+            "label": "Hard Rock 6.0 to 7.5",
+            "client": total(client_records, "Hard_Rock_6_0_to_7_5_total"),
+            "sub": total(sub_records, "Hard_Rock_6_0_to_7_5_total")
+        }
+    ]
+    
+    return jsonify({
+        "title": "Trench Excavation Comparison",
+        "y_title": "Excavation Qty (Cum)",
+        "labels": [x["label"] for x in chart_data],
+        "client_qty": [x["client"] for x in chart_data],
+        "sub_qty": [x["sub"] for x in chart_data]
+    })
+    
+# category = manhole_excavation
+@dashboard_bp.route("/api/mh-analysis")
+def manhole_analysis():
+
+    subcontractor_id = request.args.get("subcontractor", "").strip()
+    ra_bill = request.args.get("ra_bill", "").strip()
+
+    # Convert "1,2,3" -> ["1", "2", "3"]
+    ra_bill_list = []
+    if ra_bill:
+        ra_bill_list = [x.strip() for x in ra_bill.split(",") if x.strip()]
+
+    # Subcontractor Query
+    sub_query = ManholeExcavation.query
+    if subcontractor_id:
+        sub_query = sub_query.filter(
+            ManholeExcavation.subcontractor_id == int(subcontractor_id)
+        )
+
+    if ra_bill_list:
+        sub_query = sub_query.filter(
+            ManholeExcavation.RA_Bill_No.in_(ra_bill_list)
+        )
+
+    sub_records = sub_query.all()
+
+    sub_keys = [
+        (
+            (r.MH_NO or "").strip().upper(),
+            (r.Location or "").strip().upper()
+        )
+        for r in sub_records
+    ]
+
+    client_query = ManholeExcavationClient.query
+
+    if sub_keys:
+
+        client_query = client_query.filter(
+            tuple_(
+                func.upper(func.trim(ManholeExcavationClient.MH_NO)),
+                func.upper(func.trim(ManholeExcavationClient.Location))
+            ).in_(sub_keys)
+
+        )
+
+    client_records = client_query.all()
+
+    chart_data = [
+        {
+            "label": "Marshi 0 to 1.5",
+            "client": total(client_records, "Marshi_Muddy_Slushy_0_to_1_5_total"),
+            "sub": 0
+        },
+        {
+            "label": "Marshi 1.5 to 3.0",
+            "client": total(client_records, "Marshi_Muddy_Slushy_1_5_to_3_0_total"),
+            "sub": 0
+        },
+        {
+            "label": "Marshi 3.0 to 4.5",
+            "client": total(client_records, "Marshi_Muddy_Slushy_3_0_to_4_5_total"),
+            "sub": 0
+        },
+
+        {
+            "label": "Soft Murum 0 to 1.5",
+            "client": total(client_records, "Soft_Murum_0_to_1_5_total"),
+            "sub": total(sub_records, "Soft_Murum_0_to_1_5_total")
+        },
+        {
+            "label": "Soft Murum 1.5 to 3.0",
+            "client": total(client_records, "Soft_Murum_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Soft_Murum_1_5_to_3_0_total")
+        },
+        {
+            "label": "Soft Murum 3.0 to 4.5",
+            "client": total(client_records, "Soft_Murum_3_0_to_4_5_total"),
+            "sub": total(sub_records, "Soft_Murum_3_0_to_4_5_total")
+        },
+
+        {
+            "label": "Hard Murum 0 to 1.5",
+            "client": total(client_records, "Hard_Murum_0_to_1_5_total"),
+            "sub": total(sub_records, "Hard_Murum_0_to_1_5_total")
+        },
+        {
+            "label": "Hard Murum 1.5 to 3.0",
+            "client": total(client_records, "Hard_Murum_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Hard_Murum_1_5_and_above_total")
+        },
+
+        {
+            "label": "Soft Rock 0 to 1.5",
+            "client": total(client_records, "Soft_Rock_0_to_1_5_total"),
+            "sub": total(sub_records, "Soft_Rock_0_to_1_5_total")
+        },
+        {
+            "label": "Soft Rock 1.5 to 3.0",
+            "client": total(client_records, "Soft_Rock_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Soft_Rock_1_5_and_above_total")
+        },
+
+        {
+            "label": "Hard Rock 0 to 1.5",
+            "client": total(client_records, "Hard_Rock_0_to_1_5_total"),
+            "sub": total(sub_records, "Hard_Rock_0_to_1_5_total")
+        },
+        {
+            "label": "Hard Rock 1.5 to 3.0",
+            "client": total(client_records, "Hard_Rock_1_5_to_3_0_total"),
+            "sub": total(sub_records, "Hard_Rock_1_5_to_3_0_total")
+        },
+        {
+            "label": "Hard Rock 3.0 to 4.5",
+            "client": total(client_records, "Hard_Rock_3_0_to_4_5_total"),
+            "sub": total(sub_records, "Hard_Rock_3_0_to_4_5_total")
+        },
+        {
+            "label": "Hard Rock 4.5 to 6.0",
+            "client": total(client_records, "Hard_Rock_4_5_to_6_0_total"),
+            "sub": total(sub_records, "Hard_Rock_4_5_to_6_0_total")
+        },
+        {
+            "label": "Hard Rock 6.0 to 7.5",
+            "client": total(client_records, "Hard_Rock_6_0_to_7_5_total"),
+            "sub": total(sub_records, "Hard_Rock_6_0_to_7_5_total")
+        }
+    ]
 
     return jsonify({
-        "labels": labels,
-        "values": values
-    })
+        "title": "Manhole Excavation Comparison",
+        "y_title": "Manhole Qty (Nos)",
+        "labels": [x["label"] for x in chart_data],
+        "client_qty": [x["client"] for x in chart_data],
+        "sub_qty": [x["sub"] for x in chart_data]
+    })
+    
+
+
+# category = Manhole_Domestic_Chamber
+@dashboard_bp.route("/api/mdc-analysis")
+def Manhole_Domestic_Chamber_analysis():
+
+    subcontractor_id = request.args.get("subcontractor", "").strip()
+    ra_bill = request.args.get("ra_bill", "").strip()
+
+    # Convert "1,2,3" -> ["1", "2", "3"]
+    ra_bill_list = []
+    if ra_bill:
+        ra_bill_list = [x.strip() for x in ra_bill.split(",") if x.strip()]
+
+    # Subcontractor Query
+    sub_query = ManholeDomesticChamber.query
+    if subcontractor_id:
+        sub_query = sub_query.filter(
+            ManholeDomesticChamber.subcontractor_id == int(subcontractor_id)
+        )
+
+    if ra_bill_list:
+        sub_query = sub_query.filter(
+            ManholeDomesticChamber.RA_Bill_No.in_(ra_bill_list)
+        )
+
+    sub_records = sub_query.all()
+
+    sub_keys = [
+        (
+            (r.MH_NO or "").strip().upper(),
+            (r.Location or "").strip().upper()
+        )
+        for r in sub_records
+    ]
+
+    client_query = ManholeDomesticChamberClient.query
+
+    if sub_keys:
+
+        client_query = client_query.filter(
+            tuple_(
+                func.upper(func.trim(ManholeDomesticChamberClient.MH_NO)),
+                func.upper(func.trim(ManholeDomesticChamberClient.Location))
+            ).in_(sub_keys)
+
+        )
+
+    client_records = client_query.all()
+
+    chart_data = [
+        {
+            "label": "Depth of MH",
+            "client": total(client_records, "Depth_of_MH"),
+            "sub": total(sub_records, "Depth_of_MH")
+        },
+        {
+            "label": "Domestic_Chambers Total",
+            "client": total(client_records, "Total"),
+            "sub": total(sub_records, "Total")
+        }
+    ]
+
+    return jsonify({
+        "title": "Domestic Chamber Comparison",
+        "y_title": "Quantity (Nos)",
+        "labels": [x["label"] for x in chart_data],
+        "client_qty": [x["client"] for x in chart_data],
+        "sub_qty": [x["sub"] for x in chart_data]
+    })
+    
+    
+    
+# category = Laying
+@dashboard_bp.route("/api/laying-analysis")
+def laying_analysis():
+
+    subcontractor_id = request.args.get("subcontractor", "").strip()
+    ra_bill = request.args.get("ra_bill", "").strip()
+
+    # Convert "1,2,3" -> ["1", "2", "3"]
+    ra_bill_list = []
+    if ra_bill:
+        ra_bill_list = [x.strip() for x in ra_bill.split(",") if x.strip()]
+
+    # Subcontractor Query
+    sub_query = Laying.query
+    if subcontractor_id:
+        sub_query = sub_query.filter(
+            Laying.subcontractor_id == int(subcontractor_id)
+        )
+
+    if ra_bill_list:
+        sub_query = sub_query.filter(
+            Laying.RA_Bill_No.in_(ra_bill_list)
+        )
+
+    sub_records = sub_query.all()
+
+    sub_keys = [
+        (
+            (r.MH_NO or "").strip().upper(),
+            (r.Location or "").strip().upper()
+        )
+        for r in sub_records
+    ]
+
+    client_query = LayingClient.query
+
+    if sub_keys:
+
+        client_query = client_query.filter(
+            tuple_(
+                func.upper(func.trim(LayingClient.MH_NO)),
+                func.upper(func.trim(LayingClient.Location))
+            ).in_(sub_keys)
+
+        )
+
+    client_records = client_query.all()
+
+    chart_data = [
+        {
+            "label": "150 mm",
+            "client": total(client_records, "pipe_150_mm"),
+            "sub": total(sub_records, "pipe_150_mm")
+        },
+        {
+            "label": "200 mm",
+            "client": total(client_records, "pipe_200_mm"),
+            "sub": total(sub_records, "pipe_200_mm")
+        },
+        {
+            "label": "250 mm",
+            "client": total(client_records, "pipe_250_mm"),
+            "sub": total(sub_records, "pipe_250_mm")
+        },
+
+        {
+            "label": "300 mm",
+            "client": total(client_records, "pipe_300_mm"),
+            "sub": total(sub_records, "pipe_300_mm")
+        },
+        {
+            "label": "350 mm",
+            "client": total(client_records, "pipe_350_mm"),
+            "sub": total(sub_records, "pipe_350_mm")
+        },
+
+        {
+            "label": "400 mm",
+            "client": total(client_records, "pipe_400_mm"),
+            "sub": total(sub_records, "pipe_400_mm")
+        },
+        {
+            "label": "450 mm",
+            "client": total(client_records, "pipe_450_mm"),
+            "sub": total(sub_records, "pipe_450_mm")
+        },
+
+        {
+            "label": "500 mm",
+            "client": total(client_records, "pipe_500_mm"),
+            "sub": total(sub_records, "pipe_500_mm")
+        },
+        {
+            "label": "600 mm",
+            "client": total(client_records, "pipe_600_mm"),
+            "sub": total(sub_records, "pipe_600_mm")
+        },
+        {
+            "label": "700 mm",
+            "client": total(client_records, "pipe_700_mm"),
+            "sub": total(sub_records, "pipe_700_mm")
+        },
+        {
+            "label": "900 mm",
+            "client": total(client_records, "pipe_900_mm"),
+            "sub": total(sub_records, "pipe_900_mm")
+        },
+        {
+            "label": "1200 mm",
+            "client": total(client_records, "pipe_1200_mm"),
+            "sub": total(sub_records, "pipe_1200_mm")
+        }
+    ]
+
+    return jsonify({
+        "title": "Pipe Laying Comparison",
+        "y_title": "Pipe Length (Mtr)",
+        "labels": [x["label"] for x in chart_data],
+        "client_qty": [x["client"] for x in chart_data],
+        "sub_qty": [x["sub"] for x in chart_data]
+    })
+    
+    
+    

app/routes/engineering_master_routes.py

@@ -0,0 +1,56 @@
+from flask import (
+    Blueprint,
+    render_template,
+    request,
+    redirect,
+    url_for,
+    flash
+)
+
+from app.models.subcontractor_model import Subcontractor
+from app.services.subcontractor_rate_service import SubcontractorRateService
+from app.constants.messages import SuccessMessage, ErrorMessage
+
+engi_bp = Blueprint(
+    "engineering",
+    __name__,
+    url_prefix="/engi"
+)
+
+
+    
+@engi_bp.route("/")
+def engineering_master():
+
+    return render_template(
+        "engineering/index.html",
+        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
+    )
+
+@engi_bp.route("/client-rate")
+def client_rates():
+
+    return render_template(
+        "engineering/client_rate.html",
+        title="Client Rate Master"
+    )
+

app/routes/file_format.py

@@ -1,5 +1,6 @@
 from flask import Blueprint, render_template, send_from_directory, abort, current_app
 from app.utils.helpers import login_required
+from app.utils.file_utils import get_download_format_folder
 import os
 
 file_format_bp  = Blueprint("file_format", __name__)
@@ -14,10 +15,7 @@ def download_format():
 @login_required
 def download_excel_format(filename):
 
-    download_folder = os.path.join(
-        current_app.root_path, "static", "downloads/format"
-    )
-
+    download_folder = get_download_format_folder()
     file_path = os.path.join(download_folder, filename)
 
     if not os.path.exists(file_path):

app/routes/file_report.py

@@ -1,10 +1,12 @@
 import pandas as pd
 import io
-from flask import Blueprint, render_template, request, send_file, flash
+from flask import Blueprint, render_template, request, send_file, flash, jsonify,redirect, url_for
 from app.utils.helpers import login_required
+from app.utils.regex_utils import RegularExpression
+from app import db
+import re
 
 from app.models.subcontractor_model import Subcontractor
-
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
@@ -15,10 +17,320 @@ from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 from app.models.laying_client_model import LayingClient
 
+from app.services.abstract_service import AbstractReportService
+
  
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
  
+
+# ---------------- ACTION COLUMN ----------------
+def add_action_columns(df, model_key):
+    if df.empty:
+        return df
+
+    df.insert(0, "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>'
+    )
+
+    return df
+
+
+
+
+
+# ---------------- FETCH ----------------
+class SubcontractorBill:
+    def __init__(self):
+        self.df_tr = pd.DataFrame()
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
+        self.df_laying = pd.DataFrame()
+        # self.df_abstract = pd.DataFrame()   # NEW
+
+    def Fetch(self, RA_Bill_No=None, subcontractor_id=None, location=None):
+
+        filters = {}
+        if subcontractor_id:
+            filters["subcontractor_id"] = subcontractor_id
+        if RA_Bill_No:
+            filters["RA_Bill_No"] = RA_Bill_No
+
+        # Fetch data in database
+        trench = TrenchExcavation.query.filter_by(**filters).all()
+        mh = ManholeExcavation.query.filter_by(**filters).all()
+        dc = ManholeDomesticChamber.query.filter_by(**filters).all()
+        lay = Laying.query.filter_by(**filters).all()
+        
+        # LOCATION FILTER
+        if location:
+            search = location.strip().lower()
+            print("location::",search)
+            trench = [
+                t for t in trench
+                if search in (t.Location or "").strip().lower()
+            ]
+
+            mh = [
+                t for t in mh
+                if search in (t.Location or "").strip().lower()
+            ]
+
+            dc = [
+                t for t in dc
+                if search in (t.Location or "").strip().lower()
+            ]
+
+            lay = [
+                t for t in lay
+                if search in (t.Location or "").strip().lower()
+            ]
+        
+        # Set dataframe
+        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+        
+        drop_cols = ["11", "_sa_instance_state", "subcontractor_id" , "created_at"]
+
+        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
+            if not df.empty:
+                df.drop(columns=drop_cols, errors="ignore", inplace=True)
+                format_column_names(df)
+                
+        name = ""
+        if subcontractor_id:
+            sc = Subcontractor.query.get(subcontractor_id)
+            if sc:
+                name = sc.subcontractor_name
+
+
+# ---------------- DELETE ----------------
+@file_report_bp.route("/delete_records", methods=["POST"])
+@login_required
+def delete_records():
+
+    data = request.json or {}
+    model = data.get("model")
+    ids = data.get("ids", [])
+
+    model_map = {
+        "tr": TrenchExcavation,
+        "mh": ManholeExcavation,
+        "dc": ManholeDomesticChamber,
+        "laying": Laying
+    }
+
+    ModelClass = model_map.get(model)
+
+    # validate model BEFORE using it
+    if not ModelClass:
+        return jsonify({"status": "error", "message": f"Invalid model '{model}'"}), 400
+
+    if not ids:
+        return jsonify({"status": "error", "message": "No IDs provided"}), 400
+
+    try:
+        for record_id in ids:
+            obj = ModelClass.query.get(record_id)
+            if obj:
+                db.session.delete(obj)
+
+        db.session.commit()
+        return jsonify({"status": "success"})
+    except Exception as e:
+        db.session.rollback()
+        return jsonify({"status": "error", "message": str(e)}), 500
+
+
+@file_report_bp.route("/edit/<string:model>/<int:record_id>", methods=["GET", "POST"])
+@login_required
+def edit_record(model, record_id):
+
+    model_map = {
+        "tr": TrenchExcavation,
+        "mh": ManholeExcavation,
+        "dc": ManholeDomesticChamber,
+        "laying": Laying
+    }
+
+    ModelClass = model_map.get(model)
+
+    if not ModelClass:
+        flash("Invalid Model.", "danger")
+        return redirect(url_for("file_report.report_file"))
+
+    record = ModelClass.query.get_or_404(record_id)
+
+    if request.method == "POST":
+
+        # Update all fields except id
+        for column in record.__table__.columns:
+
+            if column.name == "id":
+                continue
+
+            if column.name in request.form:
+                setattr(record, column.name, request.form.get(column.name))
+
+        try:
+            db.session.commit()
+            flash("Record updated successfully.", "success")
+            # ✅ fixed: correct blueprint name
+            return redirect(url_for("file_report.report_file"))
+
+        except Exception as e:
+            db.session.rollback()
+            flash(str(e), "danger")
+
+    return render_template(
+        "edit_record.html",
+        record=record,
+        model=model
+    )
+
+
+@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
+@login_required
+def report_file():
+    # get all subcontractor data
+    subcontractors = Subcontractor.query.all()
+    
+    tables = None
+    abstract_html = ""
+    selected_sc_id = None
+    ra_bill_no = ""
+    location = ""
+    category = ""
+
+    # Search or load data
+    if request.method == "POST":
+        # get from data
+        subcontractor_id = request.form.get("subcontractor_id")
+        ra_bill_no = request.form.get("ra_bill_no", "").strip()
+        location = request.form.get("location", "").strip()
+        category = request.form.get("category", "")
+        action = request.form.get("action", "preview")
+
+        if not subcontractor_id:
+            flash("Select Subcontractor", "danger")
+            return render_template(
+                "subcontractor_report.html",
+                subcontractors=subcontractors
+            )
+        
+        selected_sc_id = subcontractor_id
+        bill = SubcontractorBill()
+
+        if action == "excel_all":
+            bill.Fetch(subcontractor_id=subcontractor_id)
+        else:
+            bill.Fetch(ra_bill_no,subcontractor_id,location)
+            
+        # -----------------------------------------
+        # Generate Abstract Report for Web
+        # -----------------------------------------
+        abstract_service = AbstractReportService(
+            subcontractor_id=subcontractor_id,
+            ra_bill_no=ra_bill_no
+        )
+        abstract_html = abstract_service.generate_html()
+
+        # ---------------- CATEGORY FILTER ----------------
+        if category == "tr":
+            bill.df_mh = bill.df_dc = bill.df_laying = pd.DataFrame()
+        elif category == "mh":
+            bill.df_tr = bill.df_dc = bill.df_laying = pd.DataFrame()
+        elif category == "dc":
+            bill.df_tr = bill.df_mh = bill.df_laying = pd.DataFrame()
+        elif category == "laying":
+            bill.df_tr = bill.df_mh = bill.df_dc = pd.DataFrame()
+            
+
+        # ===================================================
+        # DOWNLOAD EXCEL
+        # ===================================================
+        if action in ["excel", "excel_all"]:
+            output = io.BytesIO()
+            
+            with pd.ExcelWriter(output,engine="xlsxwriter") as writer:
+                workbook = writer.book
+                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)
+                writer.close()
+            output.seek(0)
+            
+            return send_file(
+                output,
+                download_name= "subcontractor_Report.xlsx",
+                as_attachment=True 
+            )
+
+        # ===================================================
+        # PDF
+        # ===================================================
+        if action == "pdf":
+            flash(
+                "PDF Export Coming Soon.",
+                "info"
+            ) 
+    
+        # ===================================================
+        # ADD ACTIONS
+        # ===================================================
+        bill.df_tr = add_action_columns(bill.df_tr, "tr")
+        bill.df_mh = add_action_columns(bill.df_mh, "mh")
+        bill.df_dc = add_action_columns(bill.df_dc, "dc")
+        bill.df_laying = add_action_columns(bill.df_laying, "laying")
+        
+        # this are html classes
+        # table_class = ( "table " "table-bordered" "table-hover " "table-striped " "table-sm " "align-middle " "datatable " "mb-0")
+        table_class = (
+            "table "
+            "table-bordered "
+            "table-hover "
+            "table-striped "
+            "table-sm "
+            "align-middle "
+            "datatable "
+            "text-nowrap "
+            "mb-0"
+        )
+        
+        # This are showing on web tables
+        tables = {
+            "tr": bill.df_tr.to_html(classes=table_class, index=False, escape=False),
+            "mh": bill.df_mh.to_html(classes=table_class, index=False, escape=False),
+            "dc": bill.df_dc.to_html(classes=table_class, index=False, escape=False ),
+            "laying": bill.df_laying.to_html(classes=table_class, index=False, escape=False)
+        }
+
+    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,
+        tables=tables,
+        abstract_html=abstract_html
+    )
+
+
 # --- Client class ---
 class ClientBill:
     def __init__(self):
@@ -43,105 +355,8 @@ class ClientBill:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
  
-# --- Subcontractor class ---
-class SubcontractorBill:
-    def __init__(self):
-        self.df_tr = pd.DataFrame()
-        self.df_mh = pd.DataFrame()
-        self.df_dc = pd.DataFrame()
-        self.df_laying = pd.DataFrame()
- 
-    def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
-        filters = {}
-        if subcontractor_id:
-            filters["subcontractor_id"] = subcontractor_id
-        if RA_Bill_No:
-            filters["RA_Bill_No"] = RA_Bill_No
- 
-        trench = TrenchExcavation.query.filter_by(**filters).all()
-        mh = ManholeExcavation.query.filter_by(**filters).all()
-        dc = ManholeDomesticChamber.query.filter_by(**filters).all()
-        lay = Laying.query.filter_by(**filters).all()
- 
-        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
-        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
-        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
-        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
-  
-        drop_cols = ["id", "created_at", "_sa_instance_state"]
-        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
-            if not df.empty:
-                df.drop(columns=drop_cols, errors="ignore", inplace=True)
 
 
-# --- subcontractor report only  ---
-@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
-@login_required
-def report_file():
-    subcontractors = Subcontractor.query.all()
-    tables = None 
-    selected_sc_id = None
-    ra_bill_no = None
-    download_all = False
- 
-    if request.method == "POST":
-        subcontractor_id = request.form.get("subcontractor_id")
-        ra_bill_no = request.form.get("ra_bill_no")
-        download_all = request.form.get("download_all") == "true"
-        action = request.form.get("action")
- 
-        if not subcontractor_id:
-            flash("Please select a subcontractor.", "danger")
-            return render_template("subcontractor_report.html", subcontractors=subcontractors)
- 
-        subcontractor = Subcontractor.query.get(subcontractor_id)
-        bill_gen = SubcontractorBill()
- 
-        if download_all:
-            bill_gen.Fetch(subcontractor_id=subcontractor_id)
-            file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
-        else:
-            if not ra_bill_no:
-                flash("Please enter an RA Bill Number.", "danger")
-                return render_template("subcontractor_report.html", subcontractors=subcontractors)
-            bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
-            file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
- 
-        if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
-            flash("No data found for this selection.", "warning")
-            return render_template("subcontractor_report.html", subcontractors=subcontractors)
- 
-        # If download is clicked, return file immediately
-        if action == "download":
-            output = io.BytesIO()
-            with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-                bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
-                bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
-                bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
-                bill_gen.df_laying.to_excel(writer, index=False, sheet_name="Laying")
-            output.seek(0)
-            return send_file(output, download_name=file_name, as_attachment=True)
- 
-        # We add bootstrap classes directly to the pandas output
-        table_classes = "table table-bordered table-striped table-hover table-sm mb-0"
-        tables = {
-            "tr": bill_gen.df_tr.to_html(classes=table_classes, index=False),
-            "mh": bill_gen.df_mh.to_html(classes=table_classes, index=False),
-            "dc": bill_gen.df_dc.to_html(classes=table_classes, index=False),
-            "laying": bill_gen.df_laying.to_html(classes=table_classes, index=False)
-        }
-        selected_sc_id = subcontractor_id
- 
-    return render_template(
-        "subcontractor_report.html",
-        subcontractors=subcontractors,
-        tables=tables,
-        selected_sc_id=selected_sc_id,
-        ra_bill_no=ra_bill_no,
-        download_all=download_all
-    )
- 
-
 # --- CLIENT REPORT (PREVIEW + DOWNLOAD) ---
 @file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
@@ -202,4 +417,93 @@ def client_report():
         tables["dc"] = bill_gen.df_dc.to_html(classes=table_class, index=False)
         tables["laying"] = bill_gen.df_laying.to_html(classes=table_class, index=False)
 
-    return render_template("client_report.html", tables=tables, ra_val=ra_val)
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)
+
+
+def format_column_names(df):
+    if df.empty:
+        return df
+
+    new_columns = []
+
+    for col in df.columns:
+
+        # ----------------------------------------
+        # Pipe columns
+        # pipe_150_mm -> Pipe 150 MM
+        # ----------------------------------------
+        if RegularExpression.PIPE_MM_PATTERN.match(col):
+            m = re.match(r"pipe_(\d+)_mm", col)
+            new_columns.append(f"Pipe {m.group(1)} MM")
+            continue
+
+        # ----------------------------------------
+        # Domestic Chamber
+        # d_0_to_0_75 -> 0.00 To 0.75
+        # d_1_5_to_3_0 -> 1.50 To 3.00
+        # ----------------------------------------
+        if RegularExpression.D_RANGE_PATTERN.match(col):
+
+            value = col[2:]  # remove d_
+
+            value = re.sub(
+                r'(\d+)_(\d+)',
+                lambda m: f"{m.group(1)}.{m.group(2)}",
+                value
+            )
+
+            value = value.replace("_to_", " To ")
+
+            new_columns.append(value)
+            continue
+
+        # ----------------------------------------
+        # Total columns
+        # Soft_Murum_0_to_1_5_total
+        # ->
+        # Soft Murum 0 To 1.5 Total
+        # ----------------------------------------
+        if RegularExpression.STR_TOTAL_PATTERN.match(col):
+
+            value = col[:-6]  # remove _total
+
+            value = re.sub(
+                r'(\d+)_(\d+)',
+                lambda m: f"{m.group(1)}.{m.group(2)}",
+                value
+            )
+
+            value = value.replace("_to_", " To ")
+            value = value.replace("_", " ")
+
+            new_columns.append(value.title() + " Total")
+            continue
+
+        # ----------------------------------------
+        # General columns
+        # ----------------------------------------
+        value = col.replace("_", " ").title()
+
+        replacements = {
+            "Mh No": "MH No",
+            "Ra Bill No": "RA Bill No",
+            "Cc Length": "CC Length",
+            "Id Of Mh M": "ID of MH (m)",
+            "Pipe Dia Mm": "Pipe Dia (MM)",
+            "Mh Top Level": "MH Top Level",
+            "Upto Il Depth": "Upto IL Depth",
+            "Actual Trench Length": "Actual Trench Length",
+            "Ground Level": "Ground Level",
+            "Invert Level": "Invert Level",
+            "Ex Dia Of Manhole": "External Dia of Manhole",
+            "Area Of Manhole": "Area of Manhole",
+            "Depth Of Mh": "Depth of MH",
+        }
+
+        value = replacements.get(value, value)
+
+        new_columns.append(value)
+
+    df.columns = new_columns
+
+    return df

app/routes/generate_comparison_report.py

@@ -2,31 +2,27 @@ from flask import Blueprint, render_template, request, send_file, flash
 from collections import defaultdict
 import pandas as pd
 import io
- 
+from app.utils.helpers import login_required
+from app.utils.regex_utils import RegularExpression
+
+# Contractor models import
 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
 from app.models.laying_model import Laying
  
+#  Client models import
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 from app.models.laying_client_model import LayingClient
  
-from app.utils.helpers import login_required
-import re
- 
- 
+
+
 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
  
  
-# sum field  of pipe laying (pipe_150_mm)
-PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
-# sum fields of MH dc (d_0_to_0_75)
-D_RANGE_PATTERN = re.compile( r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
- 
- 
 # NORMALIZER
 def normalize_key(value):
     if value is None:
@@ -80,6 +76,7 @@ def build_comparison(client_rows, contractor_rows, key_field):
     used_index = defaultdict(int)  # 🔥 THIS FIXES YOUR ISSUE
  
     for c in client_rows:
+     
         client_location = normalize_key(c.get("Location"))
         client_key = normalize_key(c.get(key_field))
  
@@ -104,16 +101,16 @@ def build_comparison(client_rows, contractor_rows, key_field):
             float(v or 0)
             for k, v in c.items()
             if k.endswith("_total")
-            or D_RANGE_PATTERN.match(k)
-            or PIPE_MM_PATTERN.match(k)
+            or RegularExpression.D_RANGE_PATTERN.match(k)
+            or RegularExpression.PIPE_MM_PATTERN.match(k)
         )
  
         sub_total = sum(
             float(v or 0)
             for k, v in s.items()
             if k.endswith("_total")
-            or D_RANGE_PATTERN.match(k)
-            or PIPE_MM_PATTERN.match(k)
+            or RegularExpression.D_RANGE_PATTERN.match(k)
+            or RegularExpression.PIPE_MM_PATTERN.match(k)
         )
  
         row = {
@@ -138,7 +135,9 @@ def build_comparison(client_rows, contractor_rows, key_field):
         output.append(row)
  
     df = pd.DataFrame(output)
+    # formatting headers    
     df.columns = [format_header(col) for col in df.columns]
+    
     return df
  
  
@@ -225,15 +224,12 @@ def comparison_report():
             subcontractor_id=subcontractor_id
         ).all()]
         df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
-        # df_dc = build_comparison_mh_dc(dc_client, dc_sub, "MH_NO")
  
         lay_client = [r.serialize() for r in LayingClient.query.all()]
         lay_sub = [r.serialize() for r in Laying.query.filter_by(
             subcontractor_id=subcontractor_id
         ).all()]
         df_lay = build_comparison(lay_client, lay_sub, "MH_NO")
-        # df_lay = build_comparison_laying(lay_client, lay_sub, "MH_NO")
- 
  
         # -------- EXCEL --------
         output = io.BytesIO()
@@ -245,7 +241,7 @@ def comparison_report():
             write_sheet(writer, df_dc, "MH & DC", subcontractor.subcontractor_name)
             write_sheet(writer, df_lay, "Laying", subcontractor.subcontractor_name)
  
-        output.seek(0)
+        output.seek(0) 
         return send_file(
             output,
             as_attachment=True,
@@ -254,106 +250,4 @@ def comparison_report():
         )
  
     return render_template("generate_comparison_report.html",subcontractors=subcontractors)
- 
- 
-# def build_comparison_mh_dc(client_rows, contractor_rows, key_field):
-#     contractor_lookup = make_lookup(contractor_rows, key_field)
-#     mh_dc_fields = ManholeDomesticChamberClient.sum_mh_dc_fields()
- 
-#     output = []
- 
-#     for c in client_rows:
-#         loc = normalize_key(c.get("Location"))
-#         key = normalize_key(c.get(key_field))
-#         if not loc or not key:
-#             continue
- 
-#         s = contractor_lookup.get((loc, key))
-#         if not s:
-#             continue
- 
-#         client_total = sum(float(c.get(f, 0) or 0) for f in mh_dc_fields)
-#         sub_total = sum(float(s.get(f, 0) or 0) for f in mh_dc_fields)
- 
-#         row = {
-#             "Location": loc,
-#             key_field.replace("_", " "): key
-#         }
- 
-#         # CLIENT – ALL FIELDS
-#         for k, v in c.items():
-#             if k in ["id", "created_at"]:
-#                 continue
-#             row[f"Client-{k}"] = v
- 
-#         row["Client-Total"] = round(client_total, 2)
-#         row[" "] = ""
- 
-#         # SUBCONTRACTOR – ALL FIELDS
-#         for k, v in s.items():
-#             if k in ["id", "created_at", "subcontractor_id"]:
-#                 continue
-#             row[f"Subcontractor-{k}"] = v
- 
-#         row["Subcontractor-Total"] = round(sub_total, 2)
-#         row["Diff"] = round(client_total - sub_total, 2)
- 
-#         output.append(row)
- 
-#     df = pd.DataFrame(output)
-#     df.columns = [format_header(col) for col in df.columns]
-#     return df
- 
- 
-# def build_comparison_laying(client_rows, contractor_rows, key_field):
-#     contractor_lookup = make_lookup(contractor_rows, key_field)
-#     laying_fields = Laying.sum_laying_fields()
- 
-#     output = []
- 
-#     for c in client_rows:
-#         loc = normalize_key(c.get("Location"))
-#         key = normalize_key(c.get(key_field))
-#         if not loc or not key:
-#             continue
- 
-#         s = contractor_lookup.get((loc, key))
-#         if not s:
-#             continue
- 
-#         client_total = sum(float(c.get(f, 0) or 0) for f in laying_fields)
-#         sub_total = sum(float(s.get(f, 0) or 0) for f in laying_fields)
- 
-#         print("--------------",key,"----------")
-#         print("sum -client_total ",client_total)
-#         print("sum -sub_total ",sub_total)
-#         print("Diff ---- ",client_total - sub_total)
-#         print("------------------------")
-#         row = {
-#             "Location": loc,
-#             key_field.replace("_", " "): key
-#         }
- 
-#         # CLIENT – ALL FIELDS
-#         for k, v in c.items():
-#             if k in ["id", "created_at"]:
-#                 continue
-#             row[f"Client-{k}"] = v
- 
-#         row["Client-Total"] = round(client_total, 2)
-#         row[" "] = ""
- 
-#         # SUBCONTRACTOR – ALL FIELDS
-#         for k, v in s.items():
-#             if k in ["id", "created_at", "subcontractor_id"]:
-#                 continue
-#             row[f"Subcontractor-{k}"] = v
- 
-#         row["Subcontractor-Total"] = round(sub_total, 2)
-#         row["Diff"] = round(client_total - sub_total, 2)
- 
-#         output.append(row)
- 
-#     df = pd.DataFrame(output)
-#     df.columns = [format_header(col) for col in df.columns]
-#     return df
+ 

app/routes/subcontractor_routes.py

@@ -121,7 +121,7 @@ def update_subcontractor(id):
         subcontractor.mobile_no = request.form.get("mobile_no")
         subcontractor.email_id = request.form.get("email_id")
         subcontractor.gst_no = request.form.get("gst_no")
-        subcontractor.gst_no = request.form.get("pan_no")
+        subcontractor.pan_no = request.form.get("pan_no")
         subcontractor.status = request.form.get("status")
 
         db.session.commit()

app/routes/user.py

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

app/routes/user_routes.py

@@ -0,0 +1,50 @@
+# from flask import Blueprint, render_template
+# from app.services.user_service import UserService
+# from app.utils.helpers import login_required
+# from flask import current_app
+
+# user_bp = Blueprint("user", __name__, url_prefix="/user")
+
+# @user_bp.route("/list")
+# @login_required
+# def list_users():
+#     current_app.logger.info("User list viewed")
+#     users = UserService.get_all_users()
+#     return render_template("/user/users.html", users=users, title="Users | List")
+
+
+
+
+from flask import (Blueprint,render_template,current_app,flash)
+from app.services.user_service import UserService
+from app.utils.helpers import login_required
+from app.constants.messages import SuccessMessage, ErrorMessage
+from app.constants.http_status import HTTPStatus
+
+
+user_bp = Blueprint("user", __name__, url_prefix="/user")
+
+
+# ==================================================
+# User List
+# ==================================================
+@user_bp.route("/list", methods=["GET"])
+@login_required
+def list_users():
+
+    try:
+
+        current_app.logger.info("Fetching user list.")
+        users = UserService.get_all_users()
+        current_app.logger.info(f"User list loaded successfully. Total Users: {len(users)}")
+
+        return render_template("user/users.html", users=users, title="Users | List")
+
+    except Exception as e:
+
+        current_app.logger.exception("Failed to load user list.")
+
+        flash(ErrorMessage.INTERNAL_SERVER_ERROR,"danger")
+
+        return render_template("user/users.html",users=[],title="Users | List"), HTTPStatus.INTERNAL_SERVER_ERROR
+    

app/services/abstract_service.py

@@ -0,0 +1,359 @@
+from sqlalchemy import func
+from app import db
+
+from app.models.subcontractor_model import Subcontractor
+from app.models.trench_excavation_model import TrenchExcavation
+from app.models.manhole_excavation_model import ManholeExcavation
+from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
+
+
+class AbstractReportService:
+
+    def __init__(self, subcontractor_id=None, ra_bill_no=None):
+
+        self.subcontractor_id = subcontractor_id
+        self.ra_bill_no = ra_bill_no
+    
+    # ---------------------------------------------------------
+    # FILTER
+    # ---------------------------------------------------------
+    def filters(self):
+        filters = {}
+
+        if self.subcontractor_id:
+            filters["subcontractor_id"] = self.subcontractor_id
+
+        if self.ra_bill_no:
+            filters["RA_Bill_No"] = self.ra_bill_no
+
+        return filters
+
+    # ---------------------------------------------------------
+    # CONTRACTOR
+    # ---------------------------------------------------------
+    def contractor_name(self):
+
+        if not self.subcontractor_id:
+            return ""
+
+        contractor = Subcontractor.query.get(self.subcontractor_id)
+
+        if contractor:
+            return contractor.subcontractor_name
+
+        return ""
+
+    # ---------------------------------------------------------
+    # WRITE ABSTRACT SHEET
+    # ---------------------------------------------------------
+    def generate(self, workbook):
+
+        worksheet = workbook.add_worksheet("Abstract")
+
+        title = workbook.add_format({
+            "bold": True,
+            "font_size": 16,
+            "align": "center",
+            "valign": "vcenter",
+            "border": 1
+        })
+
+        heading = workbook.add_format({
+            "bold": True,
+            "bg_color": "#D9EAD3",
+            "border": 1,
+            "align": "center"
+        })
+
+        cell = workbook.add_format({"border": 1})
+        number = workbook.add_format({"border": 1,"num_format": "#,##0.00"})
+
+        # -----------------------------------------------------
+        # HEADER
+        # -----------------------------------------------------
+        worksheet.merge_range(
+            "A1:D1",
+            "ABSTRACT OF QUANTITY",
+            title
+        )
+
+        worksheet.write("A3", "Contractor", heading)
+        worksheet.write("B3", self.contractor_name(), cell)
+
+        worksheet.write("C3", "RA Bill", heading)
+        worksheet.write("D3", self.ra_bill_no or "", cell)
+
+        worksheet.write_row(
+            "A5",
+            [
+                "Sr",
+                "Description",
+                "UOM",
+                "Qty"
+            ],
+            heading
+        )
+
+        row = 5
+        sr = 1
+
+        # -----------------------------------------------------
+        # TRENCH
+        # -----------------------------------------------------
+        worksheet.write(row, 0, "")
+        worksheet.write(row, 1, "TRENCH EXCAVATION", heading)
+
+        row += 1
+
+        for item in self.trench_summary():
+            worksheet.write(row, 0, sr, cell)
+            worksheet.write(row, 1, item["Description"], cell)
+            worksheet.write(row, 2, item["UOM"], cell)
+            worksheet.write(row, 3, item["Qty"], number)
+
+            sr += 1
+            row += 1
+
+        # -----------------------------------------------------
+        # MANHOLE
+        # -----------------------------------------------------
+        worksheet.write(row, 1, "MANHOLE EXCAVATION", heading)
+        row += 1
+
+        for item in self.manhole_summary():
+            worksheet.write(row, 0, sr, cell)
+            worksheet.write(row, 1, item["Description"], cell)
+            worksheet.write(row, 2, item["UOM"], cell)
+            worksheet.write(row, 3, item["Qty"], number)
+
+            sr += 1
+            row += 1
+
+        # -----------------------------------------------------
+        # DOMESTIC CHAMBER
+        # -----------------------------------------------------
+        worksheet.write(row, 1, "DOMESTIC CHAMBER", heading)
+
+        row += 1
+
+        for item in self.domestic_summary():
+            worksheet.write(row, 0, sr, cell)
+            worksheet.write(row, 1, item["Description"], cell)
+            worksheet.write(row, 2, item["UOM"], cell)
+            worksheet.write(row, 3, item["Qty"], number)
+
+            sr += 1
+            row += 1
+
+        # -----------------------------------------------------
+        # PIPE LAYING
+        # -----------------------------------------------------
+        worksheet.write(row, 1, "PIPE LAYING", heading)
+        row += 1
+
+        for item in self.laying_summary():
+            worksheet.write(row, 0, sr, cell)
+            worksheet.write(row, 1, item["Description"], cell)
+            worksheet.write(row, 2, item["UOM"], cell)
+            worksheet.write(row, 3, item["Qty"], number)
+
+            sr += 1
+            row += 1
+
+        worksheet.set_column("A:A", 8)
+        worksheet.set_column("B:B", 55)
+        worksheet.set_column("C:C", 10)
+        worksheet.set_column("D:D", 18)
+
+    # ============================================================
+    # TRENCH
+    # ============================================================
+    def trench_summary(self):
+
+        f = self.filters()
+
+        data = [
+            ("Soft Murum 0-1.5 mm","Cum",TrenchExcavation.Soft_Murum_0_to_1_5_total),
+            ("Soft Murum 1.5-3.0 mm","Cum",TrenchExcavation.Soft_Murum_1_5_to_3_0_total),
+            ("Soft Murum 3.0-4.5 mm","Cum",TrenchExcavation.Soft_Murum_3_0_to_4_5_total),
+
+            ("Hard Murum 0-1.5 mm","Cum",TrenchExcavation.Hard_Murum_0_to_1_5_total),
+            ("Hard Murum Above 1.5 mm","Cum",TrenchExcavation.Hard_Murum_1_5_and_above_total),
+
+            ("Soft Rock 0-1.5 mm","Cum",TrenchExcavation.Soft_Rock_0_to_1_5_total),
+            ("Soft Rock Above 1.5 mm","Cum",TrenchExcavation.Soft_Rock_1_5_and_above_total),
+
+            ("Hard Rock 0-1.5 mm","Cum",TrenchExcavation.Hard_Rock_0_to_1_5_total),
+            ("Hard Rock 1.5-3.0 mm","Cum",TrenchExcavation.Hard_Rock_1_5_to_3_0_total),
+            ("Hard Rock 3.0-4.5 mm","Cum",TrenchExcavation.Hard_Rock_3_0_to_4_5_total),
+            ("Hard Rock 4.5-6.0 mm","Cum",TrenchExcavation.Hard_Rock_4_5_to_6_0_total),
+            ("Hard Rock 6.0-7.5 mm","Cum",TrenchExcavation.Hard_Rock_6_0_to_7_5_total),
+        ]
+
+        return self.make_summary(data, TrenchExcavation, f)
+
+    # ============================================================
+    # MANHOLE
+    # ============================================================
+    def manhole_summary(self):
+
+        f = self.filters()
+
+        data = [
+
+            ("Soft Murum 0-1.5 mm","Cum",ManholeExcavation.Soft_Murum_0_to_1_5_total),
+            ("Soft Murum 1.5-3.0 mm","Cum",ManholeExcavation.Soft_Murum_1_5_to_3_0_total),
+            ("Soft Murum 3.0-4.5 mm","Cum",ManholeExcavation.Soft_Murum_3_0_to_4_5_total),
+
+            ("Hard Murum 0-1.5 mm","Cum",ManholeExcavation.Hard_Murum_0_to_1_5_total),
+            ("Hard Murum Above 1.5 mm","Cum",ManholeExcavation.Hard_Murum_1_5_and_above_total),
+
+            ("Soft Rock 0-1.5 mm","Cum",ManholeExcavation.Soft_Rock_0_to_1_5_total),
+            ("Soft Rock Above 1.5 mm","Cum",ManholeExcavation.Soft_Rock_1_5_and_above_total),
+
+            ("Hard Rock 0-1.5 mm","Cum",ManholeExcavation.Hard_Rock_0_to_1_5_total),
+            ("Hard Rock 1.5-3.0 mm","Cum",ManholeExcavation.Hard_Rock_1_5_to_3_0_total),
+            ("Hard Rock 3.0-4.5 mm","Cum",ManholeExcavation.Hard_Rock_3_0_to_4_5_total),
+            ("Hard Rock 4.5-6.0 mm","Cum",ManholeExcavation.Hard_Rock_4_5_to_6_0_total),
+            ("Hard Rock 6.0-7.5 mm","Cum",ManholeExcavation.Hard_Rock_6_0_to_7_5_total),
+
+        ]
+
+        return self.make_summary(data, ManholeExcavation, f)
+
+    # ============================================================
+    # DOMESTIC CHAMBER
+    # ============================================================
+    def domestic_summary(self):
+        f = self.filters()
+        data = [
+            ("0-0.75 mm","Nos",ManholeDomesticChamber.d_0_to_0_75),
+            ("0.76-1.05 mm","Nos",ManholeDomesticChamber.d_0_76_to_1_05),
+            ("1.06-1.65 mm","Nos",ManholeDomesticChamber.d_1_06_to_1_65),
+            ("1.66-2.15 mm","Nos",ManholeDomesticChamber.d_1_66_to_2_15),
+            ("2.16-2.65 mm","Nos",ManholeDomesticChamber.d_2_16_to_2_65),
+            ("2.66-3.15 mm","Nos",ManholeDomesticChamber.d_2_66_to_3_15),
+            ("3.16-3.65 mm","Nos",ManholeDomesticChamber.d_3_16_to_3_65),
+            ("3.66-4.15 mm","Nos",ManholeDomesticChamber.d_3_66_to_4_15),
+            ("4.16-4.65 mm","Nos",ManholeDomesticChamber.d_4_16_to_4_65),
+            ("4.66-5.15 mm","Nos",ManholeDomesticChamber.d_4_66_to_5_15),
+            ("5.16-5.65 mm","Nos",ManholeDomesticChamber.d_5_16_to_5_65),
+            ("5.66-6.15 mm","Nos",ManholeDomesticChamber.d_5_66_to_6_15),
+            ("6.16-6.65 mm","Nos",ManholeDomesticChamber.d_6_16_to_6_65),
+            ("6.66-7.15 mm","Nos",ManholeDomesticChamber.d_6_66_to_7_15),
+            ("7.16-7.65 mm","Nos",ManholeDomesticChamber.d_7_16_to_7_65),
+            ("7.66-8.15 mm","Nos",ManholeDomesticChamber.d_7_66_to_8_15),
+            ("8.16-8.65 mm","Nos",ManholeDomesticChamber.d_8_16_to_8_65),
+            ("8.66-9.15 mm","Nos",ManholeDomesticChamber.d_8_66_to_9_15),
+            ("9.16-9.65 mm","Nos",ManholeDomesticChamber.d_9_16_to_9_65),
+        ]
+
+        return self.make_summary(data, ManholeDomesticChamber, f)
+
+    # ============================================================
+    # PIPE LAYING
+    # ============================================================
+    def laying_summary(self):
+        f = self.filters()
+        data = [
+            ("150 mm Dia","RM",Laying.pipe_150_mm),
+            ("200 mm Dia","RM",Laying.pipe_200_mm),
+            ("250 mm Dia","RM",Laying.pipe_250_mm),
+            ("300 mm Dia","RM",Laying.pipe_300_mm),
+            ("350 mm Dia","RM",Laying.pipe_350_mm),
+            ("400 mm Dia","RM",Laying.pipe_400_mm),
+            ("450 mm Dia","RM",Laying.pipe_450_mm),
+            ("500 mm Dia","RM",Laying.pipe_500_mm),
+            ("600 mm Dia","RM",Laying.pipe_600_mm),
+            ("700 mm Dia","RM",Laying.pipe_700_mm),
+            ("900 mm Dia","RM",Laying.pipe_900_mm),
+            ("1200 mm Dia","RM",Laying.pipe_1200_mm),
+        ]
+        return self.make_summary(data, Laying, f)
+
+    # ============================================================
+    # COMMON SUMMARY
+    # ============================================================
+    def make_summary(self, items, model, filters):
+        summary = []
+        for desc, uom, column in items:
+            qty = (db.session.query(func.sum(column)).filter_by(**filters).scalar())
+            summary.append({
+                "Description": desc,
+                "UOM": uom,
+                "Qty": float(qty or 0)
+                })
+        return summary
+    
+    
+    def generate_html(self):
+
+        html = """
+        <div class="table-responsive">
+        <table class="table table-bordered table-hover table-striped">
+            <thead class="table-success">
+
+                <tr>
+                    <th colspan="4" class="text-center fs-4">
+                        ABSTRACT OF QUANTITY
+                    </th>
+                </tr>
+
+                <tr>
+                    <th>Contractor</th>
+                    <td>{}</td>
+
+                    <th>RA Bill NO</th>
+                    <td>{}</td>
+                </tr>
+
+                <tr>
+                    <th width="8%">Sr</th>
+                    <th>Description</th>
+                    <th width="10%">UOM</th>
+                    <th width="15%">Qty</th>
+                </tr>
+
+            </thead>
+            <tbody>
+        """.format(
+            self.contractor_name(),
+            self.ra_bill_no or ""
+        )
+
+        sr = 1
+        sections = [
+            ("TRENCH EXCAVATION", self.trench_summary()),
+            ("MANHOLE EXCAVATION", self.manhole_summary()),
+            ("DOMESTIC CHAMBER", self.domestic_summary()),
+            ("PIPE LAYING", self.laying_summary())
+        ]
+
+        for title, rows in sections:
+            html += f"""
+            <tr class="table-secondary fw-bold">
+                <td colspan="4">{title}</td>
+            </tr>
+            """
+
+            for item in rows:
+                html += f"""
+                <tr>
+                    <td>{sr}</td>
+                    <td>{item['Description']}</td>
+                    <td>{item['UOM']}</td>
+                    <td class="text-end">
+                        {item['Qty']:.2f}
+                    </td>
+                </tr>
+                """
+                sr += 1
+
+        html += """
+            </tbody>
+            </table>
+            </div>
+            """
+
+        return html

app/services/activity_service.py

@@ -0,0 +1,56 @@
+import re
+from pathlib import Path
+
+# Activity log Service
+class ActivityService:
+
+    @staticmethod
+    def read_logs(file_name="", search="", level="", user="", from_date="", to_date=""):
+
+        file = Path("logs") / file_name
+
+        if not file.exists():
+            return []
+
+        logs = []
+
+        with open(file, "r", encoding="utf-8") as f:
+
+            for line in reversed(f.readlines()):
+                # Example:
+                # 2026-08-01 10:15:55 | INFO | admin | Dashboard | Dashboard Opened
+                parts = [x.strip() for x in line.split("|")]
+
+                if len(parts) < 5:
+                    continue
+
+                record = {
+                    "date": parts[0],
+                    "level": parts[1],
+                    "user": parts[2],
+                    "module": parts[3],
+                    "message": "|".join(parts[4:])
+                }
+
+                # Search Filter
+                if search and search.lower() not in line.lower():
+                    continue
+
+                # Level Filter
+                if level and record["level"] != level:
+                    continue
+
+                # User Filter
+                if user and user.lower() not in record["user"].lower():
+                    continue
+
+                # Date Filter
+                if from_date and record["date"][:10] < from_date:
+                    continue
+
+                if to_date and record["date"][:10] > to_date:
+                    continue
+
+                logs.append(record)
+
+        return logs

app/services/comparison_service.py

@@ -0,0 +1,204 @@
+# from collections import defaultdict
+# import pandas as pd
+# from app.utils.regex_utils import RegularExpression
+
+
+# class ComparisonService:
+    
+#     TRENCH_MAPPING = [
+#         {
+#             "label": "Marshi 0 to 1.5",
+#             "client": "Client_Marshi_Muddy_Slushy_0_to_1_5_total",
+#             "sub": None
+#         },
+#         {
+#             "label": "Marshi 1.5 to 3.0",
+#             "client": "Client_Marshi_Muddy_Slushy_1_5_to_3_0_total",
+#             "sub": None
+#         },
+#         {
+#             "label": "Marshi 3.0 to 4.5",
+#             "client": "Client_Marshi_Muddy_Slushy_3_0_to_4_5_total",
+#             "sub": None
+#         },
+#         {
+#             "label": "Soft Murum 0 to 1.5",
+#             "client": "Client_Soft_Murum_0_to_1_5_total",
+#             "sub": "Sub_Soft_Murum_0_to_1_5_total"
+#         },
+#         {
+#             "label": "Soft Murum 1.5 to 3.0",
+#             "client": "Client_Soft_Murum_1_5_to_3_0_total",
+#             "sub": "Sub_Soft_Murum_1_5_to_3_0_total"
+#         },
+#         {
+#             "label": "Soft Murum 3.0 to 4.5",
+#             "client": "Client_Soft_Murum_3_0_to_4_5_total",
+#             "sub": "Sub_Soft_Murum_3_0_to_4_5_total"
+#         },
+#         {
+#             "label": "Hard Murum 0 to 1.5",
+#             "client": "Client_Hard_Murum_0_to_1_5_total",
+#             "sub": "Sub_Hard_Murum_0_to_1_5_total"
+#         },
+#         {
+#             "label": "Hard Murum 1.5+",
+#             "client": "Client_Hard_Murum_1_5_to_3_0_total",
+#             "sub": "Sub_Hard_Murum_1_5_and_above_total"
+#         },
+#         {
+#             "label": "Soft Rock 0 to 1.5",
+#             "client": "Client_Soft_Rock_0_to_1_5_total",
+#             "sub": "Sub_Soft_Rock_0_to_1_5_total"
+#         },
+#         {
+#             "label": "Soft Rock 1.5+",
+#             "client": "Client_Soft_Rock_1_5_to_3_0_total",
+#             "sub": "Sub_Soft_Rock_1_5_and_above_total"
+#         },
+#         {
+#             "label": "Hard Rock 0 to 1.5",
+#             "client": "Client_Hard_Rock_0_to_1_5_total",
+#             "sub": "Sub_Hard_Rock_0_to_1_5_total"
+#         },
+#         {
+#             "label": "Hard Rock 1.5 to 3.0",
+#             "client": "Client_Hard_Rock_1_5_to_3_0_total",
+#             "sub": "Sub_Hard_Rock_1_5_to_3_0_total"
+#         },
+#         {
+#             "label": "Hard Rock 3.0 to 4.5",
+#             "client": "Client_Hard_Rock_3_0_to_4_5_total",
+#             "sub": "Sub_Hard_Rock_3_0_to_4_5_total"
+#         },
+#         {
+#             "label": "Hard Rock 4.5 to 6.0",
+#             "client": "Client_Hard_Rock_4_5_to_6_0_total",
+#             "sub": "Sub_Hard_Rock_4_5_to_6_0_total"
+#         },
+#         {
+#             "label": "Hard Rock 6.0 to 7.5",
+#             "client": "Client_Hard_Rock_6_0_to_7_5_total",
+#             "sub": "Sub_Hard_Rock_6_0_to_7_5_total"
+#         }
+#     ]
+    
+    
+
+#     @staticmethod
+#     def normalize_key(value):
+#         if value is None:
+#             return ""
+#         return str(value).strip().upper()
+
+#     @classmethod
+#     def make_lookup(cls, rows, key_field):
+#         """
+#         Create lookup dictionary using:
+#         (Location, MH_NO)
+#         """
+
+#         lookup = defaultdict(list)
+
+#         for row in rows:
+
+#             location = cls.normalize_key(row.get("Location"))
+#             key = cls.normalize_key(row.get(key_field))
+
+#             if location and key:
+#                 lookup[(location, key)].append(row)
+
+#         return lookup
+
+#     @classmethod
+#     def build_comparison(cls, client_rows, subcontractor_rows, key_field="MH_NO"):
+
+#         subcontractor_lookup = cls.make_lookup(
+#             subcontractor_rows,
+#             key_field
+#         )
+
+#         used = defaultdict(int)
+
+#         output = []
+
+#         for client in client_rows:
+
+#             location = cls.normalize_key(client.get("Location"))
+#             key = cls.normalize_key(client.get(key_field))
+
+#             if not location or not key:
+#                 continue
+
+#             rows = subcontractor_lookup.get((location, key))
+
+#             if not rows:
+#                 continue
+
+#             index = used[(location, key)]
+
+#             if index >= len(rows):
+#                 continue
+
+#             subcontractor = rows[index]
+
+#             used[(location, key)] += 1
+
+#             client_total = sum(
+#                 float(v or 0)
+#                 for k, v in client.items()
+#                 if k.endswith("_total")
+#                 or RegularExpression.D_RANGE_PATTERN.match(k)
+#                 or RegularExpression.PIPE_MM_PATTERN.match(k)
+#             )
+
+#             subcontractor_total = sum(
+#                 float(v or 0)
+#                 for k, v in subcontractor.items()
+#                 if k.endswith("_total")
+#                 or RegularExpression.D_RANGE_PATTERN.match(k)
+#                 or RegularExpression.PIPE_MM_PATTERN.match(k)
+#             )
+
+#             row = {
+
+#                 "Location": location,
+
+#                 key_field: key,
+
+#                 "Client_Total": round(client_total, 2),
+
+#                 "Subcontractor_Total": round(subcontractor_total, 2),
+
+#                 "Difference": round(
+#                     client_total - subcontractor_total,
+#                     2
+#                 )
+#             }
+
+#             # Client Columns
+#             for column, value in client.items():
+
+#                 if column in [
+#                     "id",
+#                     "created_at"
+#                 ]:
+#                     continue
+
+#                 row[f"Client_{column}"] = value
+
+#             # Subcontractor Columns
+#             for column, value in subcontractor.items():
+
+#                 if column in [
+#                     "id",
+#                     "created_at",
+#                     "subcontractor_id"
+#                 ]:
+#                     continue
+
+#                 row[f"Sub_{column}"] = value
+
+#             output.append(row)
+
+#         return pd.DataFrame(output)

app/services/file_service.py

@@ -1,10 +1,8 @@
+from app import db
 import os
 import pandas as pd
 from werkzeug.utils import secure_filename
-from app.utils.file_utils import ensure_upload_folder
-
-from app.config import Config
-from app import db
+from app.utils.file_utils import ensure_upload_folder, get_uploads_folder, ALLOWED_EXTENSIONS
 
 # Subcontractor models import
 from app.models.trench_excavation_model import TrenchExcavation
@@ -24,8 +22,9 @@ class FileService:
 
     # ---------------- COMMON HELPERS ----------------
     def allowed_file(self, filename):
-        return ("." in filename and filename.rsplit(".", 1)[1].lower() in Config.ALLOWED_EXTENSIONS)
-
+        return ("." in filename and filename.rsplit(".", 1)[1].lower() in ALLOWED_EXTENSIONS)
+    
+    # data normalizations 
     def normalize(self, val):
         if val is None or pd.isna(val):
             return None
@@ -35,7 +34,8 @@ class FileService:
             return None
 
         return val.upper()
-
+    
+    # --------------- Sub-contractor service --------------
     # ---------------- SUBCONTRACTOR FILE UPLOAD ----------------
     def handle_file_upload(self, file, subcontractor_id, RA_Bill_No):
 
@@ -52,8 +52,9 @@ class FileService:
             return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
 
         ensure_upload_folder()
+        path = get_uploads_folder()
 
-        folder = os.path.join(Config.UPLOAD_FOLDER, f"sub_{subcontractor_id}")
+        folder = os.path.join(path, f"sub_{subcontractor_id}")
         os.makedirs(folder, exist_ok=True)
 
         filename = secure_filename(file.filename)
@@ -75,7 +76,7 @@ class FileService:
 
         except Exception as e:
             db.session.rollback()
-            return False, f"Import failed: {e}"
+            return False, f"Import failed: {e}" 
 
     # ---------------- Trench Excavation (Subcontractor) ----------------
     def process_trench_excavation(self, df, subcontractor_id, RA_Bill_No):
@@ -309,8 +310,7 @@ class FileService:
 
         db.session.commit()
 
-
-
+    # --------------- Client service --------------
     # ---------------- CLIENT FILE UPLOAD ----------------
     def handle_client_file_upload(self, file, RA_Bill_No):
 
@@ -324,8 +324,9 @@ class FileService:
             return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
 
         ensure_upload_folder()
+        path = get_uploads_folder()
 
-        folder = os.path.join(Config.UPLOAD_FOLDER, f"Client_Bill_{RA_Bill_No}")
+        folder = os.path.join(path, f"Client_Bill_{RA_Bill_No}")
         os.makedirs(folder, exist_ok=True)
 
         filename = secure_filename(file.filename)

app/services/ldap_service.py

@@ -0,0 +1,72 @@
+from flask import current_app
+from ldap3 import Server, Connection, ALL, SUBTREE
+from ldap3.core.exceptions import LDAPException
+
+
+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.
+    """
+
+    @staticmethod
+    def authenticate(username, password):
+        if not username or not password:
+            return None
+
+        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,
+            )
+        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"],
+                search_filter=search_filter,
+                search_scope=SUBTREE,
+                attributes=["cn", "mail", "uid"],
+            )
+        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
+
+        entry = admin_conn.entries[0]
+        user_dn = entry.entry_dn
+        name = str(entry.cn) if "cn" in entry and entry.cn.value else username
+        email = (
+            str(entry.mail)
+            if "mail" in entry and entry.mail.value
+            else f"{username}@{current_app.config['LDAP_DOMAIN']}"
+        )
+        admin_conn.unbind()
+
+        # --- 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 {"username": username, "name": name, "email": email}

app/services/logger_service.py

@@ -1,82 +1,149 @@
 import os
 import logging
 from logging.handlers import RotatingFileHandler
-from flask import request, session
+from flask import request, session, has_request_context
 
 
-class RequestFormatter(logging.Formatter):
-    """
-    Custom formatter to safely inject request data
-    """
+class RequestContextFilter(logging.Filter):
+    """Adds request information to every log record."""
 
-    def format(self, record):
-        record.user = getattr(record, "user", "Anonymous")
-        record.ip = getattr(record, "ip", "N/A")
-        record.method = getattr(record, "method", "N/A")
-        record.url = getattr(record, "url", "N/A")
-        return super().format(record)
+    def filter(self, record):
+
+        if has_request_context():
+            record.user = session.get("user_name", "Anonymous")
+            record.ip = request.remote_addr or "Unknown"
+            record.method = request.method
+            record.url = request.url
+        else:
+            record.user = "System"
+            record.ip = "-"
+            record.method = "-"
+            record.url = "-"
+
+        return True
 
 
 class LoggerService:
 
-    @staticmethod
-    def init_app(app):
+    LOG_DIR = "logs"
 
-        # Create logs folder if not exists
-        if not os.path.exists("logs"):
-            os.makedirs("logs")
+    APP_LOG = "app.log"
+    ERROR_LOG = "error.log"
+    DEBUG_LOG = "debug.log"
 
-        formatter = RequestFormatter(
-            "%(asctime)s | %(levelname)s | "
-            "User:%(user)s | IP:%(ip)s | "
-            "Method:%(method)s | URL:%(url)s | "
-            "%(message)s"
+    MAX_BYTES = 10 * 1024 * 1024      # 10 MB
+    BACKUP_COUNT = 10
+
+    @classmethod
+    def init_app(cls, app):
+
+        os.makedirs(cls.LOG_DIR, exist_ok=True)
+
+        formatter = logging.Formatter(
+            fmt=(
+                "%(asctime)s | "
+                "%(levelname)-8s | "
+                "User=%(user)s | "
+                "IP=%(ip)s | "
+                "%(method)s | "
+                "%(url)s | "
+                "%(message)s"
+            ),
+            datefmt="%Y-%m-%d %H:%M:%S"
         )
 
-        # 🔹 INFO LOG
-        info_handler = RotatingFileHandler(
-            "logs/app.log",
-            maxBytes=5 * 1024 * 1024,
-            backupCount=5
-        )
-        info_handler.setLevel(logging.INFO)
-        info_handler.setFormatter(formatter)
+        context_filter = RequestContextFilter()
 
-        # 🔹 ERROR LOG
+        # Remove default handlers
+        app.logger.handlers.clear()
+
+        # ==========================
+        # Application Log
+        # ==========================
+        app_handler = RotatingFileHandler(
+            os.path.join(cls.LOG_DIR, cls.APP_LOG),
+            maxBytes=cls.MAX_BYTES,
+            backupCount=cls.BACKUP_COUNT,
+            encoding="utf-8"
+        )
+
+        app_handler.setLevel(logging.INFO)
+        app_handler.setFormatter(formatter)
+        app_handler.addFilter(context_filter)
+
+        # ==========================
+        # Error Log
+        # ==========================
         error_handler = RotatingFileHandler(
-            "logs/error.log",
-            maxBytes=5 * 1024 * 1024,
-            backupCount=5
+            os.path.join(cls.LOG_DIR, cls.ERROR_LOG),
+            maxBytes=cls.MAX_BYTES,
+            backupCount=cls.BACKUP_COUNT,
+            encoding="utf-8"
         )
+
         error_handler.setLevel(logging.ERROR)
         error_handler.setFormatter(formatter)
+        error_handler.addFilter(context_filter)
 
-        # 🔹 CONSOLE LOG
+        # ==========================
+        # Debug Log
+        # ==========================
+        debug_handler = RotatingFileHandler(
+            os.path.join(cls.LOG_DIR, cls.DEBUG_LOG),
+            maxBytes=cls.MAX_BYTES,
+            backupCount=cls.BACKUP_COUNT,
+            encoding="utf-8"
+        )
+
+        debug_handler.setLevel(logging.DEBUG)
+        debug_handler.setFormatter(formatter)
+        debug_handler.addFilter(context_filter)
+
+        # ==========================
+        # Console Log
+        # ==========================
         console_handler = logging.StreamHandler()
-        console_handler.setLevel(logging.DEBUG)
-        console_handler.setFormatter(formatter)
 
+        console_handler.setLevel(logging.INFO)
+        console_handler.setFormatter(formatter)
+        console_handler.addFilter(context_filter)
+
+        # ==========================
+        # Logger Configuration
+        # ==========================
         app.logger.setLevel(logging.DEBUG)
-        app.logger.addHandler(info_handler)
+
+        app.logger.addHandler(app_handler)
         app.logger.addHandler(error_handler)
+        app.logger.addHandler(debug_handler)
         app.logger.addHandler(console_handler)
 
-        # Auto request logging
+        # ==========================
+        # Automatic Request Logging
+        # ==========================
         @app.before_request
-        def log_request():
+        def before_request():
+            app.logger.info("Request Started")
+
+        @app.after_request
+        def after_request(response):
             app.logger.info(
-                "Request Started",
-                extra=LoggerService.get_request_data()
+                f"Request Completed | Status={response.status_code}"
+            )
+            return response
+
+        # ==========================
+        # Exception Logging
+        # ==========================
+        @app.errorhandler(Exception)
+        def log_exception(error):
+
+            app.logger.exception(
+                f"Unhandled Exception: {str(error)}"
             )
 
-    @staticmethod
-    def get_request_data():
-        try:
-            return {
-                "user": session.get("user_email", "Anonymous"),
-                "ip": request.remote_addr,
-                "method": request.method,
-                "url": request.url
-            }
-        except:
-            return {}
+            raise error
+
+        app.logger.info("=" * 70)
+        app.logger.info("Application Started Successfully")
+        app.logger.info("=" * 70)

app/services/subcontractor_rate_service.py

@@ -0,0 +1,65 @@
+from app.services.db_service import db
+from app.models.subcontractor_rate_model import SubcontractorRate
+
+
+class SubcontractorRateService:
+
+    @staticmethod
+    def save_rate(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")
+        )
+
+        db.session.add(rate)
+        db.session.commit()
+        return rate
+    
+    
+    @staticmethod
+    def get_all_rates():
+
+        return (
+            SubcontractorRate.query
+            .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()

app/services/user_service.py

@@ -1,5 +1,7 @@
+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
 
 class UserService:
 
@@ -8,7 +10,7 @@ class UserService:
         if User.query.filter_by(email=email).first():
             return None
 
-        user = User(name=name, email=email)
+        user = User(name=name, email=email, auth_source="local")
         user.set_password(password)
 
         db.session.add(user)
@@ -16,12 +18,49 @@ class UserService:
         return user
 
     @staticmethod
-    def validate_login(email, password):
-        user = User.query.filter_by(email=email).first()
+    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()
         if user and user.check_password(password):
             return user
         return None
 
+    @staticmethod
+    def _validate_ldap_login(username, password):
+        ldap_info = LDAPService.authenticate(username, password)
+        if not ldap_info:
+            return None
+        return UserService._get_or_create_ldap_user(ldap_info)
+
+    @staticmethod
+    def _get_or_create_ldap_user(ldap_info):
+        """
+        LDAP is the source of truth for the password. We still keep a row in
+        our local `users` table (no password) so the rest of the app - which
+        expects a User with an id - keeps working unchanged.
+        """
+        user = User.query.filter_by(email=ldap_info["email"]).first()
+        if user is None:
+            user = User(
+                name=ldap_info["name"],
+                email=ldap_info["email"],
+                auth_source="ldap",
+            )
+            db.session.add(user)
+            db.session.commit()
+        elif user.name != ldap_info["name"]:
+            user.name = ldap_info["name"]
+            db.session.commit()
+        return user
+
     @staticmethod
     def get_all_users():
         return User.query.all()

app/templates/activity/activity_log.html

@@ -0,0 +1,208 @@
+{% extends "base.html" %}
+{% block content %}
+
+<div class="container-fluid py-4">
+
+    <!-- HEADER -->
+    <div class="card shadow-sm border-0 mb-4">
+        <div class="card-body">
+            <div class="d-flex flex-column flex-lg-row justify-content-between align-items-lg-center">
+                <div class="mb-3 mb-lg-0">
+                    <h3 class="fw-bold text-primary mb-1"> <i class="bi bi-clock-history me-2"></i> Activity Logs </h3>
+                    <small class="text-muted"> View application logs, search records and download log files. </small>
+                </div>
+
+                <div class="d-flex flex-wrap gap-2">
+                    <a id="downloadLogBtn" href="{{ url_for('activity.download_log') }}?file={{ file_name }}" class="btn btn-success">
+                        <i class="bi bi-download me-1"></i>
+                        Download Log
+                    </a>
+                    <a href="{{ url_for('activity.activity') }}" class="btn btn-outline-primary">
+                        <i class="bi bi-arrow-clockwise me-1"></i>
+                        Refresh
+                    </a>
+
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <!-- FILTERS -->
+    <div class="card shadow-sm mb-4">
+
+        <div class="card-header bg-primary text-white">
+            <h5 class="mb-0">
+                <i class="bi bi-funnel-fill me-2"></i> Filters
+            </h5>
+        </div>
+
+        <div class="card-body">
+
+            <form method="GET">
+                <div class="row g-3">
+                        <!-- Log File select  -->
+                        <div class="col-xl-2 col-lg-4 col-md-6">
+                            <label class="form-label fw-bold">Log File</label>
+                            <select class="form-select" name="file">
+                                <option value="app.log" {% if file_name=="app.log" %}selected{% endif %}> Application </option>
+
+                                <option value="debug.log" {% if file_name=="debug.log" %}selected{% endif %}> Debug </option>
+
+                                <option value="error.log" {% if file_name=="error.log" %}selected{% endif %}> Error </option>
+                            </select>
+                        </div>
+                        <!-- User search  -->
+                        <div class="col-xl-2 col-lg-4 col-md-6">
+                            <label class="form-label fw-bold">User</label>
+                            <input type="text" class="form-control" name="user" value="{{ user }}" placeholder="Username">
+                        </div>
+                        
+                        <!-- Level  -->
+                        <div class="col-xl-2 col-lg-4 col-md-6">
+                            <label class="form-label fw-bold">Level</label>
+                            <select class="form-select" name="level">
+                                <option value="">All</option>
+
+                                <option value="INFO"
+                                {% if level=="INFO" %}selected{% endif %}>
+                                INFO
+                                </option>
+
+                                <option value="WARNING"
+                                {% if level=="WARNING" %}selected{% endif %}>
+                                WARNING
+                                </option>
+
+                                <option value="ERROR"
+                                {% if level=="ERROR" %}selected{% endif %}>
+                                ERROR
+                                </option>
+                            </select>
+                        </div>
+
+                        <!-- From Date  -->
+                        <div class="col-xl-2 col-lg-4 col-md-6">
+                            <label class="form-label fw-bold">From Date</label>
+                            <input type="date" class="form-control" name="from_date" value="{{ from_date }}">
+                        </div>
+
+                        <!-- To Date  -->
+                        <div class="col-xl-2 col-lg-4 col-md-6">
+                            <label class="form-label fw-bold">To Date</label>
+                            <input type="date" class="form-control" name="to_date" value="{{ to_date }}">
+                        </div>
+
+                        <!-- Search button  -->
+                        <div class="col-xl-2 col-lg-12">
+                            <label class="form-label fw-bold">Search</label>
+                            <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="Search">
+                        </div>
+
+                    </div>
+
+                    <hr>
+
+                    <!-- Search and Reset button -->
+                    <div class="d-flex gap-2">
+
+                        <button class="btn btn-primary">
+                            <i class="bi bi-search"></i> Search
+                        </button>
+
+                        <button type="reset" class="btn btn-secondary">
+                            <i class="bi bi-arrow-clockwise"></i> Reset
+                        </button>
+
+                    </div>
+
+            </form>
+        </div>
+
+    </div>
+
+    <!-- LOG TABLE -->
+    <div class="card shadow-sm">
+        <!-- Log Entries -->
+        <div class="card-header bg-dark text-white">
+            <div class="d-flex justify-content-between align-items-center">
+                <h5 class="mb-0">
+                    <i class="bi bi-list-ul me-2"></i>
+                    Log Entries
+                </h5>
+
+                <span class="badge bg-light text-dark">
+                    {{ logs|length }} Records
+                </span>
+            </div>
+        </div>
+
+        <!-- Show table Entries -->
+        <div class="card-body p-0">
+            <div class="table-responsive" style="max-height:600px; overflow-y:auto; font-size:12px;">
+                <table class="table table-striped table-hover table-bordered align-middle mb-0 small">
+
+                    <thead class="table-dark sticky-top">
+                        <tr>
+                            <th>Sr No</th>
+                            <th>Date & Time</th>
+                            <th>User</th>
+                            <th>Level</th>
+                            <th>Module</th>
+                            <th>Activity</th>
+                        </tr>
+                    </thead>
+
+                    <tbody>
+
+                        {% for log in logs %}
+                        <tr>
+                            <td>{{ loop.index }}</td>
+                            <td>{{ log.date }}</td>
+                            <td>{{ log.user }}</td>
+                            <td>
+                                {% if log.level=="INFO" %}
+                                    <span class="badge bg-success">INFO</span>
+                                {% elif log.level=="WARNING" %}
+                                    <span class="badge bg-warning text-dark">WARNING</span>
+                                {% else %}
+                                    <span class="badge bg-danger">ERROR</span>
+                                {% endif %}
+                            </td>
+
+                            <td>{{ log.module }}</td>
+                            <td>{{ log.message }}</td>
+                        </tr>
+                        {% endfor %}
+
+                    </tbody>
+                </table>
+
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>
+document.addEventListener("DOMContentLoaded", function () {
+
+    const fileSelect = document.querySelector('select[name="file"]');
+    const downloadBtn = document.getElementById("downloadLogBtn");
+
+    function updateDownloadLink() {
+
+        downloadBtn.href =
+            "{{ url_for('activity.download_log') }}?file=" +
+            encodeURIComponent(fileSelect.value);
+
+    }
+
+    updateDownloadLink();
+
+    fileSelect.addEventListener("change", updateDownloadLink);
+
+});
+</script>
+
+{% endblock %}

app/templates/base.html

@@ -5,18 +5,23 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ title if title else "Comparison Software" }}</title>
+    <link rel="icon" type="image/png" href="{{ url_for('static', filename='images/lcepl.png') }}">
 
     <!-- Bootstrap CSS -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css">
 
     <!-- Bootstrap Icons -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css" >
+
+    <link rel="stylesheet" href="https://cdn.datatables.net/1.13.6/css/jquery.dataTables.min.css">
+    <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.4.1/css/buttons.dataTables.min.css">
+
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-multiselect@1.1.2/dist/css/bootstrap-multiselect.min.css">
 </head>
 
 <body class="bg-light">
 
     <!-- NAVBAR -->
-    <!-- <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm"> -->
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm fixed-top">
 
         <div class="container-fluid">
@@ -45,17 +50,17 @@
                     <!-- Subcontractor Model -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-people-fill me-1"></i> Subcontractor Model
+                            <i class="bi bi-people-fill me-1"></i> Subcontractor List
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
                                 <a class="dropdown-item" href="/subcontractor/add">
-                                    <i class="bi bi-plus-circle me-2"></i> Add Subcontractor
+                                    <i class="bi bi-plus-circle me-2"></i> New Add
                                 </a>
                             </li>
                             <li>
                                 <a class="dropdown-item" href="/subcontractor/list">
-                                    <i class="bi bi-list-ul me-2"></i> Subcontractor List
+                                    <i class="bi bi-list-ul me-2"></i> List
                                 </a>
                             </li>
                         </ul>
@@ -64,9 +69,15 @@
                     <!-- Subcontractor File System -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-folder-fill me-1"></i>Subcontractor File System
+                            <i class="bi bi-folder-fill me-1"></i>Subcontractor RA Bills
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
+                            <li>
+                                <a class="dropdown-item" href="/dashboard/subcontractor_dashboard">
+                                    <i class="bi bi-speedometer2 me-2"></i> Subcontractor Dashboard
+                                </a>
+                            </li>
+
                             <li>
                                 <a class="dropdown-item" href="/file/import_Subcontractor">
                                     <i class="bi bi-upload me-2"></i> Import File
@@ -74,13 +85,7 @@
                             </li>
                             <li>
                                 <a class="dropdown-item" href="/file/Subcontractor_report">
-                                    <i class="bi bi-download me-2"></i> Show Reports
-                                </a>
-                            </li>
-
-                            <li>
-                                <a class="dropdown-item" href="/dashboard/subcontractor_dashboard">
-                                    <i class="bi bi-speedometer2 me-2"></i> Subcontractor Dashboard
+                                    <i class="bi bi-arrow-left-right me-2"></i> Show Reports
                                 </a>
                             </li>
 
@@ -90,7 +95,7 @@
                     <!-- Client System -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-building me-1"></i> Client File System
+                            <i class="bi bi-building me-1"></i> Client RA Bills
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
@@ -110,69 +115,118 @@
                     <!-- Reports -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-building me-1"></i> Reports
+                            <i class="bi bi-building me-1"></i> Comparison Report
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
 
                             <li>
                                 <a class="dropdown-item" href="/report/comparison_report">
-                                    <i class="bi bi-arrow-left-right me-2"></i> client vs sub-cont. Comparison Report
+                                    <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
+                            
+                        </ul>
+                    </li>
+
+                    <!-- Masters -->
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/engi">
+                            <i class="bi bi-gear me-2"></i> Masters
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-dark">
+                            <!-- Client Standard Rates -->
+                            <li class="nav-item">
+                                <a class="nav-link" href="/engi/subcontractor-rate">
+                                    <i class="bi bi-file-earmark-text me-1"></i> Rate Master
                                 </a>
-                            </li> -->
+                            </li>
+
+                            <!-- 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
+                                </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>
 
 
-                    <!-- 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>
+                    <!-- USER DROPDOWN -->   
+                    <li class="nav-item dropdown">
 
-                    <!-- USER DROPDOWN -->
-                    {% if session.get("user_id") %}
-                    <li class="nav-item dropdown ms-lg-3">
+                        <a class="nav-link dropdown-toggle d-flex align-items-center text-white"
+                            href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
 
-                        <a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#"
-                            data-bs-toggle="dropdown">
-                            <i class="bi bi-person-circle fs-5"></i>
-                            <span class="d-none d-lg-inline">
+                            <i class="bi bi-person-circle fs-4"></i>
+                            <span class="ms-2 fw-semibold">
                                 {{ session.get("user_name") }}
                             </span>
                         </a>
 
-                        <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark shadow">
+                        <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark border-0 shadow-lg bg-dark p-0"
+                            style="width:320px;">
 
-                            <!-- User card -->
-                            <li class="px-3 py-3 text-center border-bottom">
-                                <i class="bi bi-person-circle fs-1"></i>
-                                <div class="fw-semibold mt-1">
+                            <!-- Profile Header -->
+                            <li class="text-center py-4 border-bottom border-secondary">
+                                <i class="bi bi-person-circle text-light" style="font-size:60px;"></i>
+                                <h5 class="mt-2 mb-0 fw-bold">
                                     {{ session.get("user_name") }}
-                                </div>
-                                <small class="text-muted">Logged in user</small>
+                                </h5>
+                                <small class="text-secondary">
+                                    {{ session.get("email") }}
+                                </small>
                             </li>
 
+                            <!-- Dashboard -->
                             <li>
-                                <a class="dropdown-item" href="/dashboard">
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('dashboard.dashboard') }}">
                                     <i class="bi bi-speedometer2 me-2"></i> Dashboard
                                 </a>
                             </li>
 
+                            <!-- Activity Log page -->
                             <li>
-                                <a class="dropdown-item text-warning" href="/logout">
-                                    <i class="bi bi-box-arrow-right me-2"></i> Logout
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('activity.activity') }}">
+                                    <i class="bi bi-clock-history me-2"></i> Activity Log
                                 </a>
                             </li>
 
+                            <!--  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>
+
+                            <!--  Logout Account -->
+                            <li>
+                                <a class="dropdown-item text-warning py-2" href="{{ url_for('auth.logout') }}">
+                                    <i class="bi bi-box-arrow-right me-2"></i>
+                                    Logout
+                                </a>
+                            </li>
+
+                            <!-- Footer -->
+                            <li class="text-center py-3 bg-secondary bg-opacity-10 border-top border-secondary">
+                                <small class="text-light">
+                                    <i class="bi bi-shield-check text-success"></i>
+                                    Secured by <strong>LCEPL</strong>
+                                </small>
+                            </li>
+
                         </ul>
+
                     </li>
-                    {% endif %}
 
                 </ul>
             </div>
@@ -183,19 +237,63 @@
     <!-- PAGE CONTENT -->
     <div class="container-fluid vh-100 pt-5 overflow-hidden">
         <!-- FLASH MESSAGES -->
-        <div class="container mt-3">
+        <div class="position-fixed top-0 end-0 p-2 p-md-3 mt-5" style="z-index:1080; width:min(95vw,500px);">
+
             {% with messages = get_flashed_messages(with_categories=true) %}
             {% if messages %}
             {% for category, message in messages %}
-            <div class="alert alert-{{ category }} alert-dismissible fade show">
-                {{ message }}
-                <button class="btn-close" data-bs-dismiss="alert"></button>
+
+            <div class="alert alert-{{ category }} alert-dismissible fade show shadow notification-alert mb-2"
+                role="alert">
+
+                <div class="d-flex align-items-start flex-wrap">
+
+                    {% if category == 'success' %}
+                        <i class="bi bi-check-circle-fill me-2 fs-5 flex-shrink-0"></i>
+                    {% elif category == 'danger' %}
+                        <i class="bi bi-x-circle-fill me-2 fs-5 flex-shrink-0"></i>
+                    {% elif category == 'warning' %}
+                        <i class="bi bi-exclamation-triangle-fill me-2 fs-5 flex-shrink-0"></i>
+                    {% elif category == 'info' %}
+                        <i class="bi bi-info-circle-fill me-2 fs-5 flex-shrink-0"></i>
+                    {% endif %}
+
+                    <div class="flex-grow-1">
+
+                        <div class="fw-semibold">
+                            {% if category == 'success' %}
+                                Success
+                            {% elif category == 'danger' %}
+                                Error
+                            {% elif category == 'warning' %}
+                                Warning
+                            {% elif category == 'info' %}
+                                Information
+                            {% endif %}
+                        </div>
+
+                        <div>
+                            {{ message }}
+                        </div>
+
+                        <!-- Timeline -->
+                        <div class="progress mt-2" style="height:5px;">
+                            <div class="progress-bar progress-bar-striped progress-bar-animated timer-bar" role="progressbar" style="width:100%">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <button type="button" class="btn-close" data-bs-dismiss="alert">
+                </button>
+
             </div>
+
             {% endfor %}
             {% endif %}
             {% endwith %}
-        </div>
 
+        </div>
 
         <div class="overflow-auto h-100">
             <div class="container mt-4">
@@ -204,10 +302,99 @@
         </div>
     </div>
 
+    <!-- Global Loading Overlay -->
+    <div id="globalLoader"
+        class="position-fixed top-0 start-0 w-100 h-100 bg-dark bg-opacity-50 d-none"
+        style="z-index:9999;">
+
+        <div class="d-flex justify-content-center align-items-center h-100">
+            <div class="card shadow-lg border-0 rounded-4" style="width:430px;">
+                <div class="card-body text-center p-5">
+
+                    <div class="spinner-border text-primary" style="width:70px;height:70px;"role="status">
+                    </div>
+                    <h4 class="fw-bold mt-4 mb-2">Please Wait...</h4>
+                    <p id="loaderMessage" class="text-muted mb-4">Processing your request...</p>
+
+                    <div class="progress" style="height:8px;">
+                        <div class="progress-bar progress-bar-striped progress-bar-animated"
+                            style="width:100%">
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+
+    </div>
 
     <!-- Bootstrap JS -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
 
+    <script src="https://code.jquery.com/jquery-3.7.0.min.js"></script>
+    <script src="https://cdn.datatables.net/1.13.6/js/jquery.dataTables.min.js"></script>
+
+    <script src="https://cdn.datatables.net/buttons/2.4.1/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.html5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.4.1/js/buttons.print.min.js"></script>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap-multiselect@1.1.2/dist/js/bootstrap-multiselect.min.js"></script>
+
+    <script>
+        // show  alert msg
+        document.addEventListener("DOMContentLoaded", function () {
+            document.querySelectorAll(".notification-alert").forEach(function(alert){
+                const progressBar = alert.querySelector(".timer-bar");
+                let width = 100;
+                const interval = setInterval(function() {
+                    width -= 2;
+                    progressBar.style.width = width + "%";
+                    if(width <= 0){
+                        clearInterval(interval);
+                        const bsAlert = bootstrap.Alert.getOrCreateInstance(alert);
+                        bsAlert.close();
+                    }
+                }, 100);
+            });
+        });
+
+        // show  msg Processing your request
+        function showLoader(message = "Processing your request...") {
+            document.getElementById("loaderMessage").innerHTML = message;
+            document.getElementById("globalLoader").classList.remove("d-none");
+        }
+
+        // Automatically hide
+        function hideLoader(){
+            document.getElementById("globalLoader").classList.add("d-none");
+        }
+
+        // Automatically apply to all forms having class="loading-form"
+        document.addEventListener("DOMContentLoaded", function () {
+            document.querySelectorAll(".loading-form").forEach(function(form){
+                form.addEventListener("submit", function(){
+                    if(!this.checkValidity())
+                        return;
+
+                    showLoader();
+                    const btn = this.querySelector("button[type='submit']");
+
+                    if(btn){
+                        btn.disabled = true;
+                        btn.innerHTML = `
+                            <span class="spinner-border spinner-border-sm me-2"></span>
+                            Processing...
+                        `;
+                    }
+
+                });
+            });
+        });
+
+    </script>
+
+
 </body>
 
 </html>

app/templates/client_report.html

@@ -2,10 +2,10 @@
 
 {% block content %}
 <div class="container-fluid mt-4">
-    <h2 class="mb-4">Client File Reports</h2>
+    <h2 class="mb-4">Client RA Bills Reports</h2>
 
     <div class="card p-4 shadow-sm mb-5">
-        <form method="POST">
+        <form method="POST" class="loading-form">
             <label class="form-label fw-bold">RA Bill No</label>
             <input type="text" name="RA_Bill_No" class="form-control mb-3" value="{{ ra_val }}" required>
 
@@ -15,34 +15,32 @@
                         Data</button>
                 </div>
                 <div class="col-md-6">
-                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
-                        Report</button>
+                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel Report</button>
                 </div>
             </div>
         </form>
     </div>
 
     {% if tables.tr or tables.mh or tables.dc or tables.laying %}
-    <div class="card shadow-sm p-3">
-        <h4 class="mb-3">Comparison Preview</h4>
+    <div class="card shadow-sm p-4">
+        <h4 class="mb-3">Table Preview</h4>
 
         <ul class="nav nav-tabs" id="reportTabs" role="tablist">
             <li class="nav-item">
                 <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
-                    type="button">Tr.Ex Comparison</button>
+                    type="button">Tr.Ex </button>
             </li>
             <li class="nav-item">
-                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
-                    Comparison</button>
+                <button 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
-                    Comparison</button>
+                <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">
-                <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>
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">

app/templates/edit_record.html

@@ -0,0 +1,84 @@
+{% extends "base.html" %}
+{% block content %}
+
+<div class="container-fluid py-4">
+
+    <!-- Page Header -->
+    <div class="card shadow-sm border-0 mb-4">
+        <div class="card-body d-flex justify-content-between align-items-center">
+            <div>
+                <h2 class="fw-bold text-primary mb-1">
+                    <i class="bi bi-pencil-square"></i>
+                    Edit Record
+                </h2>
+                <small class="text-muted">
+                    Model: <strong>{{ model|upper }}</strong> &nbsp;|&nbsp; Record ID: {{ record.id }}
+                </small>
+            </div>
+            <a href="{{ url_for('file_report.report_file') }}" class="btn btn-secondary">
+                <i class="bi bi-arrow-left"></i> Back to Report
+            </a>
+        </div>
+    </div>
+
+    <!-- Edit Form -->
+    <div class="card shadow-sm border-0">
+        <div class="card-header bg-primary text-white">
+            <h5 class="mb-0">
+                <i class="bi bi-card-checklist"></i>
+                Update Record Details
+            </h5>
+        </div>
+
+        <div class="card-body">
+            <form method="POST">
+                <div class="row g-3">
+
+                    {% for column in record.__table__.columns %}
+                        {% if column.name != "id" %}
+                        <div class="col-lg-4">
+                            <label class="form-label fw-semibold">
+                                {{ column.name.replace('_', ' ')|title }}
+                            </label>
+
+                            {% set value = record|attr(column.name) %}
+
+                            {% if column.type.python_type.__name__ == 'bool' %}
+                                <select name="{{ column.name }}" class="form-select">
+                                    <option value="true" {% if value %}selected{% endif %}>Yes</option>
+                                    <option value="false" {% if not value %}selected{% endif %}>No</option>
+                                </select>
+
+                            {% elif column.type.python_type.__name__ in ['int', 'float', 'Decimal'] %}
+                                <input type="number" step="any" name="{{ column.name }}"
+                                    class="form-control" value="{{ value if value is not none else '' }}">
+
+                            {% elif column.type.python_type.__name__ == 'date' %}
+                                <input type="date" name="{{ column.name }}"
+                                    class="form-control" value="{{ value if value is not none else '' }}">
+
+                            {% else %}
+                                <input type="text" name="{{ column.name }}"
+                                    class="form-control" value="{{ value if value is not none else '' }}">
+                            {% endif %}
+                        </div>
+                        {% endif %}
+                    {% endfor %}
+
+                </div>
+
+                <div class="mt-4 d-flex justify-content-end gap-2">
+                    <button type="submit" class="btn btn-primary">
+                        <i class="bi bi-check-circle"></i> Save Changes
+                    </button>
+                    <a href="{{ url_for('file_report.report_file') }}" class="btn btn-secondary">
+                        <i class="bi bi-x-circle"></i> Cancel
+                    </a>
+                </div>
+            </form>
+        </div>
+    </div>
+
+</div>
+
+{% endblock %}

app/templates/engineering/add_rate.html

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

app/templates/engineering/index.html

@@ -0,0 +1,83 @@
+{% extends "base.html" %}
+{% block content %}
+
+<div class="container-fluid mt-4">
+
+    <div class="row mb-4">
+        <div class="col-12">
+            <h3 class="fw-bold">
+                <i class="bi bi-gear-fill text-primary"></i>
+                Engineering Masters
+            </h3>
+            <hr>
+        </div>
+    </div>
+
+    <div class="row g-4">
+
+        <!-- Subcontractor Rate Master -->
+        <div class="col-lg-4 col-md-6">
+            <div class="card shadow h-100">
+
+                <div class="card-body text-center">
+
+                    <i class="bi bi-cash-stack text-success"
+                       style="font-size:55px;"></i>
+
+                    <h5 class="mt-3">
+                        Subcontractor Rate Master
+                    </h5>
+
+                    <p class="text-muted">
+                        Manage subcontractor-wise rates.
+                    </p>
+
+                    <a href="{{ url_for('engineering.add_subcontractor_rates') }}"
+                       class="btn btn-success">
+
+                        <i class="bi bi-arrow-right-circle"></i>
+                        Open Module
+
+                    </a>
+
+                </div>
+
+            </div>
+        </div>
+
+        <!-- Client Rate Master -->
+        <div class="col-lg-4 col-md-6">
+            <div class="card shadow h-100">
+
+                <div class="card-body text-center">
+
+                    <i class="bi bi-building text-primary"
+                       style="font-size:55px;"></i>
+
+                    <h5 class="mt-3">
+                        Client Standard Rate Master
+                    </h5>
+
+                    <p class="text-muted">
+                        Manage client standard rates.
+                    </p>
+
+                    <a href="{{ url_for('engineering.client_rates') }}"
+                       class="btn btn-primary">
+
+                        <i class="bi bi-arrow-right-circle"></i>
+                        Open Module
+
+                    </a>
+
+                </div>
+
+            </div>
+        </div>
+
+        
+    </div>
+
+</div>
+
+{% endblock %}

app/templates/file_import_client.html

@@ -1,41 +1,145 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h2 class="mb-4">Client File Import</h2>
 
-<div class="card p-4 shadow-sm">
+<div class="container-fluid py-4">
 
-    <form method="POST" enctype="multipart/form-data">
+    <!-- Page Header -->
+    <div class="row mb-4">
 
-        <!-- 1. SELECT SUBCONTRACTOR -->
-        <!-- <label class="form-label">Select Subcontractor vs Client</label>
-        <select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
-            <option value="">-- Select Subcontractor --</option>
+        <div class="col-12">
 
-            {% for sc in subcontractors %}
-            <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
-            {% endfor %}
-        </select> -->
+            <div class="card border-0 shadow-sm bg-success text-white">
 
-        <!-- 2. FILE TYPE (MODEL NAME) -->
-        <!-- <label class="form-label">Select File Type</label>
-        <select name="file_type" id="file_type" class="form-select mb-3" required>
-            <option value="">-- Select File Type --</option>
-            <option value="">Sheet</option>
-            <option value="tr_ex_client">Tr. Ex</option>
-            <option value="mh_ex_client">Mh. Ex </option>
-            <option value="mh_dc_client">MH & DC </option>
-            <option value="">Laying Sheet</option>
-        </select> -->
+                <div class="card-body d-flex justify-content-between align-items-center">
 
-        <label class="form-label">RA Bill No</label>
-        <input type="text" name="RA_Bill_No" class="form-control mb-3" required>
-        <!-- 3. FILE UPLOAD -->
-        <label class="form-label">Choose File</label>
-        <input type="file" name="file" class="form-control mb-3" required>
+                    <div>
 
-        <button class="btn btn-primary w-100">Upload</button>
-    </form>
+                        <h3 class="fw-bold mb-1">
+                            <i class="bi bi-building-fill-up me-2"></i>
+                            Client RA Bill Import
+                        </h3>
+
+                        <p class="mb-0 opacity-75">
+                            Upload the Client RA Bill Excel file for comparison.
+                        </p>
+
+                    </div>
+
+                    <div class="display-5">
+                        <i class="bi bi-file-earmark-excel-fill"></i>
+                    </div>
+
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+
+    <!-- Upload Card -->
+    <div class="row justify-content-center">
+
+        <div class="col-lg-7">
+
+            <div class="card border-0 shadow">
+
+                <div class="card-header bg-light">
+
+                    <h5 class="mb-0 fw-bold text-success">
+                        <i class="bi bi-upload me-2"></i>
+                        Upload Details
+                    </h5>
+
+                </div>
+
+                <div class="card-body p-4">
+
+                    <form method="POST"
+                          enctype="multipart/form-data"
+                          class="loading-form"
+                          onsubmit="showLoader('Reading Excel file...<br>Validating records...<br>Saving data to database...')">
+
+                        <!-- RA Bill -->
+                        <div class="mb-4">
+
+                            <label class="form-label fw-semibold">
+
+                                <i class="bi bi-receipt-cutoff text-success me-2"></i>
+
+                                RA Bill No
+
+                                <span class="text-danger">*</span>
+
+                            </label>
+
+                            <input
+                                type="text"
+                                name="RA_Bill_No"
+                                class="form-control"
+                                placeholder="Enter RA Bill Number"
+                                required>
+
+                        </div>
+
+                        <!-- Upload -->
+                        <div class="mb-4">
+
+                            <label class="form-label fw-semibold">
+
+                                <i class="bi bi-file-earmark-arrow-up text-primary me-2"></i>
+
+                                Select Excel File
+
+                                <span class="text-danger">*</span>
+
+                            </label>
+
+                            <input
+                                type="file"
+                                name="file"
+                                class="form-control"
+                                accept=".xlsx,.xls,.csv"
+                                required>
+
+                            <div class="form-text">
+
+                                Supported Formats:
+                                <strong>.xlsx</strong>,
+                                <strong>.xls</strong>,
+                                <strong>.csv</strong>
+
+                            </div>
+
+                        </div>
+
+                        <hr>
+
+                        <!-- Action Buttons -->
+                        <div class="d-flex justify-content-between">
+
+                            <button
+                                type="submit"
+                                class="btn btn-success px-5">
+
+                                <i class="bi bi-cloud-upload-fill me-2"></i>
+                                Upload File
+
+                            </button>
+
+                        </div>
+
+                    </form>
+
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
 
 </div>
+
 {% endblock %}

app/templates/file_import_subcontractor.html

@@ -1,32 +1,125 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h2 class="mb-4">Sub-Contractor File Import</h2>
 
-<div class="card p-4 shadow-sm">
+<div class="container-fluid py-4">
 
-    <form method="POST" enctype="multipart/form-data">
+    <!-- Page Header -->
+    <div class="row mb-4">
+        <div class="col-lg-12">
+            <div class="card border-0 shadow-sm bg-primary text-white">
+                <div class="card-body d-flex justify-content-between align-items-center">
 
-        <!-- 1. SELECT SUBCONTRACTOR -->
-        <label class="form-label">Select Subcontractor</label>
-        <select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
-            <option value="">-- Select Subcontractor --</option>
+                    <div>
+                        <h3 class="mb-1 fw-bold">
+                            <i class="bi bi-cloud-arrow-up-fill me-2"></i>
+                            Sub-Contractor File Import
+                        </h3>
 
-            {% for sc in subcontractors %}
-            <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
-            {% endfor %}
-        </select>
+                        <p class="mb-0 opacity-75">
+                            Upload RA Bill Excel file for the selected subcontractor.
+                        </p>
+                    </div>
 
-        <!-- 2. RA bill no -->
-        <label class="form-label">RA Bill No</label>
-        <input type="text" name="RA_Bill_No" class="form-control mb-3" required>
+                    <div class="display-5">
+                        <i class="bi bi-file-earmark-excel-fill"></i>
+                    </div>
 
-        <!-- 3. FILE UPLOAD -->
-        <label class="form-label">Choose File</label>
-        <input type="file" name="file" class="form-control mb-3" required>
+                </div>
+            </div>
+        </div>
+    </div>
 
-        <button class="btn btn-primary w-100">Upload</button>
-    </form>
+    <!-- Upload Card -->
+    <div class="row justify-content-center">
 
+        <div class="col-lg-8">
+
+            <div class="card border-0 shadow">
+
+                <div class="card-header bg-light">
+                    <h5 class="mb-0 fw-bold text-primary">
+                        <i class="bi bi-upload me-2"></i>
+                        Upload Details
+                    </h5>
+                </div>
+
+                <div class="card-body p-4">
+                    <form method="POST"
+                            enctype="multipart/form-data"
+                            class="loading-form"
+                            onsubmit="showLoader('Reading Excel file...<br>Saving data to database...')">
+
+                        <!-- Select Subcontractor -->
+                        <div class="mb-4">
+
+                            <label class="form-label fw-semibold">
+                                <i class="bi bi-building me-1 text-primary"></i>
+                                Select Subcontractor
+                                <span class="text-danger">*</span>
+                            </label>
+
+                            <select name="subcontractor_id" id="subcontractor_id"
+                                class="form-select" required>
+
+                                <option value=""> -- Select Subcontractor -- </option>
+                                {% for sc in subcontractors %}
+                                <option value="{{ sc.id }}">{{ sc.subcontractor_name }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+
+                        <!-- RA Bill No -->
+                        <div class="mb-4">
+                            <label class="form-label fw-semibold">
+                                <i class="bi bi-receipt me-1 text-success"></i>
+                                RA Bill No
+                                <span class="text-danger">*</span>
+                            </label>
+
+                            <input type="text"
+                                name="RA_Bill_No"
+                                class="form-control"
+                                placeholder="Enter RA Bill Number"
+                                required>
+                        </div>
+
+                        <!-- File Upload -->
+                        <div class="mb-4">
+                            <label class="form-label fw-semibold">
+                                <i class="bi bi-file-earmark-arrow-up me-1 text-warning"></i>
+                                Upload Excel File
+                                <span class="text-danger">*</span>
+                            </label>
+
+                            <input type="file"
+                                name="file"
+                                class="form-control"
+                                accept=".xlsx,.xls,.csv"
+                                required>
+
+                            <div class="form-text">
+                                Supported formats:
+                                <strong>.xlsx</strong>,
+                                <strong>.xls</strong>,
+                                <strong>.csv</strong>
+                            </div>
+                        </div>
+                        <hr>
+
+                        <!-- Buttons -->
+                        <div class="d-flex justify-content-between">
+                            <button type="submit" class="btn btn-primary px-5">
+                                <i class="bi bi-cloud-upload-fill me-2"></i>
+                                Upload File
+                            </button>
+                        </div>
+                    </form>
+
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
+
 {% endblock %}

app/templates/generate_comparison_report.html

@@ -5,22 +5,9 @@
 
     <h2 class="mb-4">Subcontractor vs Client Comparison</h2>
 
-    <!-- FLASH MESSAGES -->
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
-    {% endfor %}
-    {% endif %}
-    {% endwith %}
-
     <div class="card p-4 shadow-sm">
 
         <form method="POST">
-
             <!-- SELECT SUBCONTRACTOR -->
             <label class="form-label fw-semibold">Select Subcontractor</label>
             <select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>

app/templates/login.html

@@ -8,75 +8,200 @@
 
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.css" rel="stylesheet">
+
+
 </head>
 
 <body class="bg-light">
 
-    <div class="container-fluid vh-100">
-        <div class="row h-100 justify-content-center align-items-center">
+    <!-- Flash Messages -->
+    <div class="position-fixed top-0 end-0 p-3"
+        style="z-index:1080; width:min(95vw,420px);">
 
-            <!-- Increased column width -->
-            <div class="col-12 col-sm-10 col-md-8 col-lg-5 col-xl-4">
+        {% with messages = get_flashed_messages(with_categories=true) %}
+        {% if messages %}
+        {% for category, message in messages %}
 
+        <div class="alert alert-{{ category }} alert-dismissible fade show shadow notification-alert">
+
+            <strong>
+                {% if category=="success" %}
+                    <i class="bi bi-check-circle-fill me-2"></i>Success
+                {% elif category=="danger" %}
+                    <i class="bi bi-x-circle-fill me-2"></i>Error
+                {% elif category=="warning" %}
+                    <i class="bi bi-exclamation-triangle-fill me-2"></i>Warning
+                {% else %}
+                    <i class="bi bi-info-circle-fill me-2"></i>Information
+                {% endif %}
+            </strong>
+
+            <div>{{ message }}</div>
+
+            <div class="progress mt-2" style="height:4px;">
+                <div class="progress-bar progress-bar-striped progress-bar-animated timer-bar"
+                    style="width:100%"></div>
+            </div>
+
+            <button class="btn-close"
+                    data-bs-dismiss="alert">
+            </button>
+
+        </div>
+
+        {% endfor %}
+        {% endif %}
+        {% endwith %}
+
+    </div>
+
+
+
+    <div class="container">
+
+        <div class="row justify-content-center align-items-center min-vh-100">
+            <div class="col-12 col-sm-10 col-md-8 col-lg-6 col-xl-5">
                 <div class="card shadow-lg border-0">
-                    <!-- Increased padding -->
                     <div class="card-body p-5">
-
-                        <!-- Branding -->
                         <div class="text-center mb-4">
-                            <img src="{{ url_for('static', filename='images/lcepl.png') }}" alt="LCEPL Logo"
-                                class="img-fluid mb-3" style="max-height:80px;">
+                            <img src="{{ url_for('static', filename='images/lcepl.png') }}"
+                                class="img-fluid mb-3"
+                                style="max-height:100px;">
 
-                            <h4 class="fw-bold mb-1">
-                                Laxmi Civil Engineering Services Pvt Ltd
-                            </h4>
-                            <p class="text-muted mb-0">
-                                Data Comparison Software Solapur(UGD)
-                            </p>
+                            <h3 class="fw-bold text-success">Laxmi Civil Engineering Services Pvt Ltd</h3>
+                            <p class="text-muted">Data Comparison Software (UGD)</p>
                         </div>
 
-                        <!-- Flash messages -->
-                        {% with messages = get_flashed_messages(with_categories=true) %}
-                        {% if messages %}
-                        {% for category, message in messages %}
-                        <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-                            {{ message }}
-                            <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                        </div>
-                        {% endfor %}
-                        {% endif %}
-                        {% endwith %}
-
-                        <!-- Login Form -->
                         <form method="POST">
 
-                            <div class="mb-4">
-                                <label class="form-label fw-semibold">User Name</label>
-                                <input type="email" name="email" class="form-control " placeholder="Enter email"
-                                    required>
-                            </div>
+                            <div class="mb-3">
+                                <label class="form-label fw-semibold">Username</label>
 
+                                <div class="input-group">
+                                    <span class="input-group-text">
+                                        <i class="bi bi-envelope-fill"></i>
+                                    </span>
+
+                                    <input
+                                        type="text"
+                                        name="email"
+                                        class="form-control"
+                                        placeholder="Enter Domain Username"
+                                        autocomplete="username"
+                                        required>
+
+                                </div>
+                            </div>
                             <div class="mb-4">
                                 <label class="form-label fw-semibold">Password</label>
-                                <input type="password" name="password" class="form-control" placeholder="Enter password"
-                                    required>
+
+                                <div class="input-group">
+                                    <span class="input-group-text">
+                                        <i class="bi bi-lock-fill"></i>
+                                    </span>
+
+                                    <input
+                                        type="password"
+                                        id="password"
+                                        name="password"
+                                        class="form-control"
+                                        placeholder="Enter Password"
+                                        required>
+
+                                    <button
+                                        type="button"
+                                        id="togglePassword"
+                                        class="input-group-text bg-white border-start-0"
+                                        style="cursor:pointer;">
+                                        <i class="bi bi-eye text-secondary"></i>
+                                    </button>
+
+                                </div>
                             </div>
 
-                            <button class="btn btn-success btn-lg w-100">
+                            <button
+                                class="btn btn-success w-100 btn-lg">
+                                <i class="bi bi-box-arrow-in-right me-2"></i>
                                 Login
                             </button>
+
+                            <div class="text-center mt-3">
+                                <a href="#">Forgot Password?</a>
+                            </div>
+
                         </form>
 
                     </div>
                 </div>
 
-            </div>
+                <div class="text-center mt-3">
+                    <small class="text-muted">
+                        © 2026 Laxmi Civil Engineering Services Pvt Ltd
+                    </small>
+                </div>
 
+            </div>
         </div>
     </div>
 
+
     <!-- Bootstrap JS -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+    <script>
+
+    document.addEventListener("DOMContentLoaded", function () {
+
+        // Password Show / Hide
+        const togglePassword = document.getElementById("togglePassword");
+        const password = document.getElementById("password");
+
+        if (togglePassword && password) {
+
+            togglePassword.addEventListener("click", function () {
+
+                const type =
+                    password.getAttribute("type") === "password"
+                    ? "text"
+                    : "password";
+
+                password.setAttribute("type", type);
+
+                this.innerHTML =
+                    type === "password"
+                    ? '<i class="bi bi-eye"></i>'
+                    : '<i class="bi bi-eye-slash"></i>';
+            });
+        }
+
+        // Auto Close Notification after 5 sec
+        document.querySelectorAll(".notification-alert").forEach(function (alert) {
+
+            const progressBar = alert.querySelector(".timer-bar");
+
+            let width = 100;
+
+            const interval = setInterval(function () {
+
+                width -= 2;
+                progressBar.style.width = width + "%";
+
+                if (width <= 0) {
+
+                    clearInterval(interval);
+
+                    bootstrap.Alert
+                        .getOrCreateInstance(alert)
+                        .close();
+                }
+
+            }, 100);
+
+        });
+
+    });
+
+    </script>
 </body>
 
 </html>

app/templates/subcontractor/add.html

@@ -1,50 +1,170 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="card shadow-sm p-4">
-    <h4 class="mb-3">Add New Subcontractor</h4>
+<div class="container-fluid">
 
-    <form action="{{ url_for('subcontractor.save_subcontractor') }}" method="POST">
-
-        <div class="mb-3">
-            <label class="form-label">Subcontractor Name:</label>
-            <input type="text" class="form-control" name="subcontractor_name" required>
+    <!-- Page Header -->
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <div>
+            <h3 class="fw-bold mb-1">
+                <i class="bi bi-person-plus-fill text-success me-2"></i>
+                Add New Subcontractor
+            </h3>
+            <p class="text-muted mb-0">
+                Enter the subcontractor details below.
+            </p>
         </div>
 
-        <div class="mb-3">
-            <label class="form-label">Contact Person Name:</label>
-            <input type="text" class="form-control" name="contact_person">
+        <a href="{{ url_for('subcontractor.subcontractor_list') }}"
+           class="btn btn-outline-secondary">
+            <i class="bi bi-arrow-left me-2"></i>
+            Back to List
+        </a>
+    </div>
+
+    <div class="card shadow border-0">
+
+        <div class="card-header bg-success text-white">
+            <h5 class="mb-0">
+                <i class="bi bi-building-fill-add me-2"></i>
+                Subcontractor Information
+            </h5>
         </div>
 
-        <div class="mb-3">
-            <label class="form-label">Address:</label>
-            <textarea type="text" class="form-control" name="address"></textarea>
+        <div class="card-body">
+
+            <form action="{{ url_for('subcontractor.save_subcontractor') }}"
+                  method="POST"
+                  class="loading-form">
+
+                <div class="row g-4">
+
+                    <!-- Subcontractor Name -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-building me-1"></i>
+                            Subcontractor Name
+                            <span class="text-danger">*</span>
+                        </label>
+
+                        <input type="text"
+                               class="form-control"
+                               name="subcontractor_name"
+                               placeholder="Enter Subcontractor Name"
+                               required>
+                    </div>
+
+                    <!-- Contact Person -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-person-fill me-1"></i>
+                            Contact Person
+                        </label>
+
+                        <input type="text"
+                               class="form-control"
+                               name="contact_person"
+                               placeholder="Enter Contact Person">
+                    </div>
+
+                    <!-- Mobile -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-telephone-fill me-1"></i>
+                            Mobile Number
+                        </label>
+
+                        <input type="text"
+                               class="form-control"
+                               name="mobile_no"
+                               maxlength="10"
+                               placeholder="Enter Mobile Number">
+                    </div>
+
+                    <!-- Email -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-envelope-fill me-1"></i>
+                            Email Address
+                        </label>
+
+                        <input type="email"
+                               class="form-control"
+                               name="email_id"
+                               placeholder="Enter Email Address">
+                    </div>
+
+                    <!-- GST -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-receipt-cutoff me-1"></i>
+                            GST Number
+                        </label>
+
+                        <input type="text"
+                            class="form-control"
+                            name="gst_no"
+                            placeholder="Enter GST Number">
+                    </div>
+
+                    <!-- PAN -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-credit-card-2-front-fill me-1"></i>
+                            PAN Number
+                        </label>
+
+                        <input type="text"
+                            class="form-control"
+                            name="pan_no"
+                            placeholder="Enter PAN Number">
+                    </div>
+
+                    <!-- Address -->
+                    <div class="col-12">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-geo-alt-fill me-1"></i>
+                            Address
+                        </label>
+
+                        <textarea class="form-control"
+                                  rows="4"
+                                  name="address"
+                                  placeholder="Enter Complete Address"></textarea>
+                    </div>
+
+                </div>
+
+                <hr class="my-4">
+
+                <div class="d-flex justify-content-end gap-2">
+
+                    <button type="reset"
+                            class="btn btn-outline-warning">
+                        <i class="bi bi-arrow-clockwise me-2"></i>
+                        Reset
+                    </button>
+
+                    <a href="{{ url_for('subcontractor.subcontractor_list') }}"
+                       class="btn btn-outline-secondary">
+                        <i class="bi bi-x-circle me-2"></i>
+                        Cancel
+                    </a>
+
+                    <button type="submit"
+                            class="btn btn-success">
+                        <i class="bi bi-check-circle-fill me-2"></i>
+                        Save Subcontractor
+                    </button>
+
+                </div>
+
+            </form>
+
         </div>
 
-        <div class="mb-3">
-            <label class="form-label">Mobile No:</label>
-            <input type="text" class="form-control" name="mobile_no">
-        </div>
+    </div>
 
-        <div class="mb-3">
-            <label class="form-label">Email:</label>
-            <input type="email" class="form-control" name="email_id">
-        </div>
-
-        <div class="mb-3">
-            <label class="form-label">GST No:</label>
-            <input type="text" class="form-control" name="gst_no">
-        </div>
-
-        <div class="mb-3">
-            <label class="form-label">PAN No:</label>
-            <input type="text" class="form-control" name="pan_no">
-        </div>
-
-        <button class="btn btn-success">Save</button>
-        <a href="{{ url_for('subcontractor.subcontractor_list') }}" class="btn btn-secondary">Back</a>
-
-    </form>
 </div>
 
 {% endblock %}

app/templates/subcontractor_dashboard.html

@@ -1,104 +1,378 @@
 {% extends "base.html" %}
 {% block content %}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/choices.js/public/assets/styles/choices.min.css">
 
-<div class="container-fluid mt-3">
-
-    <h4 class="mb-4">Subcontractor Dashboard</h4>
-
-    <div class="row mb-3">
-
-        <div class="col-md-4">
-            <select id="subcontractor" class="form-control">
-                <option value="">Select Subcontractor</option>
-
-                {% for s in subcontractors %}
-                <option value="{{s.id}}">{{s.subcontractor_name}}</option>
-                {% endfor %}
-
-            </select>
-        </div>
-
-        <div class="col-md-4">
-            <select id="category" class="form-control">
-                <option value="">Select Category</option>
-                <option value="Soft Murum">Soft Murum</option>
-                <option value="Hard Murum">Hard Murum</option>
-                <option value="Soft Rock">Soft Rock</option>
-                <option value="Hard Rock">Hard Rock</option>
-            </select>
-        </div>
-
-        <div class="col-md-4">
-            <select id="ra_bill" class="form-control">
-                <option value="">RA Bill</option>
-            </select>
-        </div>
-
-    </div>
+<script src="https://cdn.jsdelivr.net/npm/choices.js/public/assets/scripts/choices.min.js"></script>
 
 
-    <div class="card shadow">
+<div class="container-fluid py-4">
+
+    <!-- HEADER -->
+    <div class="card shadow border-0 mb-4">
         <div class="card-body">
 
-            <canvas id="comparisonChart" height="120"></canvas>
+            <div class="d-flex justify-content-between align-items-center">
+
+                <div>
+                    <h3 class="fw-bold text-primary">
+                        <i class="bi bi-bar-chart-fill"></i>
+                        RA Bill Analytics Dashboard
+                    </h3>
+
+                    <small class="text-muted">
+                        Compare Quantity, Depth & RA Bill Analytics
+                    </small>
+                </div>
+
+                <div>
+                    <button class="btn btn-success" id="exportExcel">
+                        <i class="bi bi-file-earmark-excel"></i>
+                        Excel
+                    </button>
+
+                    <button class="btn btn-danger" id="exportPDF">
+                        <i class="bi bi-file-earmark-pdf"></i>
+                        PDF
+                    </button>
+                </div>
+
+            </div>
 
         </div>
     </div>
 
+    <!-- FILTERS -->
+    <div class="card shadow-sm mb-4">
+
+        <div class="card-header bg-primary text-white">
+            <h5 class="mb-0">
+                <i class="bi bi-funnel-fill"></i>
+                Filters
+            </h5>
+        </div>
+
+        <div class="card-body">
+
+            <div class="row g-3">
+
+                <!-- Contractor -->
+                <div class="col-lg-4">
+                    <label class="form-label fw-bold"> Subcontractor </label>
+                    <select class="form-select" id="subcontractor">
+                        <option value="">--- select contractor ---</option>
+                        {% for s in subcontractors %}
+                        <option value="{{s.id}}">
+                            {{s.subcontractor_name}}
+                        </option>
+                        {% endfor %}
+                    </select>
+                </div>
+
+                <!-- Category -->
+                <div class="col-lg-4">
+                    <label class="form-label fw-bold">Category</label>
+                    <select class="form-select" id="category">
+                        <option value="">--- select category ---</option>
+                        <option value="trench_excavation">Trench Excavation</option>
+                        <option value="manhole_excavation">Manhole Excavation</option>
+                        <option value="Manhole_Domestic_Chamber">Manhole Domestic Chamber</option>
+                        <option value="Laying">Pipe Laying</option>
+                    </select>
+                </div>
+
+                <!-- RA Bill -->
+                <div class="col-lg-4">
+                    <label class="form-label fw-bold"> RA Bills</label>
+                    <select id="ra_bill" class="form-select" multiple></select>
+                </div>
+
+            </div>
+
+            <hr>
+            <!-- Search button -->
+            <button class="btn btn-primary" id="searchBtn">
+                <i class="bi bi-search"></i>Search
+            </button>
+            <!-- Reset button -->
+            <button class="btn btn-secondary" id="resetBtn">
+                <i class="bi bi-arrow-clockwise"></i>Reset
+            </button>
+        </div>
+    </div>
+
+    <!-- TABS -->
+    <div class="card shadow">
+
+        <div class="card-header">
+            <ul class="nav nav-pills">
+                <!--Bar Chart Tab -->
+                <li class="nav-item">
+                    <button class="nav-link active"
+                            data-bs-toggle="tab"
+                            data-bs-target="#barTab">
+                        <i class="bi bi-bar-chart"></i> Bar Chart
+                    </button>
+                </li>
+                
+                <!-- Data Table Tab -->
+                <li class="nav-item">
+                    <button class="nav-link"
+                            data-bs-toggle="tab"
+                            data-bs-target="#tableTab">
+                        <i class="bi bi-table"></i> Data Table
+                    </button>
+                </li>
+            </ul>
+        </div>
+
+        <div class="card-body">
+            <div class="tab-content">
+                <!-- BAR TAB -->
+                <div class="tab-pane fade show active" id="barTab">
+                    <div style="height:600px">
+                        <canvas id="barChart"></canvas>
+                    </div>
+                </div>
+
+                <!-- TABLE TAB -->
+                <div class="tab-pane fade" id="tableTab">
+                    <div class="table-responsive">
+                        <table class="table table-bordered table-hover" id="resultTable">
+                            <thead class="table-dark">
+                                <tr>
+                                    <th>Sr No</th>
+                                    <th>Strata Type & Depth</th>
+                                    <th class="text-end">Client Qty</th>
+                                    <th class="text-end">Sub Contractor Qty</th>
+                                    <th class="text-end">Difference</th>
+                                </tr>
+                            </thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
 </div>
 
-
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 
 <script>
 
-    let chart;
+    let barChart;
+    let raBillChoice;
 
-    function loadChart() {
+    /* Load RA Bills */
+    function loadRABills(){
 
         let subcontractor = document.getElementById("subcontractor").value
         let category = document.getElementById("category").value
-        let ra_bill = document.getElementById("ra_bill").value
 
+        if (!raBillChoice)
+            return;
 
-        fetch(`/dashboard/api/subcontractor-chart?subcontractor=${subcontractor}&category=${category}&ra_bill=${ra_bill}`)
+        if (!subcontractor || !category) {
 
-            .then(res => res.json())
-            .then(data => {
+            raBillChoice.clearStore();
 
-                if (chart) {
-                    chart.destroy()
-                }
+            return;
+        }
 
-                const ctx = document.getElementById("comparisonChart")
+        fetch(`/dashboard/api/get-ra-bills?subcontractor=${subcontractor}&category=${category}`)
+        .then(res => res.json())
+        .then(data => {
 
-                chart = new Chart(ctx, {
-                    type: "bar",
-                    data: {
-                        labels: data.labels,
-                        datasets: [{
-                            label: "Subcontractor Quantity",
-                            data: data.values,
-                            backgroundColor: "#0d6efd"
-                        }]
-                    },
-                    options: {
-                        responsive: true,
-                        plugins: {
-                            legend: { display: true }
-                        }
-                    }
-                })
+            raBillChoice.clearStore();
 
-            })
+            let choices = [];
+
+            data.ra_bills.forEach(function(bill){
+
+                choices.push({
+
+                    value: bill,
+
+                    label: bill
+
+                });
+
+            });
+
+            raBillChoice.setChoices(
+                choices,
+                "value",
+                "label",
+                true
+            );
+
+        });
 
     }
 
-    document.getElementById("subcontractor").addEventListener("change", loadChart)
-    document.getElementById("category").addEventListener("change", loadChart)
-    document.getElementById("ra_bill").addEventListener("change", loadChart)
+    /* Search */
+    function loadDashboard() {
+        const subcontractor = document.getElementById("subcontractor").value;
+        const category = document.getElementById("category").value;
+
+        let raBills = [];
+
+        if (raBillChoice) {
+            raBills = raBillChoice.getValue(true);
+        }
+
+        let apiUrl = "";
+
+        switch (category) {
+
+            case "trench_excavation":
+                apiUrl = "/dashboard/api/tr-analysis";
+                break;
+
+            case "manhole_excavation":
+                apiUrl = "/dashboard/api/mh-analysis";
+                break;
+
+            case "Manhole_Domestic_Chamber":
+                apiUrl = "/dashboard/api/mdc-analysis";
+                break;
+
+            case "Laying":
+                apiUrl = "/dashboard/api/laying-analysis";
+                break;
+
+            default:
+                alert("Please select category");
+                return;
+        }
+
+        fetch(`${apiUrl}?subcontractor=${subcontractor}&category=${category}&ra_bill=${raBills.join(",")}`)
+            .then(response => response.json())
+            .then(data => {
+                drawBar(data);
+                drawTable(data);
+            })
+            .catch(err => console.error(err));
+
+    }
+
+    /* BAR */
+    function drawBar(data) {
+        if (barChart) {
+            barChart.destroy();
+        }
+        const ctx = document.getElementById("barChart");
+        barChart = new Chart(ctx, {
+            type: "bar",
+            data: {
+                labels: data.labels,
+                datasets: [
+                    {
+                        label: "Client Qty",
+                        data: data.client_qty,
+                        backgroundColor: "#0d6efd",
+                        borderColor: "#0d6efd",
+                        borderWidth: 1
+                    },
+                    {
+                        label: "Sub-Contractor Qty",
+                        data: data.sub_qty,
+                        backgroundColor: "#fd7e14",
+                        borderColor: "#fd7e14",
+                        borderWidth: 1
+                    }
+                ]
+            },
+
+            options: {
+                responsive: true,
+                maintainAspectRatio: false,
+                interaction: {
+                    mode: "index",
+                    intersect: false
+                },
+
+                plugins: {
+                    title: {
+                        display: true,
+                        text: data.title
+                    },
+                    legend: {
+                        position: "bottom"
+                    }
+                },
+
+                scales: {
+                    x: {
+                        ticks: {
+                            autoSkip: false,
+                            maxRotation: 45,
+                            minRotation: 45
+                        }
+                    },
+                    y: {
+                        beginAtZero: true,
+                        title: {
+                            display: true,
+                            text: data.y_title
+                        }
+                    }
+                }
+            }
+        });
+
+    }
+
+       /* TABLE */
+    function drawTable(data){
+
+        let html='';
+        for(let i=0;i<data.labels.length;i++){
+            const clientQty = Number(data.client_qty[i] || 0);
+            const subQty = Number(data.sub_qty[i] || 0);
+            const diff = clientQty - subQty;
+
+            html+=`
+            <tr>
+                <td class="text-center">${i + 1}</td>
+                <td>${data.labels[i]}</td>
+                <td class="text-end">${data.client_qty[i]}</td>
+                <td class="text-end">${data.sub_qty[i]}</td>
+                <td class="text-end fw-bold ${diff >= 0 ? 'text-success' : 'text-danger'}">${diff.toFixed(2)}</td>
+            </tr>
+
+            `;
+
+        }
+
+        document.querySelector("#resultTable tbody").innerHTML = html;
+
+    }
+
+    /* EVENTS */
+    document.getElementById("subcontractor").addEventListener("change", loadRABills);
+
+    document.getElementById("category").addEventListener("change", loadRABills);
+
+    document.getElementById("searchBtn").addEventListener("click", loadDashboard);
+
+    document.getElementById("resetBtn").addEventListener("click", function () {location.reload();});
+
+    document.addEventListener("DOMContentLoaded", function () {
+        raBillChoice = new Choices("#ra_bill", {
+            removeItemButton: true,
+            searchEnabled: true,
+            searchPlaceholderValue: "Search RA Bills",
+            placeholder: true,
+            placeholderValue: "Select RA Bills",
+            shouldSort: false,
+            itemSelectText: ""
+        });
+    });
 
-    loadChart()
 
 </script>
 

app/templates/subcontractor_report.html

@@ -1,117 +1,253 @@
 {% extends "base.html" %}
-
 {% block content %}
-<div class="container my-4">
 
-    <h2 class="text-center mb-4">Generate Subcontractor Report</h2>
+<div class="container-fluid py-4">
 
-    <!-- FORM -->
-    <div class="card shadow-sm p-3 p-md-4 mx-auto" style="max-width:600px;">
-        <form method="POST">
-
-            <div class="mb-3">
-                <label class="form-label fw-semibold">Select Subcontractor</label>
-                <select name="subcontractor_id" class="form-select" required>
-                    <option value="">-- Select Subcontractor --</option>
-                    {% for sc in subcontractors %}
-                    <option value="{{ sc.id }}" {% if selected_sc_id==sc.id|string %}selected{% endif %}>
-                        {{ sc.subcontractor_name }}
-                    </option>
-                    {% endfor %}
-                </select>
-            </div>
-
-            <div class="form-check form-switch mb-3">
-                <input class="form-check-input" type="checkbox" id="downloadAllSwitch" name="download_all" value="true"
-                    {% if download_all %}checked{% endif %}>
-                <label class="form-check-label fw-bold text-primary">
-                    Download All RA Bills
-                </label>
-            </div>
-
-            <div class="mb-4" id="ra_bill_container">
-                <label class="form-label fw-semibold">RA Bill Number</label>
-                <input type="text" name="ra_bill_no" id="ra_bill_input" class="form-control"
-                    value="{{ ra_bill_no or '' }}">
-            </div>
-
-            <div class="row g-2">
-                <div class="col-12 col-md-6">
-                    <button class="btn btn-outline-primary w-100" name="action" value="preview">
-                        Preview Data
-                    </button>
-                </div>
-                <div class="col-12 col-md-6">
-                    <button class="btn btn-primary w-100" name="action" value="download">
-                        Download Excel
-                    </button>
+    <!-- Page Header -->
+    <div class="card shadow-sm border-0 mb-4">
+        <div class="card-body">
+            <div class="d-flex justify-content-between align-items-center">
+                <div>
+                    <h2 class="fw-bold text-primary mb-1">
+                        <i class="bi bi-file-earmark-bar-graph"></i>
+                        Subcontractor Report
+                    </h2>
+                    <small class="text-muted">
+                        View, Filter, Edit and Delete Subcontractor Records
+                    </small>
                 </div>
             </div>
+        </div>
+    </div>
 
-        </form>
+    <!-- Filter Card -->
+    <div class="card shadow-sm border-0">
+        <div class="card-header bg-primary text-white">
+            <h5 class="mb-0">
+                <i class="bi bi-funnel-fill"></i>
+                Report Filters
+            </h5>
+        </div>
+
+        <div class="card-body">
+            <form method="POST" class="loading-form">
+
+                <div class="row g-3">
+                    <div class="col-lg-3">
+                        <label class="form-label fw-semibold">
+                            Subcontractor
+                            <span class="text-danger">*</span>
+                        </label>
+                        <select name="subcontractor_id" class="form-select" required>
+                            <option value="">--- Select Contractor ---</option>
+                            {% for sc in subcontractors %}
+                            <option value="{{ sc.id }}"
+                                {% if selected_sc_id|string == sc.id|string %}selected{% endif %}>
+                                {{ sc.subcontractor_name }}
+                            </option>
+                            {% endfor %}
+                        </select>
+
+                    </div>
+
+                    <div class="col-lg-3">
+                        <label class="form-label fw-semibold"> RA Bill No</label>
+                        <input
+                            type="text"
+                            name="ra_bill_no"
+                            class="form-control"
+                            placeholder="Enter RA Bill"
+                            value="{{ selected_ra_bill or '' }}">
+                    </div>
+
+                    <div class="col-lg-3">
+                        <label class="form-label fw-semibold"> Location </label>
+                        <input
+                            type="text"
+                            name="location"
+                            class="form-control"
+                            placeholder="Project Location"
+                            value="{{ selected_location or '' }}">
+                    </div>
+
+                    <div class="col-lg-3">
+                        <label class="form-label fw-semibold">Work Category</label>
+                        <select name="category" class="form-select">
+
+                            <option value="all">All Categories</option>
+
+                            <option value="tr"
+                            {% if request.form.get('category')=='tr' %}selected{% endif %}>
+                                Trench Excavation
+                            </option>
+
+                            <option value="mh"
+                            {% if request.form.get('category')=='mh' %}selected{% endif %}>
+                                Manhole Excavation
+                            </option>
+
+                            <option value="dc"
+                            {% if request.form.get('category')=='dc' %}selected{% endif %}>
+                                Manhole Domestic Chamber 
+                            </option>
+
+                            <option value="laying"
+                            {% if request.form.get('category')=='laying' %}selected{% endif %}>
+                                Pipe Laying
+                            </option>
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="mt-4 d-flex justify-content-end gap-2">
+
+                    <!-- Preview -->
+                    <button type="submit" name="action" value="preview"class="btn btn-primary">
+                        <i class="bi bi-search"></i>
+                        Preview Report
+                    </button>
+
+                    <!-- Download -->
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-success dropdown-toggle"data-bs-toggle="dropdown">
+                            <i class="bi bi-download"></i>
+                            Download Report
+                        </button>
+
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li>
+                                <button class="dropdown-item"type="submit" name="action" value="excel">
+                                    <i class="bi bi-file-earmark-excel text-success"></i>
+                                    Download Excel
+                                </button>
+                            </li>
+
+                            <li>
+                                <button class="dropdown-item" type="submit" name="action"
+                                    value="excel_all">
+                                    <i class="bi bi-file-earmark-spreadsheet text-primary"></i>
+                                    Download All Excel
+                                </button>
+                            </li>
+
+                            <li><hr class="dropdown-divider"></li>
+
+                            <li>
+                                <button class="dropdown-item"type="submit"name="action" value="pdf">
+                                    <i class="bi bi-file-earmark-pdf text-danger"></i>
+                                    PDF (Coming Soon)
+                                </button>
+                            </li>
+                        </ul>
+
+                    </div>
+
+                    <button type="reset" class="btn btn-secondary" id="resetBtn">
+                        <i class="bi bi-arrow-clockwise"></i>
+                        Reset
+                    </button>
+
+                </div>
+            </form>
+
+        </div>
     </div>
 
     {% if tables %}
-    <!-- REPORT PREVIEW -->
-    <div class="mt-5">
+    <!-- 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">
+                        <i class="bi bi-file-earmark-text"></i> Abstract 
+                    </button>
+                </li>
 
-        <h3 class="text-center mb-3">Report Preview</h3>
+                <li class="nav-item">
+                    <button class="nav-link "  data-bs-toggle="tab" data-bs-target="#tr">
+                        <i class="bi bi-cone-striped"></i> Trench Excavation
+                    </button>
+                </li>
 
-        <div class="card shadow-sm">
+                <li class="nav-item">
+                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#mh">
+                        <i class="bi bi-nut"></i> Manhole Excavation
+                    </button>
+                </li>
 
-            <!-- MOBILE SCROLLABLE TABS -->
-            <div class="card-header p-0">
-                <ul class="nav nav-tabs flex-nowrap overflow-auto">
-                    <li class="nav-item">
-                        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#tr">
-                            Trench Excavation
+                <li class="nav-item">
+                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#dc">
+                        <i class="bi bi-grid-3x3"></i> Manhole & Domestic Chambers Construction
+                    </button>
+                </li>
+
+                <li class="nav-item">
+                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#laying">
+                        <i class="bi bi-bezier2"></i> Pipe Laying
+                    </button>
+                </li>
+            </ul>
+        </div>
+
+        <div class="card-body">
+            <div class="tab-content">
+
+                <div class="tab-pane fade show active" id="abstract">
+                    {{ abstract_html|safe }}
+                </div>
+
+                <!-- Trench -->
+                <div class="tab-pane fade "id="tr">
+                    <div class="mb-3">
+                        <button onclick="deleteSelected('tr')" class="btn btn-danger">
+                            <i class="bi bi-trash"></i> Delete Selected
                         </button>
-                    </li>
-                    <li class="nav-item">
-                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#mh">
-                            Manhole Excavation
-                        </button>
-                    </li>
-                    <li class="nav-item">
-                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#dc">
-                            Manhole & Domestic Chambers
-                        </button>
-                    </li>
-                    <li class="nav-item">
-                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#laying">
-                            Pipe Laying
-                        </button>
-                    </li>
-                </ul>
-            </div>
-
-            <!-- TAB CONTENT -->
-            <div class="card-body tab-content">
-
-                <div class="tab-pane fade show active" id="tr">
-                    <div class="table-responsive overflow-auto">
-                        {{ tables.tr | safe }}
+                    </div>
+                    <div class="table-responsive border rounded shadow-sm">
+                        {{ tables.tr|safe }}
                     </div>
                 </div>
 
+                <!-- MH -->
                 <div class="tab-pane fade" id="mh">
-                    <div class="table-responsive overflow-auto">
-                        {{ tables.mh | safe }}
+                    <div class="mb-3">
+                        <button onclick="deleteSelected('mh')" class="btn btn-danger">
+                            <i class="bi bi-trash"></i>Delete Selected
+                        </button>
+                    </div>
+                    <div class="table-responsive border rounded shadow-sm">
+                        {{ tables.mh|safe }}
                     </div>
                 </div>
 
+                <!-- DC -->
                 <div class="tab-pane fade" id="dc">
-                    <div class="table-responsive overflow-auto">
-                        {{ tables.dc | safe }}
+                    <div class="mb-3">
+                        <button onclick="deleteSelected('dc')"class="btn btn-danger">
+                            <i class="bi bi-trash"></i>
+                            Delete Selected
+                        </button>
                     </div>
-                </div>
+                    <div class="table-responsive border rounded shadow-sm">
+                        {{ tables.dc|safe }}
+                    </div>
+                </div>  
 
+                <!-- Laying -->
                 <div class="tab-pane fade" id="laying">
-                    <div class="table-responsive overflow-auto">
-                        {{ tables.laying | safe }}
+                    <div class="mb-3">
+                        <button onclick="deleteSelected('laying')"
+                                class="btn btn-danger">
+                            <i class="bi bi-trash"></i>
+                            Delete Selected
+                        </button>
+                    </div>
+                    <div class="table-responsive border rounded shadow-sm">
+                        {{ tables.laying|safe }}
                     </div>
                 </div>
-
             </div>
         </div>
     </div>
@@ -119,24 +255,90 @@
 
 </div>
 
-<!-- BOOTSTRAP-ONLY JS -->
 <script>
-    function toggleRAInput() {
-        const checkbox = document.getElementById("downloadAllSwitch");
-        const input = document.getElementById("ra_bill_input");
-        const container = document.getElementById("ra_bill_container");
+    // Reset 
+    document.getElementById("resetBtn").addEventListener("click", function () {location.reload();});
 
-        if (checkbox.checked) {
-            input.value = "";
-            input.disabled = true;
-            container.classList.add("opacity-50");
-        } else {
-            input.disabled = false;
-            container.classList.remove("opacity-50");
-        }
+    // DATATABLE
+    $(document).ready(function () {
+        $('.datatable').DataTable({
+            pageLength: 10,
+            dom: 'Bfrtip',
+            buttons: ['copy', 'csv', 'excel', 'print']
+        });
+
+        setTimeout(() => {
+            $("table thead tr th:first-child").html('<input type="checkbox" id="select-all">');
+        }, 500);
+    });
+
+    // SELECT ALL
+    $(document).on("change", "#select-all", function () {
+        $(".row-check").prop("checked", this.checked);
+    });
+
+    // GET IDS
+    function getSelectedIds() {
+        let ids = [];
+        $(".row-check:checked").each(function () {
+            ids.push($(this).data("id"));
+        });
+        return ids;
     }
 
-    document.addEventListener("DOMContentLoaded", toggleRAInput);
-    document.getElementById("downloadAllSwitch").addEventListener("change", toggleRAInput);
+    // BULK DELETE
+    function deleteSelected(model) {
+        let ids = getSelectedIds();
+        if (ids.length === 0) return alert("Select records");
+
+        if (!confirm(`Delete ${ids.length} record(s)?`)) return;
+
+        fetch("/file/delete_records", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ model: model, ids: ids })
+        })
+        .then(res => res.json().then(data => ({ ok: res.ok, data })))
+        .then(({ ok, data }) => {
+            if (ok && data.status === "success") {
+                alert("Deleted Successfully");
+                location.reload();
+            } else {
+                alert("Delete failed: " + (data.message || "Unknown error"));
+            }
+        })
+        .catch(err => {
+            alert("Delete request failed: " + err);
+        });
+    }
+
+    // SINGLE DELETE
+    $(document).on("click", ".delete-btn", function () {
+        let id = $(this).data("id");
+        let model = $(this).data("model");
+
+        if (!confirm("Are you sure you want to delete this record?")) return;
+
+        fetch("/file/delete_records", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ model: model, ids: [id] })
+        })
+        .then(res => res.json().then(data => ({ ok: res.ok, data })))
+        .then(({ ok, data }) => {
+            if (ok && data.status === "success") {
+                alert("Deleted Successfully");
+                location.reload();
+            } else {
+                alert("Delete failed: " + (data.message || "Unknown error"));
+            }
+        })
+        .catch(err => {
+            alert("Delete request failed: " + err);
+        });
+    });
+
+
 </script>
+
 {% endblock %}

app/utils/file_utils.py

@@ -1,6 +1,40 @@
 import os
-from app.config import Config
+from flask import current_app
+
+
+# file extension
+ALLOWED_EXTENSIONS = {"xlsx", "xls", "csv"}
+
+# .log file allowed
+ALLOWED_LOG_FILE = {
+        "app.log",
+        "debug.log",
+        "error.log"
+    }
+
+# Get path of format excel folder
+def get_download_format_folder():
+    return os.path.join(
+        current_app.root_path,
+        "static",
+        "downloads",
+        "format"
+        )
+
+# Get path of uploads folder
+def get_uploads_folder():
+    return os.path.join(
+        current_app.root_path,
+        "static",
+        "uploads"
+    )
 
 def ensure_upload_folder():
-    if not os.path.exists(Config.UPLOAD_FOLDER):
-        os.makedirs(Config.UPLOAD_FOLDER)
+    if not os.path.exists(get_uploads_folder()):
+        os.makedirs(get_uploads_folder())
+        
+        
+# Get path of logs folder
+def get_logs_folder():
+    project_root = os.path.dirname(current_app.root_path)
+    return os.path.join(project_root, "logs")

app/utils/regex_utils.py

@@ -0,0 +1,12 @@
+import re
+
+class RegularExpression:
+
+    # sum fields of TrEx, MhEx (_total)
+    STR_TOTAL_PATTERN = re.compile(r".*_total$")
+
+    # sum fields  of pipe laying (pipe_150_mm)
+    PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+
+    # sum fields of MH dc (d_0_to_0_75)
+    D_RANGE_PATTERN = re.compile( r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$") 

docker-compose.yml

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

requirements.txt

@@ -1,4 +1,5 @@
 Flask
+ldap3
 pandas
 openpyxl
 xlrd

run.py

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