Update README.md

update readme file

.dockerignore

@@ -0,0 +1,19 @@
+.git
+.gitignore
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.Python
+env/
+venv/
+*.egg-info/
+dist/
+build/
+.vscode/
+.idea/
+*.log
+.env
+instance/
+.pytest_cache/
+.coverage

.env

@@ -4,7 +4,7 @@
 FLASK_ENV=development
 FLASK_DEBUG=True
 FLASK_HOST=0.0.0.0
-FLASK_PORT=5001
+FLASK_PORT=5011
 
 # -----------------------------
 # Security
@@ -20,7 +20,7 @@ DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_NAME=comparisondb
 DB_USER=root
-DB_PASSWORD=admin
+DB_PASSWORD=root
 
 # DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
 

.gitignore

@@ -13,8 +13,7 @@ venv
 
 # Ignore Log files ss
 logs/
-
-# Ignore db folders
-instance/
+*.log
+
 
 

Dockerfile

@@ -18,7 +18,7 @@ COPY . .
 RUN mkdir -p app/logs app/static/uploads app/static/downloads
 
 # Expose port
-EXPOSE 5000
+EXPOSE 5001
 
 # Run the application
 CMD ["python", "run.py"]

README.md

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

app/__init__.py

@@ -1,9 +1,7 @@
-import logging
-import logging.handlers
-import os
 from flask import Flask, redirect, url_for
 from app.config import Config
 from app.services.db_service import db
+from app.services.logger_service import LoggerService
 
 def create_app():
     app = Flask(__name__)
@@ -11,9 +9,9 @@ def create_app():
 
     # Initialize extensions
     db.init_app(app)
-    
-    # Configure logging
-    setup_logging(app)
+
+    # Initialize Logger
+    LoggerService.init_app(app)
 
     # Register blueprints
     register_blueprints(app)
@@ -28,68 +26,6 @@ def create_app():
     return app
 
 
-def setup_logging(app):
-    """Configure comprehensive logging for debugging"""
-    
-    # Ensure logs directory exists
-    logs_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'logs')
-    os.makedirs(logs_dir, exist_ok=True)
-    
-    # Create logger
-    logger = logging.getLogger()
-    logger.setLevel(logging.DEBUG)
-    
-    # Remove existing handlers
-    logger.handlers.clear()
-    
-    # Create formatters
-    detailed_formatter = logging.Formatter(
-        '%(asctime)s - %(name)s - %(levelname)s - [%(filename)s:%(lineno)d] - %(message)s',
-        datefmt='%Y-%m-%d %H:%M:%S'
-    )
-    
-    # File handler for all logs
-    file_handler = logging.handlers.RotatingFileHandler(
-        os.path.join(logs_dir, 'app.log'),
-        maxBytes=10485760,  # 10MB
-        backupCount=5
-    )
-    file_handler.setLevel(logging.DEBUG)
-    file_handler.setFormatter(detailed_formatter)
-    logger.addHandler(file_handler)
-    
-    # File handler for RA bill fetching only
-    ra_bill_handler = logging.handlers.RotatingFileHandler(
-        os.path.join(logs_dir, 'ra_bill_fetch.log'),
-        maxBytes=5242880,  # 5MB
-        backupCount=5
-    )
-    ra_bill_handler.setLevel(logging.DEBUG)
-    ra_bill_handler.setFormatter(detailed_formatter)
-    
-    # Only attach to relevant loggers
-    ra_loggers = ['app.routes.dashboard', 'app.routes.file_report']
-    for logger_name in ra_loggers:
-        logging.getLogger(logger_name).addHandler(ra_bill_handler)
-    
-    # Console handler for important messages
-    console_handler = logging.StreamHandler()
-    console_handler.setLevel(logging.INFO)
-    console_formatter = logging.Formatter(
-        '%(levelname)s - %(name)s - %(message)s'
-    )
-    console_handler.setFormatter(console_formatter)
-    logger.addHandler(console_handler)
-    
-    # Suppress verbose libraries
-    logging.getLogger('werkzeug').setLevel(logging.WARNING)
-    logging.getLogger('sqlalchemy.engine').setLevel(logging.WARNING)
-    
-    app.logger.info("Logging initialized successfully")
-    app.logger.info(f"Log files location: {logs_dir}")
-
-
-
 def register_blueprints(app):
     from app.routes.auth import auth_bp
     from app.routes.user import user_bp
@@ -111,10 +47,15 @@ def register_blueprints(app):
 
 
 def register_error_handlers(app):
+
+    from flask import current_app
+
     @app.errorhandler(404)
     def page_not_found(e):
+        current_app.logger.warning("404 Page Not Found")
         return "Page Not Found", 404
 
     @app.errorhandler(500)
     def internal_error(e):
-        return "Internal Server Error", 500
+        current_app.logger.exception("500 Internal Server Error")
+        return "Internal Server Error", 500

app/config.py

@@ -6,7 +6,7 @@ class Config:
     # secret key
     SECRET_KEY = os.getenv("SECRET_KEY", "dev-secret-key")
  
-    # Database varibles 
+    # Database variables 
     DB_DIALECT = os.getenv("DB_DIALECT")
     DB_DRIVER = os.getenv("DB_DRIVER")
     DB_USER = os.getenv("DB_USER")

app/constants/http_status.py

@@ -0,0 +1,11 @@
+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

app/constants/messages.py

@@ -0,0 +1,17 @@
+class SuccessMessage:
+    FETCHED = "Data fetched successfully"
+    CREATED = "Resource created successfully"
+    UPDATED = "Resource updated successfully"
+    DELETED = "Resource deleted successfully"
+    LOGIN = "Login successful"
+    LOGOUT = "Logout successful"
+
+
+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"

app/errors/error_handlers.py

@@ -0,0 +1,66 @@
+from flask import request, render_template
+from app.utils.response_handler import ResponseHandler
+from app.utils.exceptions import APIException
+from app.constants.http_status import HTTPStatus
+from app.constants.messages import ErrorMessage
+from app.services.db_service import db
+import traceback
+
+
+def register_error_handlers(app):
+
+    # Custom API Exception
+    @app.errorhandler(APIException)
+    def handle_api_exception(e):
+        db.session.rollback()
+
+        if request.path.startswith("/api"):
+            return ResponseHandler.error(
+                message=e.message,
+                errors=e.errors,
+                status_code=e.status_code
+            )
+
+        return render_template("errors/500.html"), e.status_code
+
+
+    # 404
+    @app.errorhandler(404)
+    def handle_404(e):
+        if request.path.startswith("/api"):
+            return ResponseHandler.error(
+                message=ErrorMessage.NOT_FOUND,
+                status_code=HTTPStatus.NOT_FOUND
+            )
+
+        return render_template("errors/404.html"), 404
+
+
+    # 500
+    @app.errorhandler(500)
+    def handle_500(e):
+        db.session.rollback()
+        traceback.print_exc()
+
+        if request.path.startswith("/api"):
+            return ResponseHandler.error(
+                message=ErrorMessage.INTERNAL_ERROR,
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR
+            )
+
+        return render_template("errors/500.html"), 500
+
+
+    # Catch All
+    @app.errorhandler(Exception)
+    def handle_general_exception(e):
+        db.session.rollback()
+        traceback.print_exc()
+
+        if request.path.startswith("/api"):
+            return ResponseHandler.error(
+                message=ErrorMessage.INTERNAL_ERROR,
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR
+            )
+
+        return render_template("errors/500.html"), 500

app/models/laying_client_model.py

@@ -1,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class LayingClient(db.Model):
     __tablename__ = "laying_client"
@@ -9,33 +11,33 @@ class LayingClient(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float)
+    CC_length = db.Column(db.Float, default=0)
     # Bedding Qty.
-    Outer_dia_of_MH_m = db.Column(db.Float)
-    Bedding_Length = db.Column(db.Float)
-    Width = db.Column(db.Float)
-    Depth = db.Column(db.Float)
-    Qty = db.Column(db.Float)
+    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)
  
     #  PIPE LAYING Qty. 
-    Pipe_Dia_mm = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Laying_Length = db.Column(db.Float)
+    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_150_mm = db.Column(db.Float)
-    pipe_200_mm = db.Column(db.Float)
-    pipe_250_mm = db.Column(db.Float)
-    pipe_300_mm = db.Column(db.Float)
-    pipe_350_mm = db.Column(db.Float)
-    pipe_400_mm = db.Column(db.Float)
-    pipe_450_mm = db.Column(db.Float)
-    pipe_500_mm = db.Column(db.Float)
-    pipe_600_mm = db.Column(db.Float)
-    pipe_700_mm = db.Column(db.Float)
-    pipe_900_mm = db.Column(db.Float)
-    pipe_1200_mm = db.Column(db.Float)
+    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)
     
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Float, default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -48,11 +50,14 @@ 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
+    for column in target.__table__.columns:
+        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+event.listen(LayingClient, "before_insert", calculate_laying_total)
+event.listen(LayingClient, "before_update", calculate_laying_total)

app/models/laying_model.py

@@ -1,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class Laying(db.Model):
     __tablename__ = "laying"
@@ -13,25 +15,25 @@ class Laying(db.Model):
     # Pipe Laying Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Laying_Length = db.Column(db.Float)
+    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)
 
-    pipe_150_mm = db.Column(db.Float)
-    pipe_200_mm = db.Column(db.Float)
-    pipe_250_mm = db.Column(db.Float)
-    pipe_300_mm = db.Column(db.Float)
-    pipe_350_mm = db.Column(db.Float)
-    pipe_400_mm = db.Column(db.Float)
-    pipe_450_mm = db.Column(db.Float)
-    pipe_500_mm = db.Column(db.Float)
-    pipe_600_mm = db.Column(db.Float)
-    pipe_700_mm = db.Column(db.Float)
-    pipe_900_mm = db.Column(db.Float)
-    pipe_1200_mm = db.Column(db.Float)
+    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)
     
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Float, default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -45,10 +47,13 @@ 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
+    for column in target.__table__.columns:
+        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+event.listen(Laying, "before_insert", calculate_laying_total)
+event.listen(Laying, "before_update", calculate_laying_total)

app/models/manhole_domestic_chamber_model.py

@@ -1,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class ManholeDomesticChamber(db.Model):
     __tablename__ = "manhole_domestic_chamber"
@@ -13,35 +15,35 @@ class ManholeDomesticChamber(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Depth_of_MH = db.Column(db.Float)
+    Depth_of_MH = db.Column(db.Float, default=0)
  
     # Excavation categories 
-    d_0_to_0_75 = db.Column(db.Float)
-    d_0_76_to_1_05 = db.Column(db.Float)
-    d_1_06_to_1_65 = db.Column(db.Float)
-    d_1_66_to_2_15 = db.Column(db.Float)
-    d_2_16_to_2_65 = db.Column(db.Float)
-    d_2_66_to_3_15 = db.Column(db.Float)
-    d_3_16_to_3_65= db.Column(db.Float)
-    d_3_66_to_4_15 = db.Column(db.Float)
-    d_4_16_to_4_65 = db.Column(db.Float)
-    d_4_66_to_5_15 = db.Column(db.Float)
-    d_5_16_to_5_65 = db.Column(db.Float)
+    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)
 
-    d_5_66_to_6_15 = db.Column(db.Float)
-    d_6_16_to_6_65 = db.Column(db.Float)
-    d_6_66_to_7_15 = db.Column(db.Float)
-    d_7_16_to_7_65 = db.Column(db.Float)
-    d_7_66_to_8_15 = db.Column(db.Float)
-    d_8_16_to_8_65 = db.Column(db.Float)
-    d_8_66_to_9_15 = db.Column(db.Float)
-    d_9_16_to_9_65 = db.Column(db.Float)
-
-    Domestic_Chambers = db.Column(db.Float)
-    DWC_Pipe_Length = db.Column(db.Float)
-    UPVC_Pipe_Length = db.Column(db.Float)
+    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))
 
+    Total = db.Column(db.Float, default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -51,13 +53,13 @@ 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
+    for column in target.__table__.columns:
+        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
 
+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,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class ManholeExcavation(db.Model):
     __tablename__ = "manhole_excavation"
@@ -14,47 +16,47 @@ class ManholeExcavation(db.Model):
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
    
-    Upto_IL_Depth = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Ex_Dia_of_Manhole = db.Column(db.Float)
-    Area_of_Manhole = db.Column(db.Float)
+    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)
    
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    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)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    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)
 
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Float, default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
 
@@ -65,3 +67,15 @@ class ManholeExcavation(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+# AUTO TOTAL USING REGEX
+def calculate_Manhole_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+
+event.listen(ManholeExcavation, "before_insert", calculate_Manhole_total)
+event.listen(ManholeExcavation, "before_update", calculate_Manhole_total)

app/models/mh_dc_client_model.py

@@ -1,41 +1,37 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 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))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    MH_TOP_LEVEL = db.Column(db.Float)
-    MH_IL_LEVEL = db.Column(db.Float)
-    Depth_of_MH = db.Column(db.Float)
+    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)
    
- 
     # Excavation categories 
-    d_0_to_1_5 = db.Column(db.Float)
-    d_1_5_to_2_0 = db.Column(db.Float)
-    d_2_0_to_2_5 = db.Column(db.Float)
-    d_2_5_to_3_0 = db.Column(db.Float)
+    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_3_0_to_3_5 = db.Column(db.Float)
-    d_3_5_to_4_0 = db.Column(db.Float)
-    d_4_0_to_4_5= db.Column(db.Float)
-    d_4_5_to_5_0 = db.Column(db.Float)
-
-    d_5_0_to_5_5 = db.Column(db.Float)
-    d_5_5_to_6_0 = db.Column(db.Float)
-    d_6_0_to_6_5 = db.Column(db.Float)
-
-    Domestic_Chambers = db.Column(db.Float)
+    Domestic_Chambers = db.Column(db.Float, default=0)
 
+    Total = db.Column(db.Float, default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -45,13 +41,15 @@ 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
+    for column in target.__table__.columns:
+        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+
+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,78 +1,76 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 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))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Ground_Level = db.Column(db.Float)
-    MH_Invert_Level = db.Column(db.Float)
-    MH_Top_Level = db.Column(db.Float)
-    Ex_Level = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    MH_Depth = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
+    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)
 
-    Dia_of_MH_Cutting = db.Column(db.Float)
-    Area_of_Manhole = db.Column(db.Float)
+    Dia_of_MH_Cutting = db.Column(db.Float, default=0)
+    Area_of_Manhole = db.Column(db.Float, default=0)
    
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    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)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    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)
 
     Remarks = db.Column(db.String(500))
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Float, default=0)
 
     created_at = db.Column(db.DateTime, default=datetime.today)
 
@@ -81,3 +79,16 @@ class ManholeExcavationClient(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+
+# AUTO TOTAL USING REGEX
+def calculate_Manhole_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+
+event.listen(ManholeExcavationClient, "before_insert", calculate_Manhole_total)
+event.listen(ManholeExcavationClient, "before_update", calculate_Manhole_total)

app/models/tr_ex_client_model.py

@@ -1,82 +1,80 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class TrenchExcavationClient(db.Model):
     __tablename__ = "tr_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="tr_ex_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)
-    Actual_Trench_Length = db.Column(db.Float)
-    Ground_Level = db.Column(db.Float)
-    Invert_Level = db.Column(db.Float)
-    Excavated_level = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    Avg_Depth = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Float)
+    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)
  
     # width
-    Width_0_to_1_5_m = db.Column(db.Float)
-    Width_1_5_to_3_0_m = db.Column(db.Float)
-    Width_3_0_to_4_5_m = db.Column(db.Float)
-    Width_4_5_to_6_0_m = db.Column(db.Float)
-    Width_6_0_to_7_5_m = db.Column(db.Float)
+    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)
 
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Rock_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    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)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    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)
 
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Float, default=0)
     Remarks = db.Column(db.String(500))
 
     created_at = db.Column(db.DateTime, default=datetime.today)
@@ -86,3 +84,15 @@ class TrenchExcavationClient(db.Model):
     
     def serialize(self):
             return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+
+# AUTO TOTAL USING REGEX
+def calculate_trench_client_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+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,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class TrenchExcavation(db.Model):
     __tablename__ = "trench_excavation"
@@ -13,59 +15,59 @@ class TrenchExcavation(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float)
-    Invert_Level = db.Column(db.Float)
-    MH_Top_Level = db.Column(db.Float)
-    Ground_Level = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Actual_Trench_Length = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Float)
+    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)
 
     # width
-    Width_0_to_2_5 = db.Column(db.Float)
-    Width_2_5_to_3_0 = db.Column(db.Float)
-    Width_3_0_to_4_5 = db.Column(db.Float)
-    Width_4_5_to_6_0 = db.Column(db.Float)
+    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)
 
-    Upto_IL_Depth = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    Avg_Depth = db.Column(db.Float)
+    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)
 
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    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)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    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)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Float)
+    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)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Float)
+    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)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    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)
 
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Float, default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -78,33 +80,15 @@ 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
+# AUTO TOTAL USING REGEX
+def calculate_trench_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
 
-        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)
-            ),
-        }
+event.listen(TrenchExcavation, "before_insert", calculate_trench_total)
+event.listen(TrenchExcavation, "before_update", calculate_trench_total)

app/models/user_model.py

@@ -5,7 +5,7 @@ class User(db.Model):
     __tablename__ = "users"
 
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(120), nullable=False)
+    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)
 

app/routes/dashboard.py

@@ -1,308 +1,114 @@
-import logging
+import matplotlib
+matplotlib.use("Agg")
+
 from flask import Blueprint, render_template, session, redirect, url_for, jsonify, request
-from sqlalchemy import func, union_all
+import matplotlib.pyplot as plt
+import io
+import base64
+from app.utils.plot_utils import plot_to_base64
+from app.services.dashboard_service import DashboardService
+from sqlalchemy import func
 from app import db
 from app.models.trench_excavation_model import TrenchExcavation
-from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.manhole_excavation_model import ManholeExcavation
-from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.laying_model import Laying
-from app.models.laying_client_model import LayingClient
+
 from app.models.subcontractor_model import Subcontractor
 
 dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
 
-# Configure logging for debugging
-logger = logging.getLogger(__name__)
-
-# API to get dynamic filters from database
-@dashboard_bp.route("/api/filters")
-def get_filters():
-    try:
-        logger.info("=" * 60)
-        logger.info("FETCHING RA BILLS - START")
-        logger.info("=" * 60)
-        
-        # 1. Fetch Subcontractors (Linked to Trench entries)
-        logger.info("Step 1: Fetching Subcontractors...")
-        subcontractors = db.session.query(Subcontractor.subcontractor_name)\
-            .join(TrenchExcavation, Subcontractor.id == TrenchExcavation.subcontractor_id)\
-            .distinct().all()
-        logger.info(f"✓ Subcontractors found: {len(subcontractors)}")
-        logger.debug(f"  Subcontractor list: {[s[0] for s in subcontractors if s[0]]}")
-        
-        # 2. Check total records in TrenchExcavation table
-        logger.info("Step 2: Checking TrenchExcavation table...")
-        total_records = db.session.query(TrenchExcavation).count()
-        logger.info(f"✓ Total TrenchExcavation records: {total_records}")
-        
-        # 3. Check records with RA_Bill_No
-        logger.info("Step 3: Checking records with RA_Bill_No...")
-        records_with_ra = db.session.query(TrenchExcavation).filter(TrenchExcavation.RA_Bill_No != None).count()
-        logger.info(f"✓ Records with RA_Bill_No (not null): {records_with_ra}")
-        
-        # 4. Check for empty strings
-        records_with_ra_and_value = db.session.query(TrenchExcavation).filter(
-            TrenchExcavation.RA_Bill_No != None,
-            TrenchExcavation.RA_Bill_No != ""
-        ).count()
-        logger.info(f"✓ Records with RA_Bill_No (not null & not empty): {records_with_ra_and_value}")
-        
-        # 5. Raw sample of RA_Bill_No values
-        logger.info("Step 4: Sampling RA_Bill_No values from database...")
-        sample_bills = db.session.query(TrenchExcavation.RA_Bill_No).limit(10).all()
-        logger.debug(f"  Sample RA_Bill_No values (Subcontractor): {[str(r[0]) for r in sample_bills]}")
-        
-        sample_bills_client = db.session.query(TrenchExcavationClient.RA_Bill_No).limit(10).all()
-        logger.debug(f"  Sample RA_Bill_No values (Client): {[str(r[0]) for r in sample_bills_client]}")
-        
-        # 6. Fetch RA Bills from BOTH Subcontractor and Client tables
-        logger.info("Step 5: Fetching distinct RA Bills from both Subcontractor and Client data...")
-        
-        # Get RA bills from Subcontractor data
-        subcon_ra_bills = db.session.query(TrenchExcavation.RA_Bill_No)\
-            .filter(TrenchExcavation.RA_Bill_No != None)\
-            .filter(TrenchExcavation.RA_Bill_No != "")\
-            .distinct()
-        
-        logger.debug(f"  Subcontractor RA Bills (before union): {len(subcon_ra_bills.all())}")
-        
-        # Get RA bills from Client data
-        client_ra_bills = db.session.query(TrenchExcavationClient.RA_Bill_No)\
-            .filter(TrenchExcavationClient.RA_Bill_No != None)\
-            .filter(TrenchExcavationClient.RA_Bill_No != "")\
-            .distinct()
-        
-        logger.debug(f"  Client RA Bills (before union): {len(client_ra_bills.all())}")
-        
-        # Union both queries to get all unique RA bills
-        ra_bills_union = db.session.query(TrenchExcavation.RA_Bill_No)\
-            .filter(TrenchExcavation.RA_Bill_No != None)\
-            .filter(TrenchExcavation.RA_Bill_No != "")\
-            .union(
-                db.session.query(TrenchExcavationClient.RA_Bill_No)\
-                .filter(TrenchExcavationClient.RA_Bill_No != None)\
-                .filter(TrenchExcavationClient.RA_Bill_No != "")
-            ).order_by(TrenchExcavation.RA_Bill_No).all()
-        
-        logger.info(f"✓ Distinct RA Bills found (Combined): {len(ra_bills_union)}")
-        ra_bills_list = [r[0] for r in ra_bills_union if r[0]]
-        logger.info(f"  RA Bills list: {ra_bills_list}")
-        
-        # 7. Debug: Check data types
-        if ra_bills_union:
-            logger.debug(f"  First RA Bill value: {ra_bills_union[0][0]}")
-            logger.debug(f"  First RA Bill type: {type(ra_bills_union[0][0])}")
-
-        response = {
-            "subcontractors": [s[0] for s in subcontractors if s[0]],
-            "ra_bills": ra_bills_list
-        }
-        
-        logger.info(f"✓ Response prepared successfully")
-        logger.info("=" * 60)
-        
-        return jsonify(response)
-        
-    except Exception as e:
-        logger.error("=" * 60)
-        logger.error(f"ERROR in get_filters(): {str(e)}")
-        logger.error(f"Error type: {type(e).__name__}")
-        logger.exception("Full traceback:")
-        logger.error("=" * 60)
-        return jsonify({"error": str(e)}), 500
-
-# API for the live abstract data - handles multiple table types
-@dashboard_bp.route("/api/excavation-abstract")
-def excavation_abstract():
-    try:
-        logger.info("=" * 60)
-        logger.info("EXCAVATION ABSTRACT FETCH - START")
-        logger.info("=" * 60)
-        
-        table_type = request.args.get('table_type', 'trench')
-        subcon_name = request.args.get('subcontractor', 'All')
-        ra_bill = request.args.get('ra_bill', 'Cumulative')
-        
-        logger.info(f"Request Parameters:")
-        logger.info(f"  Table Type: {table_type}")
-        logger.info(f"  Subcontractor: {subcon_name}")
-        logger.info(f"  RA Bill: {ra_bill}")
-        
-        # Select models and match keys based on table type
-        if table_type == 'trench':
-            SubconModel = TrenchExcavation
-            ClientModel = TrenchExcavationClient
-            table_label = "Trench Excavation"
-            location_key = 'Location'
-            mh_key = 'MH_NO'
-            excavation_columns = [
-                ("Soft Murum", "0-1.5m", "Soft_Murum_0_to_1_5"),
-                ("Soft Murum", "1.5-3.0m", "Soft_Murum_1_5_to_3_0"),
-                ("Soft Murum", "3.0-4.5m", "Soft_Murum_3_0_to_4_5"),
-                ("Hard Murum", "0-1.5m", "Hard_Murum_0_to_1_5"),
-                ("Hard Murum", "1.5-3.0m", "Hard_Murum_1_5_to_3_0"),
-                ("Soft Rock", "0-1.5m", "Soft_Rock_0_to_1_5"),
-                ("Soft Rock", "1.5-3.0m", "Soft_Rock_1_5_to_3_0"),
-                ("Hard Rock", "0-1.5m", "Hard_Rock_0_to_1_5"),
-                ("Hard Rock", "1.5-3.0m", "Hard_Rock_1_5_to_3_0"),
-                ("Hard Rock", "3.0-4.5m", "Hard_Rock_3_0_to_4_5"),
-                ("Hard Rock", "4.5-6.0m", "Hard_Rock_4_5_to_6_0"),
-                ("Hard Rock", "6.0-7.5m", "Hard_Rock_6_0_to_7_5"),
-            ]
-        elif table_type == 'manhole':
-            SubconModel = ManholeExcavation
-            ClientModel = ManholeExcavationClient
-            table_label = "Manhole Excavation"
-            location_key = 'Location'
-            mh_key = 'MH_NO'
-            excavation_columns = [
-                ("Soft Murum", "0-1.5m", "Soft_Murum_0_to_1_5"),
-                ("Soft Murum", "1.5-3.0m", "Soft_Murum_1_5_to_3_0"),
-                ("Hard Murum", "0-1.5m", "Hard_Murum_0_to_1_5"),
-                ("Hard Murum", "1.5-3.0m", "Hard_Murum_1_5_to_3_0"),
-                ("Soft Rock", "0-1.5m", "Soft_Rock_0_to_1_5"),
-                ("Soft Rock", "1.5-3.0m", "Soft_Rock_1_5_to_3_0"),
-                ("Hard Rock", "0-1.5m", "Hard_Rock_0_to_1_5"),
-                ("Hard Rock", "1.5-3.0m", "Hard_Rock_1_5_to_3_0"),
-            ]
-        elif table_type == 'laying':
-            SubconModel = Laying
-            ClientModel = LayingClient
-            table_label = "Laying"
-            location_key = 'Location'
-            mh_key = 'MH_NO'
-            excavation_columns = [
-                ("Soft Murum", "0-1.5m", "Soft_Murum_0_to_1_5"),
-                ("Soft Murum", "1.5-3.0m", "Soft_Murum_1_5_to_3_0"),
-                ("Hard Murum", "0-1.5m", "Hard_Murum_0_to_1_5"),
-                ("Hard Murum", "1.5-3.0m", "Hard_Murum_1_5_to_3_0"),
-                ("Soft Rock", "0-1.5m", "Soft_Rock_0_to_1_5"),
-                ("Soft Rock", "1.5-3.0m", "Soft_Rock_1_5_to_3_0"),
-                ("Hard Rock", "0-1.5m", "Hard_Rock_0_to_1_5"),
-                ("Hard Rock", "1.5-3.0m", "Hard_Rock_1_5_to_3_0"),
-            ]
-        else:
-            return jsonify({"error": f"Invalid table_type: {table_type}"}), 400
-        
-        logger.info(f"Using table: {table_label}")
-        
-        # ===== FETCH SUBCONTRACTOR DATA =====
-        logger.info(f"Fetching Subcontractor data ({SubconModel.__tablename__})...")
-        subcon_query = db.session.query(SubconModel)
-        
-        # Check if SubconModel has subcontractor relationship
-        if hasattr(SubconModel, 'subcontractor_id'):
-            subcon_query = subcon_query.join(
-                Subcontractor, Subcontractor.id == SubconModel.subcontractor_id
-            )
-            if subcon_name != 'All':
-                subcon_query = subcon_query.filter(Subcontractor.subcontractor_name == subcon_name)
-        
-        subcon_results = subcon_query.all()
-        logger.info(f"  Found {len(subcon_results)} subcontractor records")
-        
-        # ===== FETCH CLIENT DATA =====
-        logger.info(f"Fetching Client data ({ClientModel.__tablename__})...")
-        client_query = db.session.query(ClientModel)
-        
-        if ra_bill != 'Cumulative' and hasattr(ClientModel, 'RA_Bill_No'):
-            client_query = client_query.filter(ClientModel.RA_Bill_No == ra_bill)
-        
-        client_results = client_query.all()
-        logger.info(f"  Found {len(client_results)} client records")
-        
-        # ===== MATCH RECORDS BY MH_NO AND LOCATION =====
-        logger.info("Matching records by MH_NO and Location...")
-        matched_data = {}
-        
-        # Build a map of client records by MH_NO + Location
-        client_map = {}
-        for client_record in client_results:
-            mh_no = getattr(client_record, mh_key)
-            location = getattr(client_record, location_key)
-            key = f"{location}|{mh_no}"
-            client_map[key] = client_record
-        
-        logger.info(f"  Client map has {len(client_map)} unique MH_NO+Location combinations")
-        
-        # Match subcontractor records with client records
-        match_count = 0
-        for subcon_record in subcon_results:
-            mh_no = getattr(subcon_record, mh_key)
-            location = getattr(subcon_record, location_key)
-            key = f"{location}|{mh_no}"
-            
-            # Only process if matching client record exists
-            if key in client_map:
-                match_count += 1
-                client_record = client_map[key]
-                
-                # Aggregate excavation data for this matched pair
-                for soil, depth, col_name in excavation_columns:
-                    record_key = f"{soil}|{depth}|{location}|{mh_no}"
-                    
-                    # Get values
-                    subcon_val = 0
-                    client_val = 0
-                    
-                    if hasattr(subcon_record, col_name):
-                        subcon_val = getattr(subcon_record, col_name) or 0
-                    
-                    if hasattr(client_record, col_name):
-                        client_val = getattr(client_record, col_name) or 0
-                    
-                    # Only add if at least one has data
-                    if subcon_val > 0 or client_val > 0:
-                        if record_key not in matched_data:
-                            matched_data[record_key] = {
-                                "soil_type": soil,
-                                "depth": depth,
-                                "location": location,
-                                "mh_no": mh_no,
-                                "client_qty": 0,
-                                "subcon_qty": 0
-                            }
-                        matched_data[record_key]["client_qty"] += client_val
-                        matched_data[record_key]["subcon_qty"] += subcon_val
-        
-        logger.info(f"  Matched {match_count} subcontractor records with client records")
-        logger.info(f"  Found {len(matched_data)} excavation items with data")
-        
-        # Calculate differences and format response
-        data = []
-        for key, item in matched_data.items():
-            difference = item["subcon_qty"] - item["client_qty"]
-            # Format label as: "Soft Murum 0-1.5m (Location - MH_NO)"
-            label = f"{item['soil_type']} {item['depth']}"
-            data.append({
-                "label": label,
-                "soil_type": item["soil_type"],
-                "depth": item["depth"],
-                "location": item["location"],
-                "mh_no": item["mh_no"],
-                "client_qty": round(item["client_qty"], 2),
-                "subcon_qty": round(item["subcon_qty"], 2),
-                "difference": round(difference, 2)
-            })
-        
-        # Sort by location and mh_no for consistency
-        data.sort(key=lambda x: (x["location"], x["mh_no"], x["soil_type"], x["depth"]))
-        
-        logger.info(f"Response prepared with {len(data)} matched records")
-        logger.info("=" * 60)
-        
-        return jsonify(data)
-    except Exception as e:
-        logger.error("=" * 60)
-        logger.error(f"ERROR in excavation_abstract(): {str(e)}")
-        logger.error(f"Error type: {type(e).__name__}")
-        logger.exception("Full traceback:")
-        logger.error("=" * 60)
-        return jsonify({"error": str(e)}), 500
 
 @dashboard_bp.route("/")
 def dashboard():
     if not session.get("user_id"):
         return redirect(url_for("auth.login"))
-    return render_template("dashboard.html", title="Live Excavation Dashboard")
+    return render_template("dashboard.html", title="Business Intelligence Dashboard")
+
+
+@dashboard_bp.route("/api/live-stats")
+def live_stats():
+    try:
+        # 1. Overall Volume
+        t_count = TrenchExcavation.query.count()
+        m_count = ManholeExcavation.query.count()
+        l_count = Laying.query.count()
+
+        # 2. Location Distribution (Business reach)
+        loc_results = db.session.query(
+            TrenchExcavation.Location, 
+            func.count(TrenchExcavation.id)
+        ).group_by(TrenchExcavation.Location).all()
+
+        # 3. Work Timeline (Business productivity trend)
+        # Assuming your models have a 'created_at' field
+        timeline_results = db.session.query(
+            func.date(TrenchExcavation.created_at), 
+            func.count(TrenchExcavation.id)
+        ).group_by(func.date(TrenchExcavation.created_at)).order_by(func.date(TrenchExcavation.created_at)).all()
+
+        return jsonify({
+            "summary": {
+                "trench": t_count,
+                "manhole": m_count,
+                "laying": l_count,
+                "total": t_count + m_count + l_count
+            },
+            "locations": {row[0]: row[1] for row in loc_results if row[0]},
+            "timeline": {str(row[0]): row[1] for row in timeline_results}
+        })
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
+
+
+# subcontractor dashboard
+@dashboard_bp.route("/subcontractor_dashboard")
+def subcontractor_dashboard():
+
+    if not session.get("user_id"):
+        return redirect(url_for("auth.login"))
+
+    subcontractors = Subcontractor.query.all()
+
+    return render_template(
+        "subcontractor_dashboard.html",
+        subcontractors=subcontractors
+    )
+
+
+# API FOR CHART DATA
+@dashboard_bp.route("/api/subcontractor-chart")
+def subcontractor_chart():
+
+    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 subcontractor_id:
+        query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
+
+    if category:
+        query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
+
+    if ra_bill:
+        query = query.filter(TrenchExcavation.RA_Bill_No == ra_bill)
+
+    results = query.group_by(TrenchExcavation.excavation_category).all()
+
+    labels = []
+    values = []
+
+    for r in results:
+        labels.append(r[0])
+        values.append(float(r[1] or 0))
+
+    return jsonify({
+        "labels": labels,
+        "values": values
+    })

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,6 +1,5 @@
 import pandas as pd
 import io
-import logging
 from flask import Blueprint, render_template, request, send_file, flash
 from app.utils.helpers import login_required
 
@@ -19,9 +18,6 @@ from app.models.laying_client_model import LayingClient
  
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
-
-# Configure logging for debugging
-logger = logging.getLogger(__name__)
  
 # --- Client class ---
 class ClientBill:
@@ -32,57 +28,20 @@ class ClientBill:
         self.df_laying = pd.DataFrame()
  
     def Fetch(self, RA_Bill_No):
-        logger.info("=" * 60)
-        logger.info("ClientBill.Fetch() - START")
-        logger.info("=" * 60)
-        logger.info(f"Fetching data for RA_Bill_No: '{RA_Bill_No}'")
-        logger.debug(f"  Type of RA_Bill_No: {type(RA_Bill_No)}")
-        
-        try:
-            logger.info("Step 1: Fetching TrenchExcavationClient records...")
-            trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-            logger.info(f"✓ Trench records found: {len(trench)}")
-            
-            logger.info("Step 2: Fetching ManholeExcavationClient records...")
-            mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-            logger.info(f"✓ Manhole records found: {len(mh)}")
-            
-            logger.info("Step 3: Fetching ManholeDomesticChamberClient records...")
-            dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-            logger.info(f"✓ Domestic Chamber records found: {len(dc)}")
-            
-            logger.info("Step 4: Fetching LayingClient records...")
-            lay = LayingClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-            logger.info(f"✓ Laying records found: {len(lay)}")
-            
-            logger.info("Step 5: Converting to DataFrames...")
-            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])
-            
-            logger.debug(f"  Trench DF shape: {self.df_tr.shape}")
-            logger.debug(f"  Manhole DF shape: {self.df_mh.shape}")
-            logger.debug(f"  Domestic Chamber DF shape: {self.df_dc.shape}")
-            logger.debug(f"  Laying DF shape: {self.df_laying.shape}")
-            
-            logger.info("Step 6: Cleaning DataFrames...")
-            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)
-                    logger.debug(f"  Cleaned DF with shape: {df.shape}")
-            
-            logger.info("✓ ClientBill.Fetch() completed successfully")
-            logger.info("=" * 60)
-            
-        except Exception as e:
-            logger.error("=" * 60)
-            logger.error(f"ERROR in ClientBill.Fetch(): {str(e)}")
-            logger.error(f"Error type: {type(e).__name__}")
-            logger.exception("Full traceback:")
-            logger.error("=" * 60)
-            raise
+        trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        lay = LayingClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+ 
+        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+        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 class ---
 class SubcontractorBill:
@@ -93,68 +52,26 @@ class SubcontractorBill:
         self.df_laying = pd.DataFrame()
  
     def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
-        logger.info("=" * 60)
-        logger.info("SubcontractorBill.Fetch() - START")
-        logger.info("=" * 60)
-        logger.info(f"Parameters:")
-        logger.info(f"  RA_Bill_No: '{RA_Bill_No}' (type: {type(RA_Bill_No)})")
-        logger.info(f"  subcontractor_id: '{subcontractor_id}' (type: {type(subcontractor_id)})")
-        
-        try:
-            filters = {}
-            if subcontractor_id:
-                filters["subcontractor_id"] = subcontractor_id
-                logger.debug(f"  Added filter - subcontractor_id: {subcontractor_id}")
-            if RA_Bill_No:
-                filters["RA_Bill_No"] = RA_Bill_No
-                logger.debug(f"  Added filter - RA_Bill_No: {RA_Bill_No}")
-            
-            logger.info(f"Applied filters: {filters}")
-            
-            logger.info("Step 1: Fetching TrenchExcavation records...")
-            trench = TrenchExcavation.query.filter_by(**filters).all()
-            logger.info(f"✓ Trench records found: {len(trench)}")
-            
-            logger.info("Step 2: Fetching ManholeExcavation records...")
-            mh = ManholeExcavation.query.filter_by(**filters).all()
-            logger.info(f"✓ Manhole records found: {len(mh)}")
-            
-            logger.info("Step 3: Fetching ManholeDomesticChamber records...")
-            dc = ManholeDomesticChamber.query.filter_by(**filters).all()
-            logger.info(f"✓ Domestic Chamber records found: {len(dc)}")
-            
-            logger.info("Step 4: Fetching Laying records...")
-            lay = Laying.query.filter_by(**filters).all()
-            logger.info(f"✓ Laying records found: {len(lay)}")
-            
-            logger.info("Step 5: Converting to DataFrames...")
-            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])
-            
-            logger.debug(f"  Trench DF shape: {self.df_tr.shape}")
-            logger.debug(f"  Manhole DF shape: {self.df_mh.shape}")
-            logger.debug(f"  Domestic Chamber DF shape: {self.df_dc.shape}")
-            logger.debug(f"  Laying DF shape: {self.df_laying.shape}")
-            
-            logger.info("Step 6: Cleaning DataFrames...")
-            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)
-                    logger.debug(f"  Cleaned DF with shape: {df.shape}")
-            
-            logger.info("✓ SubcontractorBill.Fetch() completed successfully")
-            logger.info("=" * 60)
-            
-        except Exception as e:
-            logger.error("=" * 60)
-            logger.error(f"ERROR in SubcontractorBill.Fetch(): {str(e)}")
-            logger.error(f"Error type: {type(e).__name__}")
-            logger.exception("Full traceback:")
-            logger.error("=" * 60)
-            raise
+        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  ---
@@ -224,20 +141,23 @@ def report_file():
         download_all=download_all
     )
  
-# --- client report only --- 
+
+# --- CLIENT REPORT (PREVIEW + DOWNLOAD) ---
 @file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
 def client_vs_all_subcontractor():
     tables = {"tr": None, "mh": None, "dc": None}
     ra_val = ""
- 
+
     if request.method == "POST":
+
+        # ⚠ MUST match HTML name
         RA_Bill_No = request.form.get("RA_Bill_No")
         ra_val = RA_Bill_No
- 
+
         if not RA_Bill_No:
             flash("Please enter RA Bill No.", "danger")
-            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+            return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
  
         clientBill = ClientBill()
         clientBill.Fetch(RA_Bill_No=RA_Bill_No)
@@ -247,7 +167,7 @@ def client_vs_all_subcontractor():
         # --- SAFETY CHECK: Verify data exists before merging ---
         if clientBill.df_tr.empty and clientBill.df_mh.empty:
             flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
-            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+            return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
  
         qty_cols = [...] # (Keep your existing list)
         mh_dc_qty_cols = [...] # (Keep your existing list)

app/routes/generate_comparison_report.py

@@ -2,7 +2,7 @@ from flask import Blueprint, render_template, request, send_file, flash
 from collections import defaultdict
 import pandas as pd
 import io
- 
+
 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
@@ -15,17 +15,13 @@ 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
+from app.utils.regex_utils import RegularExpression
  
  
 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):
@@ -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,26 +135,36 @@ 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
  
  
  
- 
 # EXCEL SHEET WRITER
 def write_sheet(writer, df, sheet_name, subcontractor_name):
     workbook = writer.book
+
+    # write dataframe (data already correct)
     df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
     ws = writer.sheets[sheet_name]
- 
+
+    # formats
     title_fmt = workbook.add_format({"bold": True, "font_size": 14})
-    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#B6DAED"})
-    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F3A081"})
-    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7D261"})
-    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#82DD49"})
-    default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})
- 
- 
+    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
+    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
+    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
+    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
+    default_header_fmt = workbook.add_format({
+        "bold": True,
+        "border": 1,
+        "bg_color": "#E7E6E6",
+        "align": "center",
+        "valign": "vcenter"
+    })
+
+    # titles
     ws.merge_range(
         0, 0, 0, len(df.columns) - 1,
         "CLIENT vs SUBCONTRACTOR",
@@ -168,22 +175,22 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
         f"Subcontractor Name - {subcontractor_name}",
         title_fmt
     )
- 
- 
+
+    # header formatting
     for col_num, col_name in enumerate(df.columns):
         if col_name.startswith("Client-"):
             ws.write(3, col_num, col_name, client_fmt)
         elif col_name.startswith("Subcontractor-"):
             ws.write(3, col_num, col_name, sub_fmt)
-        elif col_name.endswith("_total") or col_name.endswith("_total") :
+        elif col_name.endswith("Total"):
             ws.write(3, col_num, col_name, total_fmt)
         elif col_name == "Diff":
             ws.write(3, col_num, col_name, diff_fmt)
         else:
             ws.write(3, col_num, col_name, default_header_fmt)
- 
+
         ws.set_column(col_num, col_num, 20)
- 
+
  
 # REPORT ROUTE
 @generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
@@ -217,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()
@@ -246,107 +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

@@ -1,191 +1,159 @@
-from flask import Blueprint, render_template, request, redirect, flash
-from app import db
+from flask import Blueprint, render_template, request, redirect, flash, current_app, url_for
+from app.services.db_service import db
 from app.models.subcontractor_model import Subcontractor
 from app.utils.helpers import login_required
- 
+
 subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
- 
-# ---------------- ADD -----------------
-@subcontractor_bp.route("/add")
-@login_required
-def add_subcontractor():
-    return render_template("subcontractor/add.html")
-@subcontractor_bp.route("/save", methods=["POST"])
-@login_required
-def save_subcontractor():
-    # 1. Get and clean the name from the form
-    name = request.form.get("subcontractor_name", "").strip()
- 
-    # 2. Basic validation: Ensure the name isn't empty
-    if not name:
-        flash("Subcontractor name cannot be empty.", "danger")
-        return redirect("/subcontractor/add")
- 
-    # 3. Check if a subcontractor with this name already exists
-    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
- 
-    if existing_sub:
-        flash(f"Subcontractor with name '{name}' already exists!", "danger")
-        return redirect("/subcontractor/add")
- 
-    # 4. If no duplicate is found, proceed to save
-    try:
-        subcontractor = Subcontractor(
-            subcontractor_name=name,
-            contact_person=request.form.get("contact_person"),
-            mobile_no=request.form.get("mobile_no"),
-            email_id=request.form.get("email_id"),
-            gst_no=request.form.get("gst_no")
-        )
-       
-        db.session.add(subcontractor)
-        db.session.commit()
-        flash("Subcontractor added successfully!", "success")
-       
-    except Exception as e:
-        db.session.rollback()
-        flash("An error occurred while saving. Please try again.", "danger")
- 
-    return redirect("/subcontractor/list")
- 
-# ---------------- LIST -----------------
-@subcontractor_bp.route("/list")
-@login_required
-def subcontractor_list():
-    subcontractors = Subcontractor.query.all()
-    return render_template("subcontractor/list.html", subcontractors=subcontractors)
- 
-# ---------------- EDIT -----------------
-@subcontractor_bp.route("/edit/<int:id>")
-@login_required
-def edit_subcontractor(id):
-    subcontractor = Subcontractor.query.get_or_404(id)
-    return render_template("subcontractor/edit.html", subcontractor=subcontractor)
- 
-# ---------------- UPDATE -----------------
-@subcontractor_bp.route("/update/<int:id>", methods=["POST"])
-@login_required
-def update_subcontractor(id):
-    subcontractor = Subcontractor.query.get_or_404(id)
-    new_name = request.form.get("subcontractor_name")
- 
-    # Check if the new name is taken by someone ELSE (not this current ID)
-    duplicate = Subcontractor.query.filter(
-        Subcontractor.subcontractor_name == new_name,
-        Subcontractor.id != id
-    ).first()
- 
-    if duplicate:
-        flash("Another subcontractor already uses this name.", "danger")
-        return redirect(f"/subcontractor/edit/{id}")
- 
-    subcontractor.subcontractor_name = new_name
-   
-    db.session.commit()
-   
-    flash("Subcontractor updated successfully!", "success")
-    return redirect("/subcontractor/list")
- 
-# ---------------- DELETE -----------------
-@subcontractor_bp.route("/delete/<int:id>")
-@login_required
-def delete_subcontractor(id):
-    subcontractor = Subcontractor.query.get_or_404(id)
- 
-    db.session.delete(subcontractor)
-    db.session.commit()
- 
-    flash("Subcontractor deleted successfully!", "success")
-    return redirect("/subcontractor/list")
-from flask import Blueprint, render_template, request, redirect, flash
-from app import db
-from app.models.subcontractor_model import Subcontractor
-from app.utils.helpers import login_required
- 
-subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
- 
+
+
 # ---------------- ADD -----------------
 @subcontractor_bp.route("/add")
 @login_required
 def add_subcontractor():
+    current_app.logger.info("Opened Add Subcontractor Page")
     return render_template("subcontractor/add.html")
 
+
+# ---------------- SAVE -----------------
 @subcontractor_bp.route("/save", methods=["POST"])
 @login_required
 def save_subcontractor():
+
     name = request.form.get("subcontractor_name", "").strip()
+
     if not name:
+        current_app.logger.warning("Empty subcontractor name submitted")
         flash("Subcontractor name cannot be empty.", "danger")
-        return redirect("/subcontractor/add")
+        return redirect(url_for("subcontractor.add_subcontractor"))
+
     existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
- 
+
     if existing_sub:
+        current_app.logger.warning(f"Duplicate subcontractor attempt: {name}")
         flash(f"Subcontractor with name '{name}' already exists!", "danger")
-        return redirect("/subcontractor/add")
+        return redirect(url_for("subcontractor.add_subcontractor"))
+
     try:
         subcontractor = Subcontractor(
             subcontractor_name=name,
             contact_person=request.form.get("contact_person"),
+            address=request.form.get("address"),
             mobile_no=request.form.get("mobile_no"),
             email_id=request.form.get("email_id"),
-            gst_no=request.form.get("gst_no")
+            gst_no=request.form.get("gst_no"),
+            pan_no=request.form.get("pan_no")
         )
-       
+
         db.session.add(subcontractor)
         db.session.commit()
+
+        current_app.logger.info(f"Subcontractor Created Successfully: {name}")
         flash("Subcontractor added successfully!", "success")
-       
-    except Exception as e:
+
+    except Exception:
         db.session.rollback()
-        flash("An error occurred while saving. Please try again.", "danger")
- 
-    return redirect("/subcontractor/list")
- 
-# ---------------- LIST -----------------
+        current_app.logger.exception("Error while saving subcontractor")
+        flash("An error occurred while saving.", "danger")
+
+    return redirect(url_for("subcontractor.subcontractor_list"))
+
+
+# ---------------- LIST (UPDATED WITH PAGINATION) -----------------
 @subcontractor_bp.route("/list")
 @login_required
 def subcontractor_list():
-    subcontractors = Subcontractor.query.all()
-    return render_template("subcontractor/list.html", subcontractors=subcontractors)
- 
+
+    page = request.args.get("page", 1, type=int)
+    per_page = 10  # Change how many records per page
+
+    pagination = Subcontractor.query.order_by(
+        Subcontractor.created_at
+    ).paginate(
+        page=page,
+        per_page=per_page,
+        error_out=False
+    )
+
+    subcontractors = pagination.items
+
+    current_app.logger.info(f"Viewed Subcontractor List - Page {page}")
+
+    return render_template(
+        "subcontractor/list.html",
+        subcontractors=subcontractors,
+        pagination=pagination
+    )
+
+
 # ---------------- EDIT -----------------
 @subcontractor_bp.route("/edit/<int:id>")
 @login_required
 def edit_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
+    current_app.logger.info(f"Editing Subcontractor ID: {id}")
     return render_template("subcontractor/edit.html", subcontractor=subcontractor)
- 
+
+
 # ---------------- UPDATE -----------------
 @subcontractor_bp.route("/update/<int:id>", methods=["POST"])
 @login_required
 def update_subcontractor(id):
+
     subcontractor = Subcontractor.query.get_or_404(id)
-    new_name = request.form.get("subcontractor_name")
- 
-    # Check if the new name is taken by someone ELSE (not this current ID)
+    new_name = request.form.get("subcontractor_name", "").strip()
+
     duplicate = Subcontractor.query.filter(
         Subcontractor.subcontractor_name == new_name,
         Subcontractor.id != id
     ).first()
- 
+
     if duplicate:
+        current_app.logger.warning(f"Duplicate update attempt: {new_name}")
         flash("Another subcontractor already uses this name.", "danger")
-        return redirect(f"/subcontractor/edit/{id}")
- 
-    subcontractor.subcontractor_name = new_name
-    db.session.commit()
-   
-    flash("Subcontractor updated successfully!", "success")
-    return redirect("/subcontractor/list")
- 
+        return redirect(url_for("subcontractor.edit_subcontractor", id=id))
+
+    try:
+        old_name = subcontractor.subcontractor_name
+
+        subcontractor.subcontractor_name = new_name
+        subcontractor.contact_person = request.form.get("contact_person")
+        subcontractor.address = request.form.get("address")
+        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.pan_no = request.form.get("pan_no")
+        subcontractor.status = request.form.get("status")
+
+        db.session.commit()
+
+        current_app.logger.info(f"Subcontractor Updated: {old_name} → {new_name}")
+        flash("Subcontractor updated successfully!", "success")
+
+    except Exception:
+        db.session.rollback()
+        current_app.logger.exception("Error updating subcontractor")
+        flash("Update failed!", "danger")
+
+    return redirect(url_for("subcontractor.subcontractor_list"))
+
+
 # ---------------- DELETE -----------------
 @subcontractor_bp.route("/delete/<int:id>")
 @login_required
 def delete_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
 
-    db.session.delete(subcontractor)
-    db.session.commit()
+    try:
+        name = subcontractor.subcontractor_name
+        db.session.delete(subcontractor)
+        db.session.commit()
 
-    flash("Subcontractor deleted successfully!", "success")
-    return redirect("/subcontractor/list")
+        current_app.logger.info(f"Subcontractor Deleted: {name}")
+        flash("Subcontractor deleted successfully!", "success")
+
+    except Exception:
+        db.session.rollback()
+        current_app.logger.exception("Error deleting subcontractor")
+        flash("Delete failed!", "danger")
+
+    return redirect(url_for("subcontractor.subcontractor_list"))

app/routes/user.py

@@ -1,11 +1,13 @@
 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")
+    return render_template("users.html", users=users, title="Users")

app/services/logger_service.py

@@ -0,0 +1,79 @@
+import os
+import logging
+from logging.handlers import RotatingFileHandler
+from flask import request, session, has_request_context
+
+
+class RequestContextFilter(logging.Filter):
+
+    def filter(self, record):
+
+        if has_request_context():
+            record.user = session.get("user_email", "Anonymous")
+            record.ip = request.remote_addr
+            record.method = request.method
+            record.url = request.url
+        else:
+            record.user = "System"
+            record.ip = "N/A"
+            record.method = "N/A"
+            record.url = "N/A"
+
+        return True
+
+
+class LoggerService:
+
+    @staticmethod
+    def init_app(app):
+
+        if not os.path.exists("logs"):
+            os.makedirs("logs")
+
+        formatter = logging.Formatter(
+            "%(asctime)s | %(levelname)s | "
+            "User:%(user)s | IP:%(ip)s | "
+            "Method:%(method)s | URL:%(url)s | "
+            "%(message)s"
+        )
+
+        # INFO LOG
+        info_handler = RotatingFileHandler(
+            "logs/app.log",
+            maxBytes=5 * 1024 * 1024,
+            backupCount=5
+        )
+        info_handler.setLevel(logging.INFO)
+        info_handler.setFormatter(formatter)
+
+        # ERROR LOG
+        error_handler = RotatingFileHandler(
+            "logs/error.log",
+            maxBytes=5 * 1024 * 1024,
+            backupCount=5
+        )
+        error_handler.setLevel(logging.ERROR)
+        error_handler.setFormatter(formatter)
+
+        # CONSOLE
+        console_handler = logging.StreamHandler()
+        console_handler.setLevel(logging.DEBUG)
+        console_handler.setFormatter(formatter)
+
+        # 🔹 ADD FILTER (important)
+        context_filter = RequestContextFilter()
+
+        info_handler.addFilter(context_filter)
+        error_handler.addFilter(context_filter)
+        console_handler.addFilter(context_filter)
+
+        app.logger.setLevel(logging.DEBUG)
+
+        app.logger.addHandler(info_handler)
+        app.logger.addHandler(error_handler)
+        app.logger.addHandler(console_handler)
+
+        # Log every request automatically
+        @app.before_request
+        def log_request():
+            app.logger.info("Request Started")

app/templates/base.html

@@ -38,7 +38,7 @@
                     <!-- Dashboard -->
                     <li class="nav-item">
                         <a class="nav-link" href="/dashboard">
-                            <i class="bi bi-speedometer2 me-1"></i> Dashboard - Anish
+                            <i class="bi bi-speedometer2 me-1"></i> Dashboard
                         </a>
                     </li>
 

app/templates/client_report.html

@@ -16,13 +16,12 @@
                 </div>
                 <div class="col-md-6">
                     <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
-                        Report Anish anassdfsdfdfasfd Prajakta</button>
-                </div> 
+                        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>
@@ -30,20 +29,25 @@
         <ul class="nav nav-tabs" id="reportTabs" role="tablist">
             <li class="nav-item">
                 <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
-                    type="button">Tr.Ex Comparison</button>
+                    type="button">Tr.Ex </button>
             </li>
             <li class="nav-item">
                 <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
-                    Comparison</button>
+                    </button>
             </li>
             <li class="nav-item">
                 <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
-                    Comparison</button>
+                    </button>
             </li>
             <li class="nav-item">
+<<<<<<< HEAD
                 <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
                     type="button">Laying
                     & Bedding Comparison</button>
+=======
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                    & Bedding </button>
+>>>>>>> 1dceb640bd930c37888799f10f02fe90b219be67
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">
@@ -72,4 +76,5 @@
         {% endif %}
 
     </div>
-    {% endblock %}
+</div>
+{% endblock %}

app/templates/dashboard.html

@@ -1,82 +1,51 @@
 {% extends "base.html" %}
 
 {% block content %}
-<div class="container-fluid py-4" style="background-color: #f8f9fa;">
-    <h3 class="mb-4 fw-bold text-uppercase">Abstract Excavation Dashboard</h3>
+<div class="container-fluid px-2 px-md-4">
+    <h4 class="mb-3 text-center text-md-start">Comparison Software Solapur (UGD) - Live Dashboard</h4>
 
-    <div class="card shadow-sm mb-4">
-        <div class="card-body bg-white">
-            <div class="row g-3">
-                <div class="col-md-2">
-                    <label class="form-label fw-bold">Comparison Type</label>
-                    <select id="filter-table" class="form-select" onchange="loadDashboardData()">
-                        <option value="trench">Trench Excavation</option>
-                        <option value="manhole">Manhole Excavation</option>
-                        <option value="laying">Laying</option>
-                    </select>
+    <div class="row g-3 mb-4">
+        <div class="col-12 col-md-4">
+            <div class="card text-white bg-primary shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Trenching Units</h6>
+                    <h3 class="fw-bold" id="card-trench">0</h3>
                 </div>
-                <div class="col-md-3">
-                    <label class="form-label fw-bold">Subcontractor</label>
-                    <select id="filter-subcon" class="form-select" onchange="loadDashboardData()">
-                        <option value="All">All Subcontractors</option>
-                    </select>
+            </div>
+        </div>
+        <div class="col-12 col-md-4">
+            <div class="card text-white bg-success shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Manhole Units</h6>
+                    <h3 class="fw-bold" id="card-manhole">0</h3>
                 </div>
-                <div class="col-md-3">
-                    <label class="form-label fw-bold">RA Bill No</label>
-                    <select id="filter-ra" class="form-select" onchange="loadDashboardData()">
-                        <option value="Cumulative">Cumulative (All Bills)</option>
-                    </select>
-                </div>
-                <div class="col-md-4 d-flex align-items-end gap-2">
-                    <button class="btn btn-primary flex-grow-1" onclick="loadDashboardData()">🔄 Refresh</button>
-                    <button class="btn btn-secondary flex-grow-1" onclick="clearDashboard()">🗑️ Clear</button>
+            </div>
+        </div>
+        <div class="col-12 col-md-4">
+            <div class="card text-dark bg-warning shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Laying Units</h6>
+                    <h3 class="fw-bold" id="card-laying">0</h3>
                 </div>
             </div>
         </div>
     </div>
 
-    <!-- Empty State (Shown on page load) -->
-    <div id="empty-state" class="alert alert-info text-center py-5">
-        <h5>📊 Select filters to display data</h5>
-        <p>Choose a Subcontractor and/or RA Bill to see the excavation abstract comparison.</p>
-    </div>
-
-    <!-- Data Display Area (Hidden by default) -->
-    <div id="data-area" style="display: none;">
-        <div class="row">
-            <div class="col-lg-8">
-                <div class="card shadow-sm h-100">
-                    <div class="card-header bg-primary text-white fw-bold d-flex justify-content-between align-items-center">
-                        <span id="chart-title">Excavation Comparison: Client vs Subcontractor Qty</span>
-                        <small class=\"fw-normal\">(Horizontal Bar Chart)</small>
-                    </div>
-                    <div class=\"card-body\" style=\"position: relative; height: 700px; overflow-y: auto;\">
-                        <canvas id="groupedBarChart"></canvas>
-                    </div>
+    <div class="row g-3">
+        <div class="col-12 col-md-6">
+            <div class="card shadow-sm h-100">
+                <div class="card-header bg-dark text-white">Live Category Bar Chart</div>
+                <div class="card-body">
+                    <canvas id="liveBarChart" style="max-height:300px;"></canvas>
                 </div>
             </div>
+        </div>
 
-            <div class="col-lg-4">
-                <div class="card shadow-sm h-100">
-                    <div class="card-header bg-success text-white fw-bold">Excavation Abstract Table</div>
-                    <div class="card-body p-0">
-                        <div class="table-responsive" style="max-height: 500px; overflow-y: auto;">
-                            <table class="table table-hover mb-0" id="abstract-table">
-                                <thead class="table-light sticky-top">
-                                    <tr>
-                                        <th class="small">Soil / Depth</th>
-                                        <th class="small">Client (m³)</th>
-                                        <th class="small">Subcon (m³)</th>
-                                        <th class="small">Diff</th>
-                                    </tr>
-                                </thead>
-                                <tbody></tbody>
-                                <tfoot class="table-light fw-bold position-sticky bottom-0">
-                                    <tr id="table-totals" class="bg-light"></tr>
-                                </tfoot>
-                            </table>
-                        </div>
-                    </div>
+        <div class="col-12 col-md-6">
+            <div class="card shadow-sm h-100">
+                <div class="card-header bg-dark text-white">Location Distribution Pie Chart</div>
+                <div class="card-body">
+                    <canvas id="livePieChart" style="max-height:300px;"></canvas>
                 </div>
             </div>
         </div>
@@ -86,290 +55,64 @@
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 
 <script>
-let comparisonChart;
-
-// Define color palette - ONLY 2 COLORS
-const colorPalette = {
-    'client': '#003D7A',      // Dark Blue for Client (RA Bill)
-    'subcon': '#87CEEB'       // Light Sky Blue for Subcontractor
-};
-
-// 1. Function to Initialize or Update the Chart (VERTICAL BARS - 2 COLORS ONLY)
-function updateChartUI(labels, clientData, subconData) {
-    const ctx = document.getElementById('groupedBarChart').getContext('2d');
-    if (comparisonChart) comparisonChart.destroy();
-
-    comparisonChart = new Chart(ctx, {
-        type: 'bar', // Vertical bar chart
+    // 2. Initialize the Bar Chart
+    const barCtx = document.getElementById('liveBarChart').getContext('2d');
+    let liveBarChart = new Chart(barCtx, {
+        type: 'bar',
         data: {
-            labels: labels,
-            datasets: [
-                { 
-                    label: 'Client Qty (m³)',
-                    data: clientData,
-                    backgroundColor: colorPalette.client,
-                    borderColor: '#001F4D',
-                    borderWidth: 1,
-                    borderRadius: 4,
-                    hoverBackgroundColor: '#002A5C',
-                    hoverBorderWidth: 2
-                },
-                { 
-                    label: 'Subcontractor Qty (m³)',
-                    data: subconData,
-                    backgroundColor: colorPalette.subcon,
-                    borderColor: '#4A90B8',
-                    borderWidth: 1,
-                    borderRadius: 4,
-                    hoverBackgroundColor: '#6BB3D9',
-                    hoverBorderWidth: 2
-                }
-            ]
+            labels: ['Trenching', 'Manholes', 'Laying'],
+            datasets: [{
+                label: 'Units Completed',
+                data: [0, 0, 0],
+                backgroundColor: ['#0d6efd', '#198754', '#ffc107']
+            }]
         },
-        options: {
-            indexAxis: 'x', // Vertical bars (default)
-            responsive: true,
-            maintainAspectRatio: false,
-            interaction: {
-                intersect: false,
-                mode: 'index'
-            },
-            plugins: {
-                legend: {
-                    position: 'top',
-                    labels: {
-                        font: { size: 14, weight: 'bold' },
-                        padding: 15,
-                        usePointStyle: true,
-                        boxWidth: 15
-                    }
-                },
-                tooltip: {
-                    backgroundColor: '#2c3e50',
-                    padding: 12,
-                    titleFont: { size: 13, weight: 'bold' },
-                    bodyFont: { size: 12 },
-                    borderColor: '#fff',
-                    borderWidth: 1,
-                    displayColors: true,
-                    callbacks: {
-                        label: function(context) {
-                            let label = context.dataset.label || '';
-                            if (label) label += ': ';
-                            label += Number(context.parsed.y).toLocaleString('en-IN', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
-                            }) + ' m³';
-                            return label;
-                        }
-                    }
-                }
-            },
-            scales: {
-                x: {
-                    stacked: false,
-                    grid: {
-                        display: false
-                    },
-                    ticks: {
-                        font: { size: 11 },
-                        maxRotation: 45,
-                        minRotation: 0
-                    }
-                },
-                y: {
-                    stacked: false,
-                    beginAtZero: true,
-                    grid: {
-                        color: '#ecf0f1',
-                        drawBorder: false
-                    },
-                    ticks: {
-                        font: { size: 11 },
-                        callback: function(value) {
-                            return Number(value).toLocaleString('en-IN');
-                        }
-                    },
-                    title: {
-                        display: true,
-                        text: 'Excavation Quantity (m³)',
-                        font: { size: 12, weight: 'bold' }
-                    }
-                }
-            }
-        }
+        options: { responsive: true, maintainAspectRatio: false }
     });
-}
 
-// 2. Function to fetch unique filters (Subcontractors & RA Bills) from DB
-function loadFilters() {
-    console.log("🔄 Loading filters from /dashboard/api/filters...");
-    fetch('/dashboard/api/filters')
-        .then(res => {
-            console.log(`Response status: ${res.status}`);
-            return res.json();
-        })
-        .then(data => {
-            console.log("✓ Filter data received:", data);
-            
-            const raSelect = document.getElementById('filter-ra');
-            
-            // CRITICAL: This clears the "RA-01", "RA-02" you typed in manually
-            raSelect.innerHTML = '<option value="Cumulative">Cumulative (All Bills)</option>';
+    // 3. Initialize the Pie Chart
+    const pieCtx = document.getElementById('livePieChart').getContext('2d');
+    let livePieChart = new Chart(pieCtx, {
+        type: 'pie',
+        data: {
+            labels: [], // Will be filled from SQL
+            datasets: [{
+                data: [],
+                backgroundColor: ['#0d6efd', '#198754', '#ffc107', '#6f42c1', '#fd7e14']
+            }]
+        },
+        options: { responsive: true, maintainAspectRatio: false }
+    });
 
-            if (data.ra_bills && data.ra_bills.length > 0) {
-                console.log(`Adding ${data.ra_bills.length} RA bills to dropdown`);
-                data.ra_bills.forEach(billNo => {
-                    let opt = document.createElement('option');
-                    opt.value = billNo;
-                    opt.innerText = billNo; // This will show exactly what's in the DB
-                    raSelect.appendChild(opt);
-                    console.log(`  + Added RA Bill: ${billNo}`);
-                });
-            } else {
-                console.warn("❌ No RA bills found in response");
-            }
-            
-            // Repeat same for subcontractor dropdown
-            const subconSelect = document.getElementById('filter-subcon');
-            subconSelect.innerHTML = '<option value="All">All Subcontractors</option>';
-            if (data.subcontractors && data.subcontractors.length > 0) {
-                data.subcontractors.forEach(name => {
-                    let opt = document.createElement('option');
-                    opt.value = name;
-                    opt.innerText = name;
-                    subconSelect.appendChild(opt);
-                });
-            }
-            console.log("✓ Filters loaded successfully");
-        })
-        .catch(err => {
-            console.error("❌ Error loading filters:", err);
-        });
-}
-// 3. Main function to load data and reflect in UI
-function loadDashboardData() {
-    const tableType = document.getElementById('filter-table').value;
-    const subcon = document.getElementById('filter-subcon').value;
-    const ra = document.getElementById('filter-ra').value;
+    // 4. Function to Fetch Live Data from your Python API
+    function fetchLiveData() {
+        fetch('/dashboard/api/live-stats') // This matches the route we created in the "Kitchen"
+            .then(response => response.json())
+            .then(data => {
+                // Update the Summary Cards
+                document.getElementById('card-trench').innerText = data.summary.trench;
+                document.getElementById('card-manhole').innerText = data.summary.manhole;
+                document.getElementById('card-laying').innerText = data.summary.laying;
 
-    console.log(`📊 Filter values: Table="${tableType}", Subcon="${subcon}", RA="${ra}"`);
+                // Update Bar Chart
+                liveBarChart.data.datasets[0].data = [
+                    data.summary.trench,
+                    data.summary.manhole,
+                    data.summary.laying
+                ];
+                liveBarChart.update();
 
-    // If still on default values, don't load
-    if (subcon === 'All' && ra === 'Cumulative') {
-        console.warn("⚠️  Please select filters first");
-        return;
+                // Update Pie Chart (Location stats)
+                livePieChart.data.labels = Object.keys(data.locations);
+                livePieChart.data.datasets[0].data = Object.values(data.locations);
+                livePieChart.update();
+            })
+            .catch(err => console.error("Error fetching live data:", err));
     }
 
-    // Update chart title
-    const tableNames = {
-        'trench': 'Trench Excavation',
-        'manhole': 'Manhole Excavation',
-        'laying': 'Laying'
-    };
-    const chartTitle = document.getElementById('chart-title');
-    if (chartTitle) {
-        chartTitle.textContent = `${tableNames[tableType]}: Client (RA Bill) vs Subcontractor Qty`;
-    }
-
-    console.log(`📊 Loading dashboard data: Table="${tableType}", Subcon="${subcon}", RA="${ra}"`);
-    
-    const url = `/dashboard/api/excavation-abstract?table_type=${encodeURIComponent(tableType)}&subcontractor=${encodeURIComponent(subcon)}&ra_bill=${encodeURIComponent(ra)}`;
-    console.log(`Fetching from URL: ${url}`);
-    
-    fetch(url)
-        .then(res => {
-            console.log(`Response status: ${res.status}`);
-            if (!res.ok) {
-                throw new Error(`HTTP Error: ${res.status}`);
-            }
-            return res.json();
-        })
-        .then(data => {
-            console.log("✓ Dashboard data received:", data);
-            
-            if (!Array.isArray(data)) {
-                console.error("❌ Response is not an array:", data);
-                return;
-            }
-            
-            if (data.length === 0) {
-                console.warn("⚠️  No data returned for this filter combination");
-                alert("No data found for selected filters");
-                return;
-            }
-            
-            const labels = [];
-            const clientData = [];
-            const subconData = [];
-            const tableBody = document.querySelector("#abstract-table tbody");
-            tableBody.innerHTML = "";
-
-            let tClient = 0, tSub = 0, tDiff = 0;
-
-            data.forEach(item => {
-                // Label format: "Soil Type Depth"
-                const label = `${item.soil_type}\n${item.depth}`;
-                labels.push(label);
-                clientData.push(item.client_qty || 0);
-                subconData.push(item.subcon_qty || 0);
-
-                tClient += item.client_qty || 0;
-                tSub += item.subcon_qty || 0;
-                tDiff += (item.difference || 0);
-
-                const diffColor = (item.difference || 0) < 0 ? 'text-danger' : 'text-success';
-                tableBody.innerHTML += `
-                    <tr>
-                        <td class="small">
-                            <strong>${item.soil_type}</strong>
-                            <br>
-                            <span class="text-muted small">${item.depth}</span>
-                        </td>
-                        <td class="small text-primary fw-bold">${(item.client_qty || 0).toLocaleString('en-IN', {maximumFractionDigits: 2})}</td>
-                        <td class="small text-success fw-bold">${(item.subcon_qty || 0).toLocaleString('en-IN', {maximumFractionDigits: 2})}</td>
-                        <td class="small fw-bold ${diffColor}">${(item.difference || 0).toLocaleString('en-IN', {maximumFractionDigits: 2})}</td>
-                    </tr>
-                `;
-            });
-
-            const totalDiffColor = tDiff < 0 ? 'text-danger' : 'text-success';
-            document.getElementById('table-totals').innerHTML = `
-                <td class="small fw-bold">TOTAL</td>
-                <td class="small fw-bold text-primary">${tClient.toLocaleString('en-IN', {maximumFractionDigits: 2})}</td>
-                <td class="small fw-bold text-success">${tSub.toLocaleString('en-IN', {maximumFractionDigits: 2})}</td>
-                <td class="small fw-bold ${totalDiffColor}">${tDiff.toLocaleString('en-IN', {maximumFractionDigits: 2})}</td>
-            `;
-
-            // Show data area
-            document.getElementById('empty-state').style.display = 'none';
-            document.getElementById('data-area').style.display = 'block';
-
-            updateChartUI(labels, clientData, subconData);
-            console.log("✓ Chart and table updated successfully");
-        })
-        .catch(err => {
-            console.error("❌ Error loading dashboard data:", err);
-            alert(`Failed to load dashboard data: ${err.message}`);
-        });
-}
-
-// Clear dashboard
-function clearDashboard() {
-    console.log("🗑️  Clearing dashboard...");
-    document.getElementById('filter-table').value = 'trench';
-    document.getElementById('filter-subcon').value = 'All';
-    document.getElementById('filter-ra').value = 'Cumulative';
-    document.getElementById('empty-state').style.display = 'block';
-    document.getElementById('data-area').style.display = 'none';
-    if (comparisonChart) comparisonChart.destroy();
-}
-
-// Start: Load filters only, don't auto-load data
-document.addEventListener("DOMContentLoaded", () => {
-    console.log("🚀 Dashboard initialized");
-    loadFilters();
-    // Don't auto-load data - keep dashboard blank until filters selected
-});
+    // 5. Check for updates every 10 seconds (Real-time effect)
+    setInterval(fetchLiveData, 10000);
+    fetchLiveData(); // Load immediately on page open
 </script>
-{% endblock %}  
+
+{% endblock %}

app/templates/subcontractor/add.html

@@ -2,39 +2,49 @@
 {% block content %}
 
 <div class="card shadow-sm p-4">
-
     <h4 class="mb-3">Add New Subcontractor</h4>
 
-    <form action="/subcontractor/save" method="POST">
+    <form action="{{ url_for('subcontractor.save_subcontractor') }}" method="POST">
 
         <div class="mb-3">
-            <label class="form-label">Subcontractor Name</label>
+            <label class="form-label">Subcontractor Name:</label>
             <input type="text" class="form-control" name="subcontractor_name" required>
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Contact Person Name</label>
+            <label class="form-label">Contact Person Name:</label>
             <input type="text" class="form-control" name="contact_person">
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Mobile</label>
+            <label class="form-label">Address:</label>
+            <textarea type="text" class="form-control" name="address"></textarea>
+        </div>
+
+        <div class="mb-3">
+            <label class="form-label">Mobile No:</label>
             <input type="text" class="form-control" name="mobile_no">
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Email</label>
+            <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>
+            <label class="form-label">GST No:</label>
             <input type="text" class="form-control" name="gst_no">
         </div>
 
-        <button class="btn btn-success">Save</button>
-    </form>
+        <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/edit.html

@@ -4,36 +4,58 @@
 <div class="card shadow-sm p-4">
     <h4 class="mb-3">Edit Subcontractor</h4>
 
-    <form action="/subcontractor/update/{{ subcontractor.id }}" method="POST">
+    <form action="{{ url_for('subcontractor.update_subcontractor', id=subcontractor.id) }}" method="POST">
 
         <div class="mb-3">
-            <label class="form-label">Subcontractor Name</label>
+            <label class="form-label">Subcontractor Name:</label>
             <input type="text" class="form-control" name="subcontractor_name"
                 value="{{ subcontractor.subcontractor_name }}" required>
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Contact Person</label>
+            <label class="form-label">Contact Person Name:</label>
             <input type="text" class="form-control" name="contact_person" value="{{ subcontractor.contact_person }}">
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Mobile</label>
+            <label class="form-label">Address:</label>
+            <input type="text" class="form-control" name="address" value="{{ subcontractor.address }}">
+        </div>
+
+        <div class="mb-3">
+            <label class="form-label">Mobile No:</label>
             <input type="text" class="form-control" name="mobile_no" value="{{ subcontractor.mobile_no }}">
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Email</label>
+            <label class="form-label">Email:</label>
             <input type="email" class="form-control" name="email_id" value="{{ subcontractor.email_id }}">
         </div>
 
         <div class="mb-3">
-            <label class="form-label">GST No</label>
+            <label class="form-label">GST No:</label>
             <input type="text" class="form-control" name="gst_no" value="{{ subcontractor.gst_no }}">
         </div>
 
+        <div class="mb-3">
+            <label class="form-label">PAN No:</label>
+            <input type="text" class="form-control" name="pan_no" value="{{ subcontractor.pan_no }}">
+        </div>
+
+        <div class="mb-3">
+            <label class="form-label">Status:</label>
+            <select name="status" class="form-control">
+                <option value="Active" {% if subcontractor.status=="Active" %}selected{% endif %}>
+                    Active
+                </option>
+                <option value="Inactive" {% if subcontractor.status=="Inactive" %}selected{% endif %}>
+                    Inactive
+                </option>
+            </select>
+        </div>
+
         <button class="btn btn-success">Update</button>
-        <a href="/subcontractor/list" class="btn btn-secondary">Back</a>
+        <a href="{{ url_for('subcontractor.subcontractor_list') }}" class="btn btn-secondary">Back</a>
 
     </form>
 </div>

app/templates/subcontractor/list.html

@@ -1,89 +1,160 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="card shadow-sm p-3 p-md-4">
+<div class="container mt-4">
 
-    <!-- Header -->
-    <div class="row mb-3 align-items-center">
-        <div class="col-12 col-md-6 ">
-            <h4 class="mb-2 mb-md-0 text-center text-md-start">
-                Subcontractor List
-            </h4>
-        </div>
+    <div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center mb-3">
+        <h4 class="mb-3 mb-md-0">Subcontractor List</h4>
 
-        <div class="col-12 col-md-3 text-center text-md-end">
-            <a href="/subcontractor/add" class="btn btn-success w-100 w-md-auto">
-                ➕ Add Subcontractor
-            </a>
-        </div>
+        <a href="{{ url_for('subcontractor.add_subcontractor') }}" class="btn btn-primary btn-sm">
+            + Add Subcontractor
+        </a>
     </div>
 
+    <div class="card shadow-sm">
+        <div class="card-body p-2 p-md-3">
 
-    <div class="table-responsive">
-        <table class="table table-bordered table-striped align-middle text-nowrap">
-            <thead class="table-dark">
-                <tr>
-                    <th>ID</th>
-                    <th>Name</th>
-                    <th class="d-none d-md-table-cell">Mobile</th>
-                    <th class="d-none d-lg-table-cell">Email</th>
-                    <th class="d-none d-lg-table-cell">GST No</th>
-                    <th class="text-center">Action</th>
-                </tr>
-            </thead>
+            <!-- Desktop Table View -->
+            <div class="table-responsive d-none d-md-block">
+                <table class="table table-bordered table-hover align-middle">
+                    <thead class="table-dark">
+                        <tr>
+                            <th>Sr. No</th>
+                            <th>Subcontractor Name</th>
+                            <th>GST No</th>
+                            <th>Mobile</th>
+                            <th>Email</th>
+                            <th>Status</th>
+                            <th width="150">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for s in subcontractors %}
+                        <tr>
+                            <td>{{ s.id }}</td>
+                            <td>{{ s.subcontractor_name }}</td>
+                            <td>{{ s.gst_no }}</td>
+                            <td>{{ s.mobile_no }}</td>
+                            <td>{{ s.email_id }}</td>
+                            <td>
+                                {% if s.status == "Active" %}
+                                <span class="badge bg-success">Active</span>
+                                {% else %}
+                                <span class="badge bg-danger">Inactive</span>
+                                {% endif %}
+                            </td>
+                            <td>
+                                <a href="{{ url_for('subcontractor.edit_subcontractor', id=s.id) }}"
+                                    class="btn btn-sm btn-warning mb-1">
+                                    Edit
+                                </a>
 
-            <tbody>
+                                <a href="{{ url_for('subcontractor.delete_subcontractor', id=s.id) }}"
+                                    class="btn btn-sm btn-danger" onclick="return confirm('Are you sure to delete?')">
+                                    Delete
+                                </a>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+
+            <!-- Mobile Card View -->
+            <div class="d-md-none">
                 {% for s in subcontractors %}
-                <tr>
-                    <td>{{ s.id }}</td>
+                <div class="card mb-3 shadow-sm">
+                    <div class="card-body p-3">
+                        <h5 class="fw-bold mb-2">{{ s.subcontractor_name }}</h5>
 
-                    <td class="fw-semibold text-wrap">
-                        {{ s.subcontractor_name }}
-                    </td>
+                        <p class="mb-1"><strong>GST No:</strong> {{ s.gst_no }}</p>
+                        <p class="mb-1"><strong>Mobile:</strong> {{ s.mobile_no }}</p>
+                        <p class="mb-1"><strong>Email:</strong> {{ s.email_id }}</p>
 
-                    <td class="d-none d-md-table-cell">
-                        {{ s.mobile_no }}
-                    </td>
+                        <p class="mb-2">
+                            <strong>Status:</strong>
+                            {% if s.status == "Active" %}
+                            <span class="badge bg-success">Active</span>
+                            {% else %}
+                            <span class="badge bg-danger">Inactive</span>
+                            {% endif %}
+                        </p>
 
-                    <td class="d-none d-lg-table-cell">
-                        {{ s.email_id }}
-                    </td>
-
-                    <td class="d-none d-lg-table-cell">
-                        {{ s.gst_no }}
-                    </td>
-
-                    <!-- Action Buttons -->
-                    <td class="text-center">
-                        <div class="d-flex flex-column gap-1">
-                            <a href="/subcontractor/edit/{{ s.id }}" class="btn btn-sm btn-warning">
+                        <div class="d-flex gap-2">
+                            <a href="{{ url_for('subcontractor.edit_subcontractor', id=s.id) }}"
+                                class="btn btn-sm btn-warning w-50">
                                 Edit
                             </a>
-                            <a href="/subcontractor/delete/{{ s.id }}" class="btn btn-sm btn-danger"
-                                onclick="return confirm('Are you sure?')">
+
+                            <a href="{{ url_for('subcontractor.delete_subcontractor', id=s.id) }}"
+                                class="btn btn-sm btn-danger w-50" onclick="return confirm('Are you sure to delete?')">
                                 Delete
                             </a>
                         </div>
-                    </td>
-                </tr>
+                    </div>
+                </div>
                 {% endfor %}
-            </tbody>
+            </div>
 
-            <!-- TOTAL ROW -->
-            <tfoot>
-                <tr class="table-secondary fw-bold">
-                    <td colspan="2" class="text-end"> Total Subcontractors</td>
+            <!-- Pagination -->
+            <nav>
+                <ul class="pagination justify-content-center flex-wrap mt-4">
 
-                    <td class="d-none d-lg-table-cell">-</td>
-                    <td class="d-none d-lg-table-cell">-</td>
-                    <td class="d-none d-lg-table-cell">-</td>
+                    {% if pagination.has_prev %}
+                    <li class="page-item">
+                        <a class="page-link" href="{{ url_for('subcontractor.subcontractor_list', page=1) }}">
+                            First
+                        </a>
+                    </li>
 
-                    <td class="text-center">{{ subcontractors|length }}</td>
+                    <li class="page-item">
+                        <a class="page-link"
+                            href="{{ url_for('subcontractor.subcontractor_list', page=pagination.prev_num) }}">
+                            Prev
+                        </a>
+                    </li>
+                    {% endif %}
 
-                </tr>
-            </tfoot>
+                    {% for page_num in pagination.iter_pages() %}
+                    {% if page_num %}
+                    {% if page_num != pagination.page %}
+                    <li class="page-item">
+                        <a class="page-link" href="{{ url_for('subcontractor.subcontractor_list', page=page_num) }}">
+                            {{ page_num }}
+                        </a>
+                    </li>
+                    {% else %}
+                    <li class="page-item active">
+                        <span class="page-link">{{ page_num }}</span>
+                    </li>
+                    {% endif %}
+                    {% else %}
+                    <li class="page-item disabled">
+                        <span class="page-link">...</span>
+                    </li>
+                    {% endif %}
+                    {% endfor %}
 
-        </table>
+                    {% if pagination.has_next %}
+                    <li class="page-item">
+                        <a class="page-link"
+                            href="{{ url_for('subcontractor.subcontractor_list', page=pagination.next_num) }}">
+                            Next
+                        </a>
+                    </li>
+
+                    <li class="page-item">
+                        <a class="page-link"
+                            href="{{ url_for('subcontractor.subcontractor_list', page=pagination.pages) }}">
+                            Last
+                        </a>
+                    </li>
+                    {% endif %}
+
+                </ul>
+            </nav>
+
+        </div>
     </div>
 
 </div>

app/templates/subcontractor_dashboard.html

@@ -1,29 +1,105 @@
 {% extends "base.html" %}
-
 {% block content %}
 
-<div class="container-fluid px-2 px-md-4">
+<div class="container-fluid mt-3">
 
-    <h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
+    <h4 class="mb-4">Subcontractor Dashboard</h4>
 
-    <!-- Charts -->
-    <div class="row g-3">
+    <div class="row mb-3">
 
-        <!-- Bar Chart -->
-        <div class="col-12 col-md-6">
-            <div class="card shadow-sm h-100">
-                <div class="card-header bg-dark text-white text-center text-md-start">
-                    Work Category Bar Chart
-                </div>
-                <div class="card-body text-center">
-                    <img src="data:image/png;base64,{{ bar_chart }}" class="img-fluid" style="max-height:300px;">
-                </div>
-            </div>
+        <div 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>
+
+
+    <div class="card shadow">
+        <div class="card-body">
+
+            <canvas id="comparisonChart" height="120"></canvas>
+
+        </div>
     </div>
 
 </div>
 
+
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+<script>
+
+    let chart;
+
+    function loadChart() {
+
+        let subcontractor = document.getElementById("subcontractor").value
+        let category = document.getElementById("category").value
+        let ra_bill = document.getElementById("ra_bill").value
+
+
+        fetch(`/dashboard/api/subcontractor-chart?subcontractor=${subcontractor}&category=${category}&ra_bill=${ra_bill}`)
+
+            .then(res => res.json())
+            .then(data => {
+
+                if (chart) {
+                    chart.destroy()
+                }
+
+                const ctx = document.getElementById("comparisonChart")
+
+                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 }
+                        }
+                    }
+                })
+
+            })
+
+    }
+
+    document.getElementById("subcontractor").addEventListener("change", loadChart)
+    document.getElementById("category").addEventListener("change", loadChart)
+    document.getElementById("ra_bill").addEventListener("change", loadChart)
+
+    loadChart()
+
+</script>
+
 {% endblock %}

app/utils/exceptions.py

@@ -0,0 +1,8 @@
+from app.constants.http_status import HTTPStatus
+
+class APIException(Exception):
+    def __init__(self, message, status_code=HTTPStatus.BAD_REQUEST, errors=None):
+        self.message = message
+        self.status_code = status_code
+        self.errors = errors
+        super().__init__(self.message)

app/utils/file_utils.py

@@ -1,6 +1,16 @@
 import os
+from flask import current_app
 from app.config import Config
 
+
+def get_download_format_folder():
+    return os.path.join(
+        current_app.root_path,
+        "static",
+        "downloads",
+        "format"
+    )
+
 def ensure_upload_folder():
     if not os.path.exists(Config.UPLOAD_FOLDER):
-        os.makedirs(Config.UPLOAD_FOLDER)
+        os.makedirs(Config.UPLOAD_FOLDER)

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+)?$") 

app/utils/response_handler.py

@@ -0,0 +1,23 @@
+from flask import jsonify
+from app.constants.http_status import HTTPStatus
+
+
+class ResponseHandler:
+
+    @staticmethod
+    def success(message, data=None, status_code=HTTPStatus.OK):
+        return jsonify({
+            "status": "success",
+            "message": message,
+            "data": data if data else {},
+            "errors": []
+        }), status_code
+
+    @staticmethod
+    def error(message, errors=None, status_code=HTTPStatus.BAD_REQUEST):
+        return jsonify({
+            "status": "error",
+            "message": message,
+            "data": {},
+            "errors": errors if errors else []
+        }), status_code

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     container_name: comparison_db
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: admin
+      MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: comparisondb
     ports:
       - "3307:3306"
@@ -29,7 +29,7 @@ services:
       DB_PORT: 3306
       DB_NAME: comparisondb
       DB_USER: root
-      DB_PASSWORD: admin
+      DB_PASSWORD: root
 
     ports:
       - "5001:5001"

test_ra_bills.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test script to verify RA bill fetching from both client and subcontractor tables
-"""
-import sys
-import os
-sys.path.insert(0, os.path.dirname(__file__))
-
-from app import create_app, db
-from app.models.trench_excavation_model import TrenchExcavation
-from app.models.tr_ex_client_model import TrenchExcavationClient
-
-app = create_app()
-
-with app.app_context():
-    print("=" * 70)
-    print("RA BILL FETCHING TEST")
-    print("=" * 70)
-    
-    # Test 1: Count total records
-    print("\n✓ TEST 1: Total Records in Both Tables")
-    subcon_count = db.session.query(TrenchExcavation).count()
-    client_count = db.session.query(TrenchExcavationClient).count()
-    print(f"  Subcontractor (TrenchExcavation): {subcon_count} records")
-    print(f"  Client (TrenchExcavationClient): {client_count} records")
-    
-    # Test 2: Check RA bills in Subcontractor table
-    print("\n✓ TEST 2: RA Bills in Subcontractor Table")
-    subcon_bills = db.session.query(TrenchExcavation.RA_Bill_No)\
-        .filter(TrenchExcavation.RA_Bill_No != None)\
-        .filter(TrenchExcavation.RA_Bill_No != "")\
-        .distinct().all()
-    print(f"  Distinct RA Bills found: {len(subcon_bills)}")
-    print(f"  Bills: {[str(r[0]) for r in subcon_bills]}")
-    
-    # Test 3: Check RA bills in Client table
-    print("\n✓ TEST 3: RA Bills in Client Table")
-    client_bills = db.session.query(TrenchExcavationClient.RA_Bill_No)\
-        .filter(TrenchExcavationClient.RA_Bill_No != None)\
-        .filter(TrenchExcavationClient.RA_Bill_No != "")\
-        .distinct().all()
-    print(f"  Distinct RA Bills found: {len(client_bills)}")
-    print(f"  Bills: {[str(r[0]) for r in client_bills]}")
-    
-    # Test 4: Combined unique RA bills
-    print("\n✓ TEST 4: Combined Unique RA Bills (Union)")
-    combined_bills = db.session.query(TrenchExcavation.RA_Bill_No)\
-        .filter(TrenchExcavation.RA_Bill_No != None)\
-        .filter(TrenchExcavation.RA_Bill_No != "")\
-        .union(
-            db.session.query(TrenchExcavationClient.RA_Bill_No)\
-            .filter(TrenchExcavationClient.RA_Bill_No != None)\
-            .filter(TrenchExcavationClient.RA_Bill_No != "")
-        ).order_by(TrenchExcavation.RA_Bill_No).all()
-    
-    print(f"  Total unique RA Bills: {len(combined_bills)}")
-    print(f"  Bills: {[str(r[0]) for r in combined_bills]}")
-    
-    # Test 5: Sample data from both tables
-    print("\n✓ TEST 5: Sample RA Bills from Tables")
-    sample_subcon = db.session.query(TrenchExcavation.RA_Bill_No).limit(5).all()
-    sample_client = db.session.query(TrenchExcavationClient.RA_Bill_No).limit(5).all()
-    print(f"  Subcontractor samples: {[str(r[0]) for r in sample_subcon]}")
-    print(f"  Client samples: {[str(r[0]) for r in sample_client]}")
-    
-    print("\n" + "=" * 70)
-    print("✅ TEST COMPLETE")
-    print("=" * 70)