Update app/templates/base.html

Reviewed-on: #10

.dockerignore

@@ -1,19 +0,0 @@
-.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=5011
+FLASK_PORT=5001
 
 # -----------------------------
 # Security
@@ -20,7 +20,7 @@ DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_NAME=comparisondb
 DB_USER=root
-DB_PASSWORD=root
+DB_PASSWORD=admin
 
 # DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
 

.gitignore

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

Dockerfile

@@ -1,24 +0,0 @@
-FROM python:3.11-slim
-
-WORKDIR /app
-
-# Install system dependencies
-RUN apt-get update && apt-get install -y \
-    gcc \
-    && rm -rf /var/lib/apt/lists/*
-
-# Copy requirements and install Python dependencies
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Copy application code
-COPY . .
-
-# Create necessary directories
-RUN mkdir -p app/logs app/static/uploads app/static/downloads
-
-# Expose port
-EXPOSE 5001
-
-# Run the application
-CMD ["python", "run.py"]

app/__init__.py

@@ -1,7 +1,6 @@
 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__)
@@ -10,9 +9,6 @@ def create_app():
     # Initialize extensions
     db.init_app(app)
 
-    # Initialize Logger
-    LoggerService.init_app(app)
-
     # Register blueprints
     register_blueprints(app)
     # Register error handlers
@@ -47,15 +43,10 @@ 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):
-        current_app.logger.exception("500 Internal Server Error")
+        return "Internal Server Error", 500
-        return "Internal Server Error", 500

app/config.py

@@ -1,10 +1,12 @@
 import os
+# project base url
+BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 
 class Config:
     # secret key
     SECRET_KEY = os.getenv("SECRET_KEY", "dev-secret-key")
  
-    # Database variables 
+    # Database varibles 
     DB_DIALECT = os.getenv("DB_DIALECT")
     DB_DRIVER = os.getenv("DB_DRIVER")
     DB_USER = os.getenv("DB_USER")
@@ -21,4 +23,7 @@ class Config:
     )
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-   
+    # uploads folder path
+    UPLOAD_FOLDER = os.path.join(BASE_DIR, "static", "uploads")
+    # file extension
+    ALLOWED_EXTENSIONS = {"xlsx", "xls", "csv"}

app/constants/http_status.py

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

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

@@ -1,66 +0,0 @@
-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,7 +1,5 @@
 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"
@@ -11,33 +9,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.Numeric(10, 4), default=0)
+    CC_length = db.Column(db.Float)
     # Bedding Qty.
-    Outer_dia_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    Outer_dia_of_MH_m = db.Column(db.Float)
-    Bedding_Length = db.Column(db.Numeric(10, 4), default=0)
+    Bedding_Length = db.Column(db.Float)
-    Width = db.Column(db.Numeric(10, 4), default=0)
+    Width = db.Column(db.Float)
-    Depth = db.Column(db.Numeric(10, 4), default=0)
+    Depth = db.Column(db.Float)
-    Qty = db.Column(db.Numeric(10, 4), default=0)
+    Qty = db.Column(db.Float)
  
     #  PIPE LAYING Qty. 
-    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Float)
-    Laying_Length = db.Column(db.Numeric(10, 4), default=0)
+    Laying_Length = db.Column(db.Float)
 
-    pipe_150_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_150_mm = db.Column(db.Float)
-    pipe_200_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_200_mm = db.Column(db.Float)
-    pipe_250_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_250_mm = db.Column(db.Float)
-    pipe_300_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_300_mm = db.Column(db.Float)
-    pipe_350_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_350_mm = db.Column(db.Float)
-    pipe_400_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_400_mm = db.Column(db.Float)
-    pipe_450_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_450_mm = db.Column(db.Float)
-    pipe_500_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_500_mm = db.Column(db.Float)
-    pipe_600_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_600_mm = db.Column(db.Float)
-    pipe_700_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_700_mm = db.Column(db.Float)
-    pipe_900_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_900_mm = db.Column(db.Float)
-    pipe_1200_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_1200_mm = db.Column(db.Float)
     
-    Total = db.Column(db.Numeric(12, 4), default=0)
+    Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -50,14 +48,11 @@ class LayingClient(db.Model):
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
-
+    
-# AUTO TOTAL USING REGEX
+    def sum_laying_fields():
-def calculate_laying_total(mapper, connection, target):
+        return [
-    total = 0
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
-    for column in target.__table__.columns:
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
-        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
-            total += getattr(target, column.name) or 0
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
-    target.Total = round(total)
+        ]
-
-event.listen(LayingClient, "before_insert", calculate_laying_total)
-event.listen(LayingClient, "before_update", calculate_laying_total)

app/models/laying_model.py

@@ -1,7 +1,5 @@
 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"
@@ -15,25 +13,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.Numeric(10, 4), default=0)
+    CC_length = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Float)
-    Laying_Length = db.Column(db.Numeric(10, 4), default=0)
+    Laying_Length = db.Column(db.Float)
 
-    pipe_150_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_150_mm = db.Column(db.Float)
-    pipe_200_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_200_mm = db.Column(db.Float)
-    pipe_250_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_250_mm = db.Column(db.Float)
-    pipe_300_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_300_mm = db.Column(db.Float)
-    pipe_350_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_350_mm = db.Column(db.Float)
-    pipe_400_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_400_mm = db.Column(db.Float)
-    pipe_450_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_450_mm = db.Column(db.Float)
-    pipe_500_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_500_mm = db.Column(db.Float)
-    pipe_600_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_600_mm = db.Column(db.Float)
-    pipe_700_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_700_mm = db.Column(db.Float)
-    pipe_900_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_900_mm = db.Column(db.Float)
-    pipe_1200_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_1200_mm = db.Column(db.Float)
     
-    Total = db.Column(db.Numeric(12, 4), default=0)
+    Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -47,13 +45,10 @@ class Laying(db.Model):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
     
 
-# AUTO TOTAL USING REGEX
+    def sum_laying_fields():
-def calculate_laying_total(mapper, connection, target):
+        return [
-    total = 0
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
-    for column in target.__table__.columns:
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
-        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
-            total += getattr(target, column.name) or 0
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
-    target.Total = round(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,7 +1,5 @@
 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"
@@ -15,35 +13,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.Numeric(10, 4), default=0)
+    Depth_of_MH = db.Column(db.Float)
  
     # Excavation categories 
-    d_0_to_0_75 = db.Column(db.Numeric(10, 4), default=0)
+    d_0_to_0_75 = db.Column(db.Float)
-    d_0_76_to_1_05 = db.Column(db.Numeric(10, 4), default=0)
+    d_0_76_to_1_05 = db.Column(db.Float)
-    d_1_06_to_1_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_1_06_to_1_65 = db.Column(db.Float)
-    d_1_66_to_2_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_1_66_to_2_15 = db.Column(db.Float)
-    d_2_16_to_2_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_16_to_2_65 = db.Column(db.Float)
-    d_2_66_to_3_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_66_to_3_15 = db.Column(db.Float)
-    d_3_16_to_3_65= db.Column(db.Numeric(10, 4), default=0)
+    d_3_16_to_3_65= db.Column(db.Float)
-    d_3_66_to_4_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_3_66_to_4_15 = db.Column(db.Float)
-    d_4_16_to_4_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_4_16_to_4_65 = db.Column(db.Float)
-    d_4_66_to_5_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_4_66_to_5_15 = db.Column(db.Float)
-    d_5_16_to_5_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_5_16_to_5_65 = db.Column(db.Float)
-    d_5_66_to_6_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_6_16_to_6_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_6_66_to_7_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_7_16_to_7_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_7_66_to_8_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_8_16_to_8_65 = db.Column(db.Numeric(10, 4), default=0)
-    d_8_66_to_9_15 = db.Column(db.Numeric(10, 4), default=0)
-    d_9_16_to_9_65 = db.Column(db.Numeric(10, 4), default=0)
 
-    Domestic_Chambers = db.Column(db.Numeric(10, 4), default=0)
+    d_5_66_to_6_15 = db.Column(db.Float)
-    DWC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
+    d_6_16_to_6_65 = db.Column(db.Float)
-    UPVC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
+    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)
     RA_Bill_No=db.Column(db.String(500))
 
-    Total = db.Column(db.Numeric(12, 4), default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -53,13 +51,13 @@ class ManholeDomesticChamber(db.Model):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
     
     
-# AUTO TOTAL USING REGEX
+    def sum_mh_dc_fields():
-def calculate_mh_dc_total(mapper, connection, target):
+        return [
-    total = 0
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
-    for column in target.__table__.columns:
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
-        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
-            total += getattr(target, column.name) or 0
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
-    target.Total = round(total)
+            "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"]
 
-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,7 +1,5 @@
 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"
@@ -16,47 +14,47 @@ class ManholeExcavation(db.Model):
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
    
-    Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Upto_IL_Depth = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Float)
-    Ex_Dia_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
+    Ex_Dia_of_Manhole = db.Column(db.Float)
-    Area_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
+    Area_of_Manhole = db.Column(db.Float)
    
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_and_above_total = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_and_above_total = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
 
-    Total = db.Column(db.Numeric(12, 4), default=0)
+    Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
 
@@ -67,15 +65,3 @@ 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 = round(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,37 +1,41 @@
 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.Numeric(10, 4), default=0)
+    MH_TOP_LEVEL = db.Column(db.Float)
-    MH_IL_LEVEL = db.Column(db.Numeric(10, 4), default=0)
+    MH_IL_LEVEL = db.Column(db.Float)
-    Depth_of_MH = db.Column(db.Numeric(10, 4), default=0)
+    Depth_of_MH = db.Column(db.Float)
    
+ 
     # Excavation categories 
-    d_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    d_0_to_1_5 = db.Column(db.Float)
-    d_1_5_to_2_0 = db.Column(db.Numeric(10, 4), default=0)
+    d_1_5_to_2_0 = db.Column(db.Float)
-    d_2_0_to_2_5 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_0_to_2_5 = db.Column(db.Float)
-    d_2_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_5_to_3_0 = db.Column(db.Float)
-    d_3_0_to_3_5 = db.Column(db.Numeric(10, 4), default=0)
-    d_3_5_to_4_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_4_0_to_4_5= db.Column(db.Numeric(10, 4), default=0)
-    d_4_5_to_5_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_5_0_to_5_5 = db.Column(db.Numeric(10, 4), default=0)
-    d_5_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
-    d_6_0_to_6_5 = db.Column(db.Numeric(10, 4), default=0)
 
-    Domestic_Chambers = db.Column(db.Numeric(10, 4), 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)
 
-    Total = db.Column(db.Numeric(12, 4), default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -41,15 +45,13 @@ class ManholeDomesticChamberClient(db.Model):
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
 
-
+    
-# AUTO TOTAL USING REGEX
+    def sum_mh_dc_fields():
-def calculate_mh_dc_total(mapper, connection, target):
+        return [
-    total = 0
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
-    for column in target.__table__.columns:
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
-        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
-            total += getattr(target, column.name) or 0
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
-    target.Total = round(total)
+            "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" ]
-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,76 +1,78 @@
 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.Numeric(10, 4), default=0)
+    Ground_Level = db.Column(db.Float)
-    MH_Invert_Level = db.Column(db.Numeric(10, 4), default=0)
+    MH_Invert_Level = db.Column(db.Float)
-    MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
+    MH_Top_Level = db.Column(db.Float)
-    Ex_Level = db.Column(db.Numeric(10, 4), default=0)
+    Ex_Level = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Float)
-    MH_Depth = db.Column(db.Numeric(10, 4), default=0)
+    MH_Depth = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Float)
 
-    Dia_of_MH_Cutting = db.Column(db.Numeric(10, 4), default=0)
+    Dia_of_MH_Cutting = db.Column(db.Float)
-    Area_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
+    Area_of_Manhole = db.Column(db.Float)
    
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    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.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
 
     Remarks = db.Column(db.String(500))
-    Total = db.Column(db.Numeric(12, 4), default=0)
+    Total = db.Column(db.Float)
 
     created_at = db.Column(db.DateTime, default=datetime.today)
 
@@ -79,16 +81,3 @@ 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 = round(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,80 +1,82 @@
 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.Numeric(10, 4), default=0)
+    CC_length = db.Column(db.Float)
-    Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
+    Actual_Trench_Length = db.Column(db.Float)
-    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
+    Ground_Level = db.Column(db.Float)
-    Invert_Level = db.Column(db.Numeric(10, 4), default=0)
+    Invert_Level = db.Column(db.Float)
-    Excavated_level = db.Column(db.Numeric(10, 4), default=0)
+    Excavated_level = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Float)
-    Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Avg_Depth = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Float)
  
     # width
-    Width_0_to_1_5_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_0_to_1_5_m = db.Column(db.Float)
-    Width_1_5_to_3_0_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_1_5_to_3_0_m = db.Column(db.Float)
-    Width_3_0_to_4_5_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_3_0_to_4_5_m = db.Column(db.Float)
-    Width_4_5_to_6_0_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_4_5_to_6_0_m = db.Column(db.Float)
-    Width_6_0_to_7_5_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_6_0_to_7_5_m = db.Column(db.Float)
 
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
 
-    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_3_0_to_4_5 = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    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.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
 
-    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_5_total = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_3_0_to_4_5_total = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
 
-    Total = db.Column(db.Numeric(12, 4), default=0)
+    Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
 
     created_at = db.Column(db.DateTime, default=datetime.today)
@@ -84,15 +86,3 @@ 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 = round(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,7 +1,5 @@
 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"
@@ -15,59 +13,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.Numeric(10, 4), default=0)
+    CC_length = db.Column(db.Float)
-    Invert_Level = db.Column(db.Numeric(10, 4), default=0)
+    Invert_Level = db.Column(db.Float)
-    MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
+    MH_Top_Level = db.Column(db.Float)
-    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
+    Ground_Level = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Float)
-    Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
+    Actual_Trench_Length = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Float)
 
     # width
-    Width_0_to_2_5 = db.Column(db.Numeric(10, 4), default=0)
+    Width_0_to_2_5 = db.Column(db.Float)
-    Width_2_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Width_2_5_to_3_0 = db.Column(db.Float)
-    Width_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Width_3_0_to_4_5 = db.Column(db.Float)
-    Width_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Width_4_5_to_6_0 = db.Column(db.Float)
 
-    Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Upto_IL_Depth = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Float)
-    Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Avg_Depth = db.Column(db.Float)
 
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5 = db.Column(db.Float)
-    Hard_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0 = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5 = db.Column(db.Float)
-    Soft_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0 = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5 = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
 
-    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Float)
-    Hard_Murum_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_and_above_total = db.Column(db.Float)
 
-    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Float)
-    Soft_Rock_1_5_and_above_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_and_above_total = db.Column(db.Float)
 
-    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Float)
-    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
 
-    Total = db.Column(db.Numeric(12, 4), default=0)
+    Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -80,15 +78,33 @@ 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):
 
-# AUTO TOTAL USING REGEX
+        def safe(val):
-def calculate_trench_total(mapper, connection, target):
+            return val or 0
-    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)
+            ),
 
-event.listen(TrenchExcavation, "before_insert", calculate_trench_total)
+            "Hard_Murum_Total": (
-event.listen(TrenchExcavation, "before_update", calculate_trench_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)
+            ),
+        }

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(200), nullable=False)
+    name = db.Column(db.String(120), 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,30 +1,100 @@
-import matplotlib
+# import matplotlib
-matplotlib.use("Agg")
+# matplotlib.use("Agg")
 
-from flask import Blueprint, render_template, session, redirect, url_for, jsonify, request
+# from flask import Blueprint, render_template, session, redirect, url_for
-import matplotlib.pyplot as plt
+# import matplotlib.pyplot as plt
-import io
+# import io
-import base64
+# import base64
-from app.utils.plot_utils import plot_to_base64
+# from app.utils.plot_utils import plot_to_base64
-from app.services.dashboard_service import DashboardService
+# from app.services.dashboard_service import DashboardService
+
+# dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
+
+# # dashboard_bp = Blueprint("dashboard", __name__)
+
+# # charts 
+# # def plot_to_base64():
+# #     img = io.BytesIO()
+# #     plt.savefig(img, format="png", bbox_inches="tight")
+# #     plt.close()
+# #     img.seek(0)
+# #     return base64.b64encode(img.getvalue()).decode()
+
+# # bar chart
+# def bar_chart():
+#     categories = ["Trench", "Manhole", "Pipe Laying", "Restoration"]
+#     values = [120, 80, 150, 60]
+
+#     plt.figure()
+#     plt.bar(categories, values)
+#     plt.title("Work Category Report")
+#     plt.xlabel("test Category")
+#     plt.ylabel("test Quantity")
+
+
+#     return plot_to_base64(plt)
+
+# # Pie chart
+# def pie_chart():
+#     labels = ["Completed", "In Progress", "Pending"]
+#     sizes = [55, 20, 25]
+
+#     plt.figure()
+#     plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140)
+#     plt.title("Project Status")
+
+#     return plot_to_base64(plt)
+
+# # Histogram chart
+# def histogram_chart():
+#     daily_work = [5, 10, 15, 20, 20, 25, 30, 35, 40, 45, 50]
+
+#     plt.figure()
+#     plt.hist(daily_work, bins=5)
+#     plt.title("Daily Work Distribution")
+#     plt.xlabel("Work Units")
+#     plt.ylabel("Frequency")
+
+#     return plot_to_base64(plt)
+
+# # Dashboaed page
+# @dashboard_bp.route("/")
+# def dashboard():
+#     if not session.get("user_id"):
+#         return redirect(url_for("auth.login"))
+
+#     return render_template(
+#         "dashboard.html",
+#         title="Dashboard",
+#         bar_chart=bar_chart(),
+#         pie_chart=pie_chart(),
+#         histogram=histogram_chart()
+#     )
+
+# # subcontractor dashboard
+# @dashboard_bp.route("/subcontractor_dashboard", methods=["GET", "POST"])
+# def subcontractor_dashboard():
+#     if not session.get("user_id"):
+#         return redirect(url_for("auth.login"))
+
+#     tr_dash = DashboardService().bar_chart_of_tr_ex
+    
+    
+#     return render_template(
+#         "subcontractor_dashboard.html",
+#         title="Dashboard",
+#         bar_chart=tr_dash
+#     )
+
+from flask import Blueprint, render_template, session, redirect, url_for, jsonify
 from sqlalchemy import func
 from app import db
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.laying_model import Laying
 
-from app.models.subcontractor_model import Subcontractor
-
 dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
 
-
-@dashboard_bp.route("/")
-def dashboard():
-    if not session.get("user_id"):
-        return redirect(url_for("auth.login"))
-    return render_template("dashboard.html", title="Business Intelligence Dashboard")
-
-
 @dashboard_bp.route("/api/live-stats")
 def live_stats():
     try:
@@ -59,186 +129,8 @@ def live_stats():
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
-
+@dashboard_bp.route("/")
-
+def dashboard():
-
-# subcontractor dashboard
-@dashboard_bp.route("/subcontractor_dashboard")
-def subcontractor_dashboard():
-
     if not session.get("user_id"):
         return redirect(url_for("auth.login"))
-
+    return render_template("dashboard.html", title="Business Intelligence Dashboard")
-    subcontractors = Subcontractor.query.all()
-
-    return render_template(
-        "subcontractor_dashboard.html",
-        subcontractors=subcontractors
-    )
-
-# ✅ API: Get Unique RA Bills
-@dashboard_bp.route("/api/get-ra-bills")
-def get_ra_bills():
-
-    subcontractor_id = request.args.get("subcontractor")
-    category = request.args.get("category")
-
-    if not subcontractor_id or not category:
-        return {"ra_bills": []}
-
-    match category:
-
-        case "trench_excavation":
-            results = db.session.query(
-                TrenchExcavation.RA_Bill_No
-            ).filter(
-                TrenchExcavation.subcontractor_id == subcontractor_id
-            ).distinct().order_by(TrenchExcavation.RA_Bill_No).all()
-
-        # (Add others same pattern later)
-        case _:
-            results = []
-
-    ra_bills = [r[0] for r in results if r[0]]
-
-    return {"ra_bills": ra_bills}
-
-
-# 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")
-
-#     labels = []
-#     values = []
-
-#     match category:
-
-#         # ✅ Trench
-#         case "trench_excavation":
-#             query = db.session.query(
-#                 TrenchExcavation.excavation_category,
-#                 func.sum(TrenchExcavation.Total)
-#             )
-
-#             if subcontractor_id:
-#                 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()
-
-#         # ✅ Manhole
-#         case "manhole_excavation":
-#             query = db.session.query(
-#                 ManholeExcavation.excavation_category,
-#                 func.sum(ManholeExcavation.Total)
-#             )
-
-#             if subcontractor_id:
-#                 query = query.filter(ManholeExcavation.subcontractor_id == subcontractor_id)
-
-#             if ra_bill:
-#                 query = query.filter(ManholeExcavation.RA_Bill_No == ra_bill)
-
-#             results = query.group_by(ManholeExcavation.excavation_category).all()
-
-#         case _:
-#             results = []
-
-#     for r in results:
-#         labels.append(r[0])
-#         values.append(float(r[1] or 0))
-
-#     return jsonify({
-#         "labels": labels,
-#         "values": values
-#     })
-
-
-@dashboard_bp.route("/api/trench-analysis")
-def trench_analysis():
-
-    subcontractor_id = request.args.get("subcontractor")
-    ra_bill = request.args.get("ra_bill")
-
-    query = TrenchExcavation.query
-
-    if subcontractor_id:
-        query = query.filter(TrenchExcavation.subcontractor_id == subcontractor_id)
-
-    if ra_bill:
-        query = query.filter(TrenchExcavation.RA_Bill_No == ra_bill)
-
-    data = query.all()
-
-    result = {
-        "Soft Murum": {"depth": 0, "qty": 0},
-        "Hard Murum": {"depth": 0, "qty": 0},
-        "Soft Rock": {"depth": 0, "qty": 0},
-        "Hard Rock": {"depth": 0, "qty": 0},
-    }
-
-    for r in data:
-
-        # Soft Murum
-        result["Soft Murum"]["depth"] += (
-            (r.Soft_Murum_0_to_1_5 or 0) +
-            (r.Soft_Murum_1_5_to_3_0 or 0) +
-            (r.Soft_Murum_3_0_to_4_5 or 0)
-        )
-        result["Soft Murum"]["qty"] += (
-            (r.Soft_Murum_0_to_1_5_total or 0) +
-            (r.Soft_Murum_1_5_to_3_0_total or 0) +
-            (r.Soft_Murum_3_0_to_4_5_total or 0)
-        )
-
-        # Hard Murum
-        result["Hard Murum"]["depth"] += (
-            (r.Hard_Murum_0_to_1_5 or 0) +
-            (r.Hard_Murum_1_5_to_3_0 or 0)
-        )
-        result["Hard Murum"]["qty"] += (
-            (r.Hard_Murum_0_to_1_5_total or 0) +
-            (r.Hard_Murum_1_5_and_above_total or 0)
-        )
-
-        # Soft Rock
-        result["Soft Rock"]["depth"] += (
-            (r.Soft_Rock_0_to_1_5 or 0) +
-            (r.Soft_Rock_1_5_to_3_0 or 0)
-        )
-        result["Soft Rock"]["qty"] += (
-            (r.Soft_Rock_0_to_1_5_total or 0) +
-            (r.Soft_Rock_1_5_and_above_total or 0)
-        )
-
-        # Hard Rock
-        result["Hard Rock"]["depth"] += (
-            (r.Hard_Rock_0_to_1_5 or 0) +
-            (r.Hard_Rock_1_5_to_3_0 or 0) +
-            (r.Hard_Rock_3_0_to_4_5 or 0) +
-            (r.Hard_Rock_4_5_to_6_0 or 0) +
-            (r.Hard_Rock_6_0_to_7_5 or 0)
-        )
-        result["Hard Rock"]["qty"] += (
-            (r.Hard_Rock_0_to_1_5_total or 0) +
-            (r.Hard_Rock_1_5_to_3_0_total or 0) +
-            (r.Hard_Rock_3_0_to_4_5_total or 0) +
-            (r.Hard_Rock_4_5_to_6_0_total or 0) +
-            (r.Hard_Rock_6_0_to_7_5_total or 0)
-        )
-
-    labels = list(result.keys())
-    depth = [result[k]["depth"] for k in labels]
-    qty = [result[k]["qty"] for k in labels]
-
-    return jsonify({
-        "labels": labels,
-        "depth": depth,
-        "qty": qty
-    })

app/routes/file_format.py

@@ -1,6 +1,5 @@
 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__)
@@ -15,7 +14,10 @@ def download_format():
 @login_required
 def download_excel_format(filename):
 
-    download_folder = get_download_format_folder()
+    download_folder = os.path.join(
+        current_app.root_path, "static", "downloads/format"
+    )
+
     file_path = os.path.join(download_folder, filename)
 
     if not os.path.exists(file_path):

app/routes/file_report.py

@@ -141,65 +141,74 @@ 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_report():
+def client_vs_all_subcontractor():
-
+    tables = {"tr": None, "mh": None, "dc": None}
-    tables = {"tr": None, "mh": None, "dc": None, "laying": None}
     ra_val = ""
-
+ 
     if request.method == "POST":
-
-        # ⚠ MUST match HTML name
         RA_Bill_No = request.form.get("RA_Bill_No")
-        action = request.form.get("action")
         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)
-
+ 
-        # -------- FETCH CLIENT DATA --------
+        clientBill = ClientBill()
-        bill_gen = ClientBill()
+        clientBill.Fetch(RA_Bill_No=RA_Bill_No)
-        bill_gen.Fetch(RA_Bill_No)
+        contractorBill = SubcontractorBill()
-
+        contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
-        # If no data
+ 
-        if (
+        # --- SAFETY CHECK: Verify data exists before merging ---
-            bill_gen.df_tr.empty and
+        if clientBill.df_tr.empty and clientBill.df_mh.empty:
-            bill_gen.df_mh.empty and
-            bill_gen.df_dc.empty and
-            bill_gen.df_laying.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)
+ 
+        qty_cols = [...] # (Keep your existing list)
+        mh_dc_qty_cols = [...] # (Keep your existing list)
+        mh_lay_qty_cols =[...]
 
-        # -------- DOWNLOAD --------
+        def aggregate_df(df, group_cols, sum_cols):
-        if action == "download":
+            if df.empty:
-
+                # Create an empty DF with the correct columns to avoid Merge/Key Errors
-            output = io.BytesIO()
+                return pd.DataFrame(columns=group_cols + sum_cols)
-
+            existing_cols = [c for c in sum_cols if c in df.columns]
-            with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+            # Ensure group_cols exist in the DF
-                bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Trench")
+            for col in group_cols:
-                bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH")
+                if col not in df.columns:
-                bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
+                    df[col] = "N/A" # Fill missing join keys
-                bill_gen.df_laying.to_excel(writer, index=False, sheet_name="Laying")
+            return df.groupby(group_cols, as_index=False)[existing_cols].sum()
-
+ 
-            output.seek(0)
+        # Aggregate data
-
+        df_sub_tr_grp = aggregate_df(contractorBill.df_tr, ["Location", "MH_NO"], qty_cols)
-            return send_file(
+        df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols)
-                output,
+        df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_dc_qty_cols)
-                download_name=f"Client_RA_{RA_Bill_No}_Report.xlsx",
+        df_sub_lay_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_lay_qty_cols)
-                as_attachment=True
+ 
-            )
+        # --- FINAL MERGE LOGIC ---
-
+        # We check if "Location" exists in the client data. If not, we add it to prevent the KeyError.
-        # -------- PREVIEW --------
+        for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying ]:
-        table_class = "table table-bordered table-striped table-hover table-sm"
+            if not df_client.empty and "Location" not in df_client.columns:
-
+                df_client["Location"] = "Unknown"
-        tables["tr"] = bill_gen.df_tr.to_html(classes=table_class, index=False)
+ 
-        tables["mh"] = bill_gen.df_mh.to_html(classes=table_class, index=False)
+        try:
-        tables["dc"] = bill_gen.df_dc.to_html(classes=table_class, index=False)
+            df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-        tables["laying"] = bill_gen.df_laying.to_html(classes=table_class, index=False)
+            df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-
+            df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-    return render_template("client_report.html", tables=tables, ra_val=ra_val)
+            df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
+        except KeyError as e:
+            flash(f"Merge Error: Missing column {str(e)}. Check if 'Location' is defined in your database models.", "danger")
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+ 
+       
+        # Convert to HTML for preview
+        tables["tr"] = df_tr_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+        tables["mh"] = df_mh_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+        tables["dc"] = df_dc_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+        tables["laying"] = df_lay_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
+ 
+   
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)   
+ 

app/routes/generate_comparison_report.py

@@ -1,47 +1,45 @@
 from flask import Blueprint, render_template, request, send_file, flash
-from collections import defaultdict
 import pandas as pd
 import io
+import re
+from collections import defaultdict
 
 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
 from app.models.laying_model import Laying
- 
+
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 from app.models.laying_client_model import LayingClient
- 
-from app.utils.helpers import login_required
-from app.utils.regex_utils import RegularExpression
- 
- 
-generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
- 
- 
 
- 
+from app.utils.helpers import login_required
-# NORMALIZER
+
+generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
+
+# --- REGEX PATTERNS FOR TOTALING ---
+PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+D_RANGE_PATTERN = re.compile(r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
+
+# --- UTILITIES ---
+
 def normalize_key(value):
     if value is None:
-        return None
+        return ""
     return str(value).strip().upper()
- 
+
- 
-# HEADER FORMATTER
 def format_header(header):
     if "-" in header:
         prefix, rest = header.split("-", 1)
         prefix = prefix.title()
     else:
         prefix, rest = None, header
- 
+
     parts = rest.split("_")
     result = []
     i = 0
- 
     while i < len(parts):
         if i + 1 < len(parts) and parts[i].isdigit() and parts[i + 1].isdigit():
             result.append(f"{parts[i]}.{parts[i + 1]}")
@@ -49,198 +47,161 @@ def format_header(header):
         else:
             result.append(parts[i].title())
             i += 1
- 
+
     final_text = " ".join(result)
     return f"{prefix}-{final_text}" if prefix else final_text
- 
- 
-# LOOKUP CREATOR
-def make_lookup(rows, key_field):
-    lookup = {}
-    for r in rows:
-        location = normalize_key(r.get("Location"))
-        key_val = normalize_key(r.get(key_field))
- 
-        if location and key_val:
-            lookup.setdefault((location, key_val), []).append(r)
- 
-    return lookup
- 
- 
- 
-# COMPARISON BUILDER
-def build_comparison(client_rows, contractor_rows, key_field):
-    contractor_lookup = make_lookup(contractor_rows, key_field)
-    output = []
- 
-    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))
- 
-        if not client_location or not client_key:
-            continue
- 
-        subs = contractor_lookup.get((client_location, client_key))
-        if not subs:
-            continue
- 
-        idx = used_index[(client_location, client_key)]
- 
-        # ❗ If subcontractor rows are exhausted, skip
-        if idx >= len(subs):
-            continue
- 
-        s = subs[idx]                     # ✅ take NEXT subcontractor row
-        used_index[(client_location, client_key)] += 1
- 
-        # ---- totals ----
-        client_total = sum(
-            float(v or 0)
-            for k, v in c.items()
-            if k.endswith("_total")
-            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 RegularExpression.D_RANGE_PATTERN.match(k)
-            or RegularExpression.PIPE_MM_PATTERN.match(k)
-        )
- 
-        row = {
-            "Location": client_location,
-            key_field.replace("_", " "): client_key
-        }
- 
-        for k, v in c.items():
-            if k not in ["id", "created_at"]:
-                row[f"Client-{k}"] = v
- 
-        row["Client-Total"] = round(client_total, 2)
-        row[" "] = ""
- 
-        for k, v in s.items():
-            if k not in ["id", "created_at", "subcontractor_id"]:
-                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)
-    # 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)
+def make_lookup(rows, key_field):
+    """Creates a mapping of (Location, Key) to a list of records."""
+    lookup = defaultdict(list)
+    for r in rows:
+        # Check both capitalized and lowercase keys for robustness
+        loc = normalize_key(r.get("Location") or r.get("location"))
+        key = normalize_key(r.get(key_field) or r.get(key_field.lower()))
+        if loc and key:
+            lookup[(loc, key)].append(r)
+    return lookup
+
+def calculate_row_total(row_dict):
+    """Calculates total based on _total suffix or regex patterns."""
+    return sum(
+        float(v or 0) for k, v in row_dict.items()
+        if k.endswith("_total") or D_RANGE_PATTERN.match(k) or PIPE_MM_PATTERN.match(k)
+    )
+
+# --- CORE COMPARISON LOGIC ---
+
+
+def build_comparison(client_rows, contractor_rows, key_field):
+    # 1. Create Lookup for Subcontractors
+    contractor_lookup = {}
+    for r in contractor_rows:
+        loc = normalize_key(r.get("Location") or r.get("location"))
+        key = normalize_key(r.get(key_field) or r.get(key_field.lower()))
+        if loc and key:
+            contractor_lookup[(loc, key)] = r
+
+    output = []
+
+    # 2. Iterate through Client rows
+    for c in client_rows:
+        loc_raw = c.get("Location") or c.get("location")
+        key_raw = c.get(key_field) or c.get(key_field.lower())
+        
+        loc_norm = normalize_key(loc_raw)
+        key_norm = normalize_key(key_raw)
+
+        # Match check
+        s = contractor_lookup.get((loc_norm, key_norm))
+        
+        # We only include the row if there is a match (Inner Join)
+        if s:
+            client_total = calculate_row_total(c)
+            sub_total = calculate_row_total(s)
+
+            row = {
+                "Location": loc_raw,
+                key_field.replace("_", " "): key_raw
+            }
+
+            # Add Client Data
+            for k, v in c.items():
+                if k in ["id", "created_at"]: continue
+                row[f"Client-{k}"] = v
+            row["Client-Total"] = round(client_total, 2)
+
+            row[" "] = "" # Spacer
+
+            # Add Subcontractor Data (Aligned on same row)
+            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)
+
+    # 3. Handle the "Empty/Blank" scenario using pd.concat
+    if not output:
+        # Create a basic dataframe with a message so the Excel file isn't empty/corrupt
+        return pd.DataFrame([{"Location": "N/A", "Message": "No matching data found"}])
+
+    df = pd.DataFrame(output)
+    df.columns = [format_header(col) for col in df.columns]
+    return df
+
+# --- EXCEL WRITER ---
+
+def write_sheet(writer, df, sheet_name, subcontractor_name):
+    if df.empty:
+        return
+        
+    workbook = writer.book
     df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
     ws = writer.sheets[sheet_name]
 
-    # formats
+    # Formats
     title_fmt = workbook.add_format({"bold": True, "font_size": 14})
-    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
+    client_header_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#B6DAED", "align": "center"})
-    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
+    sub_header_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F3A081", "align": "center"})
-    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
+    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7D261", "align": "center"})
-    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
+    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#82DD49", "align": "center"})
-    default_header_fmt = workbook.add_format({
+    default_header_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E7E6E6", "align": "center"})
-        "bold": True,
-        "border": 1,
-        "bg_color": "#E7E6E6",
-        "align": "center",
-        "valign": "vcenter"
-    })
 
-    # titles
+    # Header Titles
-    ws.merge_range(
+    ws.merge_range(0, 0, 0, len(df.columns) - 1, "CLIENT vs SUBCONTRACTOR COMPARISON", title_fmt)
-        0, 0, 0, len(df.columns) - 1,
+    ws.merge_range(1, 0, 1, len(df.columns) - 1, f"Subcontractor: {subcontractor_name}", title_fmt)
-        "CLIENT vs SUBCONTRACTOR",
-        title_fmt
-    )
-    ws.merge_range(
-        1, 0, 1, len(df.columns) - 1,
-        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)
+            fmt = client_header_fmt
         elif col_name.startswith("Subcontractor-"):
-            ws.write(3, col_num, col_name, sub_fmt)
+            fmt = sub_header_fmt
-        elif col_name.endswith("Total"):
+        elif "Total" in col_name:
-            ws.write(3, col_num, col_name, total_fmt)
+            fmt = total_fmt
         elif col_name == "Diff":
-            ws.write(3, col_num, col_name, diff_fmt)
+            fmt = diff_fmt
         else:
-            ws.write(3, col_num, col_name, default_header_fmt)
+            fmt = default_header_fmt
+            
+        ws.write(3, col_num, col_name, fmt)
+        ws.set_column(col_num, col_num, 18)
 
-        ws.set_column(col_num, col_num, 20)
+# --- ROUTES ---
 
- 
-# REPORT ROUTE
 @generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
 @login_required
 def comparison_report():
     subcontractors = Subcontractor.query.all()
- 
+
     if request.method == "POST":
         subcontractor_id = request.form.get("subcontractor_id")
         if not subcontractor_id:
-            flash("Please select subcontractor", "danger")
+            flash("Please select a subcontractor", "danger")
-            return render_template("generate_comparison_report.html",subcontractors=subcontractors)
+            return render_template("generate_comparison_report.html", subcontractors=subcontractors)
- 
+
         subcontractor = Subcontractor.query.get_or_404(subcontractor_id)
- 
+
-        # -------- DATA --------
+        # Build Dataframes for each section
-        tr_client = [r.serialize() for r in TrenchExcavationClient.query.all()]
+        sections = [
-        tr_sub = [r.serialize() for r in TrenchExcavation.query.filter_by(
+            (TrenchExcavationClient, TrenchExcavation, "Tr.Ex"),
-            subcontractor_id=subcontractor_id
+            (ManholeExcavationClient, ManholeExcavation, "Mh.Ex"),
-        ).all()]
+            (ManholeDomesticChamberClient, ManholeDomesticChamber, "MH & DC"),
-        df_tr = build_comparison(tr_client, tr_sub, "MH_NO")
+            (LayingClient, Laying, "Laying")
- 
+        ]
-        mh_client = [r.serialize() for r in ManholeExcavationClient.query.all()]
+
-        mh_sub = [r.serialize() for r in ManholeExcavation.query.filter_by(
-            subcontractor_id=subcontractor_id
-        ).all()]
-        df_mh = build_comparison(mh_client, mh_sub, "MH_NO")
- 
-        dc_client = [r.serialize() for r in ManholeDomesticChamberClient.query.all()]
-        dc_sub = [r.serialize() for r in ManholeDomesticChamber.query.filter_by(
-            subcontractor_id=subcontractor_id
-        ).all()]
-        df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
- 
-        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")
- 
-        # -------- EXCEL --------
         output = io.BytesIO()
         filename = f"{subcontractor.subcontractor_name}_Comparison_Report.xlsx"
- 
+
         with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            write_sheet(writer, df_tr, "Tr.Ex", subcontractor.subcontractor_name)
+            for client_model, sub_model, sheet_name in sections:
-            write_sheet(writer, df_mh, "Mh.Ex", subcontractor.subcontractor_name)
+                c_data = [r.serialize() for r in client_model.query.all()]
-            write_sheet(writer, df_dc, "MH & DC", subcontractor.subcontractor_name)
+                s_data = [r.serialize() for r in sub_model.query.filter_by(subcontractor_id=subcontractor_id).all()]
-            write_sheet(writer, df_lay, "Laying", subcontractor.subcontractor_name)
+                
- 
+                df = build_comparison(c_data, s_data, "MH_NO")
+                write_sheet(writer, df, sheet_name, subcontractor.subcontractor_name)
+
         output.seek(0)
         return send_file(
             output,
@@ -248,6 +209,5 @@ def comparison_report():
             download_name=filename,
             mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         )
- 
+
-    return render_template("generate_comparison_report.html",subcontractors=subcontractors)
+    return render_template("generate_comparison_report.html", subcontractors=subcontractors)
- 

app/routes/subcontractor_routes.py

@@ -1,159 +1,191 @@
-from flask import Blueprint, render_template, request, redirect, flash, current_app, url_for
+from flask import Blueprint, render_template, request, redirect, flash
-from app.services.db_service import db
+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():
-
+    # 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:
-        current_app.logger.warning("Empty subcontractor name submitted")
         flash("Subcontractor name cannot be empty.", "danger")
-        return redirect(url_for("subcontractor.add_subcontractor"))
+        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:
-        current_app.logger.warning(f"Duplicate subcontractor attempt: {name}")
         flash(f"Subcontractor with name '{name}' already exists!", "danger")
-        return redirect(url_for("subcontractor.add_subcontractor"))
+        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"),
-            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:
+    except Exception as e:
         db.session.rollback()
-        current_app.logger.exception("Error while saving subcontractor")
+        flash("An error occurred while saving. Please try again.", "danger")
-        flash("An error occurred while saving.", "danger")
+ 
-
+    return redirect("/subcontractor/list")
-    return redirect(url_for("subcontractor.subcontractor_list"))
+ 
-
+# ---------------- LIST -----------------
-
-# ---------------- LIST (UPDATED WITH PAGINATION) -----------------
 @subcontractor_bp.route("/list")
 @login_required
 def subcontractor_list():
-
+    subcontractors = Subcontractor.query.all()
-    page = request.args.get("page", 1, type=int)
+    return render_template("subcontractor/list.html", subcontractors=subcontractors)
-    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", "").strip()
+    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:
-        current_app.logger.warning(f"Duplicate update attempt: {new_name}")
         flash("Another subcontractor already uses this name.", "danger")
-        return redirect(url_for("subcontractor.edit_subcontractor", id=id))
+        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():
+    return render_template("subcontractor/add.html")
 
+@subcontractor_bp.route("/save", methods=["POST"])
+@login_required
+def save_subcontractor():
+    name = request.form.get("subcontractor_name", "").strip()
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+    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")
     try:
-        old_name = subcontractor.subcontractor_name
+        subcontractor = Subcontractor(
-
+            subcontractor_name=name,
-        subcontractor.subcontractor_name = new_name
+            contact_person=request.form.get("contact_person"),
-        subcontractor.contact_person = request.form.get("contact_person")
+            mobile_no=request.form.get("mobile_no"),
-        subcontractor.address = request.form.get("address")
+            email_id=request.form.get("email_id"),
-        subcontractor.mobile_no = request.form.get("mobile_no")
+            gst_no=request.form.get("gst_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")
+        db.session.add(subcontractor)
-        subcontractor.status = request.form.get("status")
-
         db.session.commit()
-
+        flash("Subcontractor added successfully!", "success")
-        current_app.logger.info(f"Subcontractor Updated: {old_name} → {new_name}")
+       
-        flash("Subcontractor updated successfully!", "success")
+    except Exception as e:
-
-    except Exception:
         db.session.rollback()
-        current_app.logger.exception("Error updating subcontractor")
+        flash("An error occurred while saving. Please try again.", "danger")
-        flash("Update failed!", "danger")
+ 
-
+    return redirect("/subcontractor/list")
-    return redirect(url_for("subcontractor.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)
 
-    try:
+    db.session.delete(subcontractor)
-        name = subcontractor.subcontractor_name
+    db.session.commit()
-        db.session.delete(subcontractor)
-        db.session.commit()
 
-        current_app.logger.info(f"Subcontractor Deleted: {name}")
+    flash("Subcontractor deleted successfully!", "success")
-        flash("Subcontractor deleted successfully!", "success")
+    return redirect("/subcontractor/list")
-
-    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,13 +1,11 @@
 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/file_service.py

@@ -1,10 +1,10 @@
-from app import db
 import os
 import pandas as pd
 from werkzeug.utils import secure_filename
 from app.utils.file_utils import ensure_upload_folder
-from app.utils.file_utils import get_uploads_folder
+
-from app.utils.file_utils import ALLOWED_EXTENSIONS
+from app.config import Config
+from app import db
 
 # Subcontractor models import
 from app.models.trench_excavation_model import TrenchExcavation
@@ -24,7 +24,7 @@ class FileService:
 
     # ---------------- COMMON HELPERS ----------------
     def allowed_file(self, filename):
-        return ("." in filename and filename.rsplit(".", 1)[1].lower() in ALLOWED_EXTENSIONS)
+        return ("." in filename and filename.rsplit(".", 1)[1].lower() in Config.ALLOWED_EXTENSIONS)
 
     def normalize(self, val):
         if val is None or pd.isna(val):
@@ -52,9 +52,8 @@ class FileService:
             return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
 
         ensure_upload_folder()
-        path = get_uploads_folder()
 
-        folder = os.path.join(path, f"sub_{subcontractor_id}")
+        folder = os.path.join(Config.UPLOAD_FOLDER, f"sub_{subcontractor_id}")
         os.makedirs(folder, exist_ok=True)
 
         filename = secure_filename(file.filename)
@@ -311,6 +310,7 @@ class FileService:
         db.session.commit()
 
 
+
     # ---------------- CLIENT FILE UPLOAD ----------------
     def handle_client_file_upload(self, file, RA_Bill_No):
 
@@ -324,9 +324,8 @@ class FileService:
             return False, "Invalid file type! Allowed: CSV, XLSX, XLS"
 
         ensure_upload_folder()
-        path = get_uploads_folder()
 
-        folder = os.path.join(path, f"Client_Bill_{RA_Bill_No}")
+        folder = os.path.join(Config.UPLOAD_FOLDER, f"Client_Bill_{RA_Bill_No}")
         os.makedirs(folder, exist_ok=True)
 
         filename = secure_filename(file.filename)

app/services/logger_service.py

@@ -1,79 +0,0 @@
-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
+                            <i class="bi bi-speedometer2 me-1"></i> Dashboard - Anish
                         </a>
                     </li>
 

app/templates/client_report.html

@@ -71,5 +71,4 @@
         {% endif %}
 
     </div>
-</div>
+    {% endblock %}
-{% endblock %}

app/templates/dashboard.html

@@ -96,8 +96,8 @@
 
                 // Update Bar Chart
                 liveBarChart.data.datasets[0].data = [
-                    data.summary.trench,
+                    data.summary.trench, 
-                    data.summary.manhole,
+                    data.summary.manhole, 
                     data.summary.laying
                 ];
                 liveBarChart.update();

app/templates/subcontractor/add.html

@@ -2,49 +2,39 @@
 {% block content %}
 
 <div class="card shadow-sm p-4">
+
     <h4 class="mb-3">Add New Subcontractor</h4>
 
-    <form action="{{ url_for('subcontractor.save_subcontractor') }}" method="POST">
+    <form action="/subcontractor/save" 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">Address:</label>
+            <label class="form-label">Mobile</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>
 
-        <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,58 +4,36 @@
 <div class="card shadow-sm p-4">
     <h4 class="mb-3">Edit Subcontractor</h4>
 
-    <form action="{{ url_for('subcontractor.update_subcontractor', id=subcontractor.id) }}" method="POST">
+    <form action="/subcontractor/update/{{ 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 Name:</label>
+            <label class="form-label">Contact Person</label>
             <input type="text" class="form-control" name="contact_person" value="{{ subcontractor.contact_person }}">
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Address:</label>
+            <label class="form-label">Mobile</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="{{ url_for('subcontractor.subcontractor_list') }}" class="btn btn-secondary">Back</a>
+        <a href="/subcontractor/list" class="btn btn-secondary">Back</a>
 
     </form>
 </div>

app/templates/subcontractor/list.html

@@ -1,160 +1,89 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="container mt-4">
+<div class="card shadow-sm p-3 p-md-4">
 
-    <div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center mb-3">
+    <!-- Header -->
-        <h4 class="mb-3 mb-md-0">Subcontractor List</h4>
+    <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>
 
-        <a href="{{ url_for('subcontractor.add_subcontractor') }}" class="btn btn-primary btn-sm">
+        <div class="col-12 col-md-3 text-center text-md-end">
-            + Add Subcontractor
+            <a href="/subcontractor/add" class="btn btn-success w-100 w-md-auto">
-        </a>
+                ➕ Add Subcontractor
+            </a>
+        </div>
     </div>
 
-    <div class="card shadow-sm">
-        <div class="card-body p-2 p-md-3">
 
-            <!-- Desktop Table View -->
+    <div class="table-responsive">
-            <div class="table-responsive d-none d-md-block">
+        <table class="table table-bordered table-striped align-middle text-nowrap">
-                <table class="table table-bordered table-hover align-middle">
+            <thead class="table-dark">
-                    <thead class="table-dark">
+                <tr>
-                        <tr>
+                    <th>ID</th>
-                            <th>Sr. No</th>
+                    <th>Name</th>
-                            <th>Subcontractor Name</th>
+                    <th class="d-none d-md-table-cell">Mobile</th>
-                            <th>GST No</th>
+                    <th class="d-none d-lg-table-cell">Email</th>
-                            <th>Mobile</th>
+                    <th class="d-none d-lg-table-cell">GST No</th>
-                            <th>Email</th>
+                    <th class="text-center">Action</th>
-                            <th>Status</th>
+                </tr>
-                            <th width="150">Action</th>
+            </thead>
-                        </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>
 
-                                <a href="{{ url_for('subcontractor.delete_subcontractor', id=s.id) }}"
+            <tbody>
-                                    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 %}
-                <div class="card mb-3 shadow-sm">
+                <tr>
-                    <div class="card-body p-3">
+                    <td>{{ s.id }}</td>
-                        <h5 class="fw-bold mb-2">{{ s.subcontractor_name }}</h5>
 
-                        <p class="mb-1"><strong>GST No:</strong> {{ s.gst_no }}</p>
+                    <td class="fw-semibold text-wrap">
-                        <p class="mb-1"><strong>Mobile:</strong> {{ s.mobile_no }}</p>
+                        {{ s.subcontractor_name }}
-                        <p class="mb-1"><strong>Email:</strong> {{ s.email_id }}</p>
+                    </td>
 
-                        <p class="mb-2">
+                    <td class="d-none d-md-table-cell">
-                            <strong>Status:</strong>
+                        {{ s.mobile_no }}
-                            {% if s.status == "Active" %}
+                    </td>
-                            <span class="badge bg-success">Active</span>
-                            {% else %}
-                            <span class="badge bg-danger">Inactive</span>
-                            {% endif %}
-                        </p>
 
-                        <div class="d-flex gap-2">
+                    <td class="d-none d-lg-table-cell">
-                            <a href="{{ url_for('subcontractor.edit_subcontractor', id=s.id) }}"
+                        {{ s.email_id }}
-                                class="btn btn-sm btn-warning w-50">
+                    </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">
                                 Edit
                             </a>
-
+                            <a href="/subcontractor/delete/{{ s.id }}" class="btn btn-sm btn-danger"
-                            <a href="{{ url_for('subcontractor.delete_subcontractor', id=s.id) }}"
+                                onclick="return confirm('Are you sure?')">
-                                class="btn btn-sm btn-danger w-50" onclick="return confirm('Are you sure to delete?')">
                                 Delete
                             </a>
                         </div>
-                    </div>
+                    </td>
-                </div>
+                </tr>
                 {% endfor %}
-            </div>
+            </tbody>
 
-            <!-- Pagination -->
+            <!-- TOTAL ROW -->
-            <nav>
+            <tfoot>
-                <ul class="pagination justify-content-center flex-wrap mt-4">
+                <tr class="table-secondary fw-bold">
+                    <td colspan="2" class="text-end"> Total Subcontractors</td>
 
-                    {% if pagination.has_prev %}
+                    <td class="d-none d-lg-table-cell">-</td>
-                    <li class="page-item">
+                    <td class="d-none d-lg-table-cell">-</td>
-                        <a class="page-link" href="{{ url_for('subcontractor.subcontractor_list', page=1) }}">
+                    <td class="d-none d-lg-table-cell">-</td>
-                            First
-                        </a>
-                    </li>
 
-                    <li class="page-item">
+                    <td class="text-center">{{ subcontractors|length }}</td>
-                        <a class="page-link"
-                            href="{{ url_for('subcontractor.subcontractor_list', page=pagination.prev_num) }}">
-                            Prev
-                        </a>
-                    </li>
-                    {% endif %}
 
-                    {% for page_num in pagination.iter_pages() %}
+                </tr>
-                    {% if page_num %}
+            </tfoot>
-                    {% 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 %}
 
-                    {% if pagination.has_next %}
+        </table>
-                    <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,118 +1,29 @@
 {% extends "base.html" %}
+
 {% block content %}
 
-<div class="container mt-3">
+<div class="container-fluid px-2 px-md-4">
 
-    <h4>RA Bill Dashboard</h4>
+    <h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
 
-    <div class="row mb-3">
+    <!-- Charts -->
+    <div class="row g-3">
 
-        <!-- Contractor -->
+        <!-- Bar Chart -->
-        <div class="col-md-4">
+        <div class="col-12 col-md-6">
-            <select id="subcontractor" class="form-control">
+            <div class="card shadow-sm h-100">
-                <option value="">Select Contractor</option>
+                <div class="card-header bg-dark text-white text-center text-md-start">
-                {% for s in subcontractors %}
+                    Work Category Bar Chart
-                <option value="{{s.id}}">{{s.subcontractor_name}}</option>
+                </div>
-                {% endfor %}
+                <div class="card-body text-center">
-            </select>
+                    <img src="data:image/png;base64,{{ bar_chart }}" class="img-fluid" style="max-height:300px;">
+                </div>
+            </div>
         </div>
 
-        <!-- Category -->
-        <div class="col-md-4">
-            <select id="category" class="form-control">
-                <option value="">Select Category</option>
-                <option value="trench_excavation">Trench Excavation</option>
-            </select>
-        </div>
 
-        <!-- RA Bill -->
-        <div class="col-md-4">
-            <select id="ra_bill" class="form-control">
-                <option value="">RA Bill</option>
-            </select>
-        </div>
-
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            <canvas id="comparisonChart"></canvas>
-        </div>
     </div>
 
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-<script>
-
-    let chart;
-
-    // ✅ Load RA Bills
-    function loadRABills() {
-
-        let subcontractor = document.getElementById("subcontractor").value
-        let category = document.getElementById("category").value
-
-        if (!subcontractor || !category) return
-
-        fetch(`/dashboard/api/get-ra-bills?subcontractor=${subcontractor}&category=${category}`)
-            .then(res => res.json())
-            .then(data => {
-
-                let ra = document.getElementById("ra_bill")
-                ra.innerHTML = '<option value="">RA Bill</option>'
-
-                data.ra_bills.forEach(bill => {
-                    ra.innerHTML += `<option value="${bill}">${bill}</option>`
-                })
-            })
-    }
-
-    // ✅ Load Chart
-    function loadChart() {
-
-        let subcontractor = document.getElementById("subcontractor").value
-        let ra_bill = document.getElementById("ra_bill").value
-
-        fetch(`/dashboard/api/trench-analysis?subcontractor=${subcontractor}&ra_bill=${ra_bill}`)
-            .then(res => res.json())
-            .then(data => {
-
-                if (chart) chart.destroy()
-
-                chart = new Chart(document.getElementById("comparisonChart"), {
-                    type: "bar",
-                    data: {
-                        labels: data.labels,
-                        datasets: [
-                            {
-                                label: "Depth",
-                                data: data.depth,
-                                backgroundColor: "green"
-                            },
-                            {
-                                label: "Excavation Qty (cum)",
-                                data: data.qty,
-                                backgroundColor: "blue"
-                            }
-                        ]
-                    }
-                })
-            })
-    }
-
-    // Events
-    document.getElementById("subcontractor").addEventListener("change", () => {
-        loadRABills()
-    })
-
-    document.getElementById("category").addEventListener("change", () => {
-        loadRABills()
-    })
-
-    document.getElementById("ra_bill").addEventListener("change", loadChart)
-
-</script>
-
 {% endblock %}

app/utils/exceptions.py

@@ -1,8 +0,0 @@
-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,26 +1,6 @@
 import os
-from flask import current_app
+from app.config import Config
-
-
-# file extension
-ALLOWED_EXTENSIONS = {"xlsx", "xls", "csv"}
-
-
-def get_download_format_folder():
-    return os.path.join(
-        current_app.root_path,
-        "static",
-        "downloads",
-        "format"
-    )
-
-def get_uploads_folder():
-    return os.path.join(
-        current_app.root_path,
-        "static",
-        "uploads"
-    )
 
 def ensure_upload_folder():
-    if not os.path.exists(get_uploads_folder()):
+    if not os.path.exists(Config.UPLOAD_FOLDER):
-        os.makedirs(get_uploads_folder())
+        os.makedirs(Config.UPLOAD_FOLDER)

app/utils/regex_utils.py

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

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

@@ -1,46 +0,0 @@
-version: '3.8'
-
-services:
-  db:
-    image: mysql:8.0
-    container_name: comparison_db
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: comparisondb
-    ports:
-      - "3307:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
-
-  app:
-    build: .
-    container_name: comparison_app
-    restart: always
-    environment:
-      FLASK_ENV: development
-      FLASK_DEBUG: "True"
-      FLASK_HOST: "0.0.0.0"
-      FLASK_PORT: "5001"
-
-      DB_DIALECT: mysql
-      DB_DRIVER: pymysql
-      DB_HOST: db
-      DB_PORT: 3306
-      DB_NAME: comparisondb
-      DB_USER: root
-      DB_PASSWORD: root
-
-    ports:
-      - "5001:5001"
-
-    depends_on:
-      - db
-
-    volumes:
-      - ./app/logs:/app/app/logs
-      - ./app/static/uploads:/app/app/static/uploads
-      - ./app/static/downloads:/app/app/static/downloads
-
-volumes:
-  mysql_data:

logs/app.log

@@ -0,0 +1,200 @@
+2025-12-09 13:11:05,606 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5000
+2025-12-09 13:11:05,607 | INFO | Press CTRL+C to quit
+2025-12-09 13:11:05,608 | INFO |  * Restarting with stat
+2025-12-09 13:11:06,239 | WARNING |  * Debugger is active!
+2025-12-09 13:11:06,240 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:11:48,880 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5000
+2025-12-09 13:11:48,881 | INFO | Press CTRL+C to quit
+2025-12-09 13:11:48,882 | INFO |  * Restarting with stat
+2025-12-09 13:11:49,519 | WARNING |  * Debugger is active!
+2025-12-09 13:11:49,521 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:05,727 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\user_service.py', reloading
+2025-12-09 13:12:05,826 | INFO |  * Restarting with stat
+2025-12-09 13:12:06,499 | WARNING |  * Debugger is active!
+2025-12-09 13:12:06,501 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:09,545 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
+2025-12-09 13:12:09,654 | INFO |  * Restarting with stat
+2025-12-09 13:12:10,286 | WARNING |  * Debugger is active!
+2025-12-09 13:12:10,288 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:12,311 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\routes\\auth.py', reloading
+2025-12-09 13:12:12,407 | INFO |  * Restarting with stat
+2025-12-09 13:12:13,071 | WARNING |  * Debugger is active!
+2025-12-09 13:12:13,072 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:16,128 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
+2025-12-09 13:12:16,257 | INFO |  * Restarting with stat
+2025-12-09 13:12:16,898 | WARNING |  * Debugger is active!
+2025-12-09 13:12:16,900 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:20,944 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\routes\\user.py', reloading
+2025-12-09 13:12:21,042 | INFO |  * Restarting with stat
+2025-12-09 13:12:21,719 | WARNING |  * Debugger is active!
+2025-12-09 13:12:21,721 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:23,762 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\routes\\file_import.py', reloading
+2025-12-09 13:12:23,870 | INFO |  * Restarting with stat
+2025-12-09 13:12:24,505 | WARNING |  * Debugger is active!
+2025-12-09 13:12:24,507 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:27,561 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\__init__.py', reloading
+2025-12-09 13:12:27,670 | INFO |  * Restarting with stat
+2025-12-09 13:12:28,294 | WARNING |  * Debugger is active!
+2025-12-09 13:12:28,296 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:12:31,336 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\db_service.py', reloading
+2025-12-09 13:12:31,448 | INFO |  * Restarting with stat
+2025-12-09 13:12:32,097 | WARNING |  * Debugger is active!
+2025-12-09 13:12:32,099 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:13:05,662 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
+2025-12-09 13:13:05,773 | INFO |  * Restarting with stat
+2025-12-09 13:13:06,466 | WARNING |  * Debugger is active!
+2025-12-09 13:13:06,469 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:13:10,944 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5000
+2025-12-09 13:13:10,944 | INFO | Press CTRL+C to quit
+2025-12-09 13:13:10,945 | INFO |  * Restarting with stat
+2025-12-09 13:13:11,623 | WARNING |  * Debugger is active!
+2025-12-09 13:13:11,625 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:14:11,295 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
+2025-12-09 13:14:11,393 | INFO |  * Restarting with stat
+2025-12-09 13:14:12,004 | WARNING |  * Debugger is active!
+2025-12-09 13:14:12,006 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:14:32,108 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:14:32,109 | INFO | Press CTRL+C to quit
+2025-12-09 13:14:32,110 | INFO |  * Restarting with stat
+2025-12-09 13:14:32,699 | WARNING |  * Debugger is active!
+2025-12-09 13:14:32,701 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:15:58,632 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
+2025-12-09 13:15:58,733 | INFO |  * Restarting with stat
+2025-12-09 13:15:59,415 | WARNING |  * Debugger is active!
+2025-12-09 13:15:59,416 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:16:03,475 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
+2025-12-09 13:16:03,583 | INFO |  * Restarting with stat
+2025-12-09 13:16:04,204 | WARNING |  * Debugger is active!
+2025-12-09 13:16:04,206 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:16:33,504 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
+2025-12-09 13:16:33,605 | INFO |  * Restarting with stat
+2025-12-09 13:16:34,213 | WARNING |  * Debugger is active!
+2025-12-09 13:16:34,215 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:16:41,815 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5000
+2025-12-09 13:16:41,816 | INFO | Press CTRL+C to quit
+2025-12-09 13:18:12,302 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5000
+2025-12-09 13:18:12,302 | INFO | Press CTRL+C to quit
+2025-12-09 13:22:07,114 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:22:07,114 | INFO | Press CTRL+C to quit
+2025-12-09 13:22:07,116 | INFO |  * Restarting with stat
+2025-12-09 13:22:07,935 | WARNING |  * Debugger is active!
+2025-12-09 13:22:07,937 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:23:21,204 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
+2025-12-09 13:23:21,305 | INFO |  * Restarting with stat
+2025-12-09 13:24:06,973 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:24:06,973 | INFO | Press CTRL+C to quit
+2025-12-09 13:24:06,974 | INFO |  * Restarting with stat
+2025-12-09 13:24:07,689 | WARNING |  * Debugger is active!
+2025-12-09 13:24:07,691 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:24:36,315 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\app.py', reloading
+2025-12-09 13:24:36,418 | INFO |  * Restarting with stat
+2025-12-09 13:24:37,074 | WARNING |  * Debugger is active!
+2025-12-09 13:24:37,076 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:26:54,442 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:26:54,543 | INFO |  * Restarting with stat
+2025-12-09 13:26:59,170 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:26:59,170 | INFO | Press CTRL+C to quit
+2025-12-09 13:26:59,171 | INFO |  * Restarting with stat
+2025-12-09 13:26:59,827 | WARNING |  * Debugger is active!
+2025-12-09 13:26:59,829 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:28:47,631 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:28:47,747 | INFO |  * Restarting with stat
+2025-12-09 13:28:48,478 | WARNING |  * Debugger is active!
+2025-12-09 13:28:48,480 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:28:51,150 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:28:51,151 | INFO | Press CTRL+C to quit
+2025-12-09 13:28:51,153 | INFO |  * Restarting with stat
+2025-12-09 13:28:51,788 | WARNING |  * Debugger is active!
+2025-12-09 13:28:51,790 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:28:54,904 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:28:55,010 | INFO |  * Restarting with stat
+2025-12-09 13:28:55,608 | WARNING |  * Debugger is active!
+2025-12-09 13:28:55,610 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:28:56,644 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:28:56,752 | INFO |  * Restarting with stat
+2025-12-09 13:29:04,454 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:29:04,454 | INFO | Press CTRL+C to quit
+2025-12-09 13:29:04,455 | INFO |  * Restarting with stat
+2025-12-09 13:29:05,096 | WARNING |  * Debugger is active!
+2025-12-09 13:29:05,098 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:30:01,657 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:30:01,657 | INFO | Press CTRL+C to quit
+2025-12-09 13:30:01,658 | INFO |  * Restarting with stat
+2025-12-09 13:30:02,278 | WARNING |  * Debugger is active!
+2025-12-09 13:30:02,280 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:30:27,872 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:30:27,872 | INFO | Press CTRL+C to quit
+2025-12-09 13:30:27,873 | INFO |  * Restarting with stat
+2025-12-09 13:30:28,474 | WARNING |  * Debugger is active!
+2025-12-09 13:30:28,476 | INFO |  * Debugger PIN: 105-645-384
+2025-12-09 13:33:22,709 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:33:22,709 | INFO | Press CTRL+C to quit
+2025-12-09 13:33:22,710 | INFO |  * Restarting with stat
+2025-12-09 13:33:23,778 | WARNING |  * Debugger is active!
+2025-12-09 13:33:23,781 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:33:29,939 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\services\\db_service.py', reloading
+2025-12-09 13:33:30,080 | INFO |  * Restarting with stat
+2025-12-09 13:33:44,462 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:33:44,462 | INFO | Press CTRL+C to quit
+2025-12-09 13:33:44,464 | INFO |  * Restarting with stat
+2025-12-09 13:33:45,216 | WARNING |  * Debugger is active!
+2025-12-09 13:33:45,218 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:35:23,298 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:35:23,299 | INFO | Press CTRL+C to quit
+2025-12-09 13:35:23,301 | INFO |  * Restarting with stat
+2025-12-09 13:35:24,098 | WARNING |  * Debugger is active!
+2025-12-09 13:35:24,100 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:38:25,991 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:38:26,126 | INFO |  * Restarting with stat
+2025-12-09 13:38:27,120 | WARNING |  * Debugger is active!
+2025-12-09 13:38:27,122 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:38:37,386 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\config.py', reloading
+2025-12-09 13:38:37,513 | INFO |  * Restarting with stat
+2025-12-09 13:38:38,297 | WARNING |  * Debugger is active!
+2025-12-09 13:38:38,300 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:38:45,485 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\run.py', reloading
+2025-12-09 13:38:45,605 | INFO |  * Restarting with stat
+2025-12-09 13:38:46,348 | WARNING |  * Debugger is active!
+2025-12-09 13:38:46,350 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:38:55,109 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:38:55,109 | INFO | Press CTRL+C to quit
+2025-12-09 13:38:55,110 | INFO |  * Restarting with stat
+2025-12-09 13:38:55,959 | WARNING |  * Debugger is active!
+2025-12-09 13:38:55,961 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:39:27,813 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:39:27,937 | INFO |  * Restarting with stat
+2025-12-09 13:39:28,684 | WARNING |  * Debugger is active!
+2025-12-09 13:39:28,687 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:40:00,602 | INFO |  * Detected change in 'C:\\Work\\lcepl_Projects\\Comparison Project\\app\\__init__.py', reloading
+2025-12-09 13:40:00,728 | INFO |  * Restarting with stat
+2025-12-09 13:40:01,428 | WARNING |  * Debugger is active!
+2025-12-09 13:40:01,430 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 13:40:21,531 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 13:40:21,531 | INFO | Press CTRL+C to quit
+2025-12-09 13:40:21,533 | INFO |  * Restarting with stat
+2025-12-09 13:40:22,307 | WARNING |  * Debugger is active!
+2025-12-09 13:40:22,309 | INFO |  * Debugger PIN: 697-115-033
+2025-12-09 14:03:58,363 | INFO | WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5001
+2025-12-09 14:03:58,363 | INFO | Press CTRL+C to quit
+2025-12-09 14:03:58,364 | INFO |  * Restarting with stat
+2025-12-09 14:03:59,038 | WARNING |  * Debugger is active!
+2025-12-09 14:03:59,041 | INFO |  * Debugger PIN: 697-115-033