webhookasdsdfsdf

.env

@@ -3,7 +3,7 @@
 # -----------------------------
 FLASK_ENV=development
 FLASK_DEBUG=True
-FLASK_HOST='0.0.0.0'
+FLASK_HOST=0.0.0.0
 FLASK_PORT=5001
 
 # -----------------------------
@@ -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
 

Dockerfile

@@ -0,0 +1,24 @@
+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 5000
+
+# Run the application
+CMD ["python", "run.py"]

app/__init__.py

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

app/models/laying_client_model.py

@@ -5,16 +5,19 @@ class LayingClient(db.Model):
     __tablename__ = "laying_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor tables
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="laying_records")
 
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
     CC_length = db.Column(db.Float)
+    # Bedding Qty.
+    Outer_dia_of_MH_m = db.Column(db.Float)
+    Bedding_Length = db.Column(db.Float)
+    Width = db.Column(db.Float)
+    Depth = db.Column(db.Float)
+    Qty = db.Column(db.Float)
  
+    #  PIPE LAYING Qty. 
     Pipe_Dia_mm = db.Column(db.Float)
     ID_of_MH_m = db.Column(db.Float)
     Laying_Length = db.Column(db.Float)
@@ -32,7 +35,6 @@ class LayingClient(db.Model):
     pipe_900_mm = db.Column(db.Float)
     pipe_1200_mm = db.Column(db.Float)
     
-    
     Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
@@ -45,3 +47,12 @@ class LayingClient(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+    
+    def sum_laying_fields():
+        return [
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
+        ]

app/models/laying_model.py

@@ -10,11 +10,10 @@ class Laying(db.Model):
     # Relationship for easy access (subcontractor.subcontractor_name)
     subcontractor = db.relationship("Subcontractor", backref="laying_records")
 
-    # Basic Fields
+    # Pipe Laying Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
     CC_length = db.Column(db.Float)
- 
     Pipe_Dia_mm = db.Column(db.Float)
     ID_of_MH_m = db.Column(db.Float)
     Laying_Length = db.Column(db.Float)
@@ -32,7 +31,6 @@ class Laying(db.Model):
     pipe_900_mm = db.Column(db.Float)
     pipe_1200_mm = db.Column(db.Float)
     
-    
     Total = db.Column(db.Float)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
@@ -45,3 +43,12 @@ class Laying(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+
+    def sum_laying_fields():
+        return [
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
+        ]

app/models/manhole_domestic_chamber_model.py

@@ -49,4 +49,15 @@ class ManholeDomesticChamber(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    
+    def sum_mh_dc_fields():
+        return [
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
+            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
+            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
+            "d_9_16_to_9_65"]
 

app/models/mh_dc_client_model.py

@@ -44,3 +44,14 @@ class ManholeDomesticChamberClient(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+    
+    def sum_mh_dc_fields():
+        return [
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
+            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
+            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
+            "d_9_16_to_9_65" ]

app/models/trench_excavation_model.py

@@ -77,3 +77,34 @@ class TrenchExcavation(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    def excavation_category_sums(self):
+
+        def safe(val):
+            return val or 0
+
+        return {
+            "Soft_Murum_Total": (
+                safe(self.Soft_Murum_0_to_1_5)
+                + safe(self.Soft_Murum_1_5_to_3_0)
+                + safe(self.Soft_Murum_3_0_to_4_5)
+            ),
+
+            "Hard_Murum_Total": (
+                safe(self.Hard_Murum_0_to_1_5)
+                + safe(self.Hard_Murum_1_5_to_3_0)
+            ),
+
+            "Soft_Rock_Total": (
+                safe(self.Soft_Rock_0_to_1_5)
+                + safe(self.Soft_Rock_1_5_to_3_0)
+            ),
+
+            "Hard_Rock_Total": (
+                safe(self.Hard_Rock_0_to_1_5)
+                + safe(self.Hard_Rock_1_5_to_3_0)
+                + safe(self.Hard_Rock_3_0_to_4_5)
+                + safe(self.Hard_Rock_4_5_to_6_0)
+                + safe(self.Hard_Rock_6_0_to_7_5)
+            ),
+        }

app/routes/dashboard.py

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

app/routes/file_import.py

@@ -43,4 +43,4 @@ def client_import_file():
 
         flash(msg, "success" if success else "danger")
 
-    return render_template("file_import_client.html", title="Client File Import", subcontractors=subcontractors)
+    return render_template("file_import_client.html", title="Client File Import", subcontractors=subcontractors)

app/routes/file_report.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import io
+import logging
 from flask import Blueprint, render_template, request, send_file, flash
 from app.utils.helpers import login_required
 
@@ -18,6 +19,9 @@ from app.models.laying_client_model import LayingClient
  
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
+
+# Configure logging for debugging
+logger = logging.getLogger(__name__)
  
 # --- Client class ---
 class ClientBill:
@@ -28,20 +32,57 @@ class ClientBill:
         self.df_laying = pd.DataFrame()
  
     def Fetch(self, RA_Bill_No):
-        trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        logger.info("=" * 60)
-        mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        logger.info("ClientBill.Fetch() - START")
-        dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        logger.info("=" * 60)
-        lay = LayingClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        logger.info(f"Fetching data for RA_Bill_No: '{RA_Bill_No}'")
- 
+        logger.debug(f"  Type of RA_Bill_No: {type(RA_Bill_No)}")
-        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+        
-        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+        try:
-        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+            logger.info("Step 1: Fetching TrenchExcavationClient records...")
-        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+            trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-  
+            logger.info(f"✓ Trench records found: {len(trench)}")
-        drop_cols = ["id", "created_at", "_sa_instance_state"]
+            
-        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
+            logger.info("Step 2: Fetching ManholeExcavationClient records...")
-            if not df.empty:
+            mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-                df.drop(columns=drop_cols, errors="ignore", inplace=True)
+            logger.info(f"✓ Manhole records found: {len(mh)}")
+            
+            logger.info("Step 3: Fetching ManholeDomesticChamberClient records...")
+            dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+            logger.info(f"✓ Domestic Chamber records found: {len(dc)}")
+            
+            logger.info("Step 4: Fetching LayingClient records...")
+            lay = LayingClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+            logger.info(f"✓ Laying records found: {len(lay)}")
+            
+            logger.info("Step 5: Converting to DataFrames...")
+            self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+            self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+            self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+            self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+            
+            logger.debug(f"  Trench DF shape: {self.df_tr.shape}")
+            logger.debug(f"  Manhole DF shape: {self.df_mh.shape}")
+            logger.debug(f"  Domestic Chamber DF shape: {self.df_dc.shape}")
+            logger.debug(f"  Laying DF shape: {self.df_laying.shape}")
+            
+            logger.info("Step 6: Cleaning DataFrames...")
+            drop_cols = ["id", "created_at", "_sa_instance_state"]
+            for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
+                if not df.empty:
+                    df.drop(columns=drop_cols, errors="ignore", inplace=True)
+                    logger.debug(f"  Cleaned DF with shape: {df.shape}")
+            
+            logger.info("✓ ClientBill.Fetch() completed successfully")
+            logger.info("=" * 60)
+            
+        except Exception as e:
+            logger.error("=" * 60)
+            logger.error(f"ERROR in ClientBill.Fetch(): {str(e)}")
+            logger.error(f"Error type: {type(e).__name__}")
+            logger.exception("Full traceback:")
+            logger.error("=" * 60)
+            raise
  
 # --- Subcontractor class ---
 class SubcontractorBill:
@@ -52,27 +93,70 @@ class SubcontractorBill:
         self.df_laying = pd.DataFrame()
  
     def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
-        filters = {}
+        logger.info("=" * 60)
-        if subcontractor_id:
+        logger.info("SubcontractorBill.Fetch() - START")
-            filters["subcontractor_id"] = subcontractor_id
+        logger.info("=" * 60)
-        if RA_Bill_No:
+        logger.info(f"Parameters:")
-            filters["RA_Bill_No"] = RA_Bill_No
+        logger.info(f"  RA_Bill_No: '{RA_Bill_No}' (type: {type(RA_Bill_No)})")
- 
+        logger.info(f"  subcontractor_id: '{subcontractor_id}' (type: {type(subcontractor_id)})")
-        trench = TrenchExcavation.query.filter_by(**filters).all()
+        
-        mh = ManholeExcavation.query.filter_by(**filters).all()
+        try:
-        dc = ManholeDomesticChamber.query.filter_by(**filters).all()
+            filters = {}
-        lay = Laying.query.filter_by(**filters).all()
+            if subcontractor_id:
- 
+                filters["subcontractor_id"] = subcontractor_id
-        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+                logger.debug(f"  Added filter - subcontractor_id: {subcontractor_id}")
-        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+            if RA_Bill_No:
-        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+                filters["RA_Bill_No"] = RA_Bill_No
-        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+                logger.debug(f"  Added filter - RA_Bill_No: {RA_Bill_No}")
-  
+            
-        drop_cols = ["id", "created_at", "_sa_instance_state"]
+            logger.info(f"Applied filters: {filters}")
-        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
+            
-            if not df.empty:
+            logger.info("Step 1: Fetching TrenchExcavation records...")
-                df.drop(columns=drop_cols, errors="ignore", inplace=True)
+            trench = TrenchExcavation.query.filter_by(**filters).all()
- 
+            logger.info(f"✓ Trench records found: {len(trench)}")
+            
+            logger.info("Step 2: Fetching ManholeExcavation records...")
+            mh = ManholeExcavation.query.filter_by(**filters).all()
+            logger.info(f"✓ Manhole records found: {len(mh)}")
+            
+            logger.info("Step 3: Fetching ManholeDomesticChamber records...")
+            dc = ManholeDomesticChamber.query.filter_by(**filters).all()
+            logger.info(f"✓ Domestic Chamber records found: {len(dc)}")
+            
+            logger.info("Step 4: Fetching Laying records...")
+            lay = Laying.query.filter_by(**filters).all()
+            logger.info(f"✓ Laying records found: {len(lay)}")
+            
+            logger.info("Step 5: Converting to DataFrames...")
+            self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+            self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+            self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+            self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+            
+            logger.debug(f"  Trench DF shape: {self.df_tr.shape}")
+            logger.debug(f"  Manhole DF shape: {self.df_mh.shape}")
+            logger.debug(f"  Domestic Chamber DF shape: {self.df_dc.shape}")
+            logger.debug(f"  Laying DF shape: {self.df_laying.shape}")
+            
+            logger.info("Step 6: Cleaning DataFrames...")
+            drop_cols = ["id", "created_at", "_sa_instance_state"]
+            for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
+                if not df.empty:
+                    df.drop(columns=drop_cols, errors="ignore", inplace=True)
+                    logger.debug(f"  Cleaned DF with shape: {df.shape}")
+            
+            logger.info("✓ SubcontractorBill.Fetch() completed successfully")
+            logger.info("=" * 60)
+            
+        except Exception as e:
+            logger.error("=" * 60)
+            logger.error(f"ERROR in SubcontractorBill.Fetch(): {str(e)}")
+            logger.error(f"Error type: {type(e).__name__}")
+            logger.exception("Full traceback:")
+            logger.error("=" * 60)
+            raise
+
+
 # --- subcontractor report only  ---
 @file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
 @login_required
@@ -91,7 +175,7 @@ def report_file():
  
         if not subcontractor_id:
             flash("Please select a subcontractor.", "danger")
-            return render_template("report.html", subcontractors=subcontractors)
+            return render_template("subcontractor_report.html", subcontractors=subcontractors)
  
         subcontractor = Subcontractor.query.get(subcontractor_id)
         bill_gen = SubcontractorBill()
@@ -102,13 +186,13 @@ def report_file():
         else:
             if not ra_bill_no:
                 flash("Please enter an RA Bill Number.", "danger")
-                return render_template("report.html", subcontractors=subcontractors)
+                return render_template("subcontractor_report.html", subcontractors=subcontractors)
             bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
             file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
  
         if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
             flash("No data found for this selection.", "warning")
-            return render_template("report.html", subcontractors=subcontractors)
+            return render_template("subcontractor_report.html", subcontractors=subcontractors)
  
         # If download is clicked, return file immediately
         if action == "download":
@@ -144,87 +228,70 @@ def report_file():
 @file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
 def client_vs_all_subcontractor():
-    # Initialize dictionary keys to match HTML variables
+    tables = {"tr": None, "mh": None, "dc": None}
-    tables = {"tr": None, "mh": None, "dc": None, "laying": None}
     ra_val = ""
-
+ 
     if request.method == "POST":
         RA_Bill_No = request.form.get("RA_Bill_No")
-        action = request.form.get("action")  # Identify if 'download' or 'preview'
         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)
-
+ 
         clientBill = ClientBill()
         clientBill.Fetch(RA_Bill_No=RA_Bill_No)
         contractorBill = SubcontractorBill()
         contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
-
+ 
-        # Safety Check: Verify if data exists
+        # --- SAFETY CHECK: Verify data exists before merging ---
-        if clientBill.df_tr.empty and clientBill.df_mh.empty and clientBill.df_laying.empty:
+        if clientBill.df_tr.empty and clientBill.df_mh.empty:
             flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
             return render_template("client_report.html", tables=tables, ra_val=ra_val)
-
+ 
-        # Define columns based on your model field names
+        qty_cols = [...] # (Keep your existing list)
-        qty_cols = [
+        mh_dc_qty_cols = [...] # (Keep your existing list)
-            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm", "pipe_300_mm", 
+        mh_lay_qty_cols =[...]
-            "pipe_350_mm", "pipe_400_mm", "pipe_450_mm", "pipe_500_mm", 
-            "pipe_600_mm", "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
-        ]
-        mh_dc_qty_cols = ["qty", "total"]  # Update these based on your DC model fields
-        mh_lay_qty_cols = qty_cols + ["Laying_Length", "CC_length"]
 
         def aggregate_df(df, group_cols, sum_cols):
             if df.empty:
+                # Create an empty DF with the correct columns to avoid Merge/Key Errors
                 return pd.DataFrame(columns=group_cols + sum_cols)
             existing_cols = [c for c in sum_cols if c in df.columns]
+            # Ensure group_cols exist in the DF
             for col in group_cols:
                 if col not in df.columns:
-                    df[col] = "N/A"
+                    df[col] = "N/A" # Fill missing join keys
             return df.groupby(group_cols, as_index=False)[existing_cols].sum()
-
+ 
-        # Aggregate data from Subcontractor tables
+        # Aggregate data
         df_sub_tr_grp = aggregate_df(contractorBill.df_tr, ["Location", "MH_NO"], qty_cols)
         df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols)
         df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_dc_qty_cols)
-        # FIXED: Aggregating from .df_laying
+        df_sub_lay_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_lay_qty_cols)
-        df_sub_lay_grp = aggregate_df(contractorBill.df_laying, ["Location", "MH_NO"], mh_lay_qty_cols)
+ 
-
+        # --- FINAL MERGE LOGIC ---
-        # Standardize "Location" column to prevent merge keys being missing
+        # We check if "Location" exists in the client data. If not, we add it to prevent the KeyError.
-        for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying]:
+        for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying ]:
             if not df_client.empty and "Location" not in df_client.columns:
                 df_client["Location"] = "Unknown"
-
+ 
         try:
-            # Final Merge for Comparison
             df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
             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"))
             df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
-
-            # --- EXCEL DOWNLOAD LOGIC ---
-            if action == "download":
-                output = io.BytesIO()
-                with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-                    df_tr_cmp.to_excel(writer, index=False, sheet_name="Tr.Ex ")
-                    df_mh_cmp.to_excel(writer, index=False, sheet_name="Mh.Ex ")
-                    df_dc_cmp.to_excel(writer, index=False, sheet_name="DC ")
-                    df_lay_cmp.to_excel(writer, index=False, sheet_name="Laying and Bedding")
-                output.seek(0)
-                file_name = f"Client_Comparison_RA_{RA_Bill_No}.xlsx"
-                return send_file(output, download_name=file_name, as_attachment=True)
-
-            # --- PREVIEW HTML LOGIC ---
-            table_classes = 'table table-striped table-hover table-sm border shadow-sm'
-            tables["tr"] = df_tr_cmp.to_html(classes=table_classes, index=False)
-            tables["mh"] = df_mh_cmp.to_html(classes=table_classes, index=False)
-            tables["dc"] = df_dc_cmp.to_html(classes=table_classes, index=False)
-            tables["laying"] = df_lay_cmp.to_html(classes=table_classes, index=False)
-
         except KeyError as e:
-            flash(f"Merge Error: Missing column {str(e)}", "danger")
+            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)
-
+ 
-    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,30 +1,39 @@
 from flask import Blueprint, render_template, request, send_file, flash
+from collections import defaultdict
 import pandas as pd
 import io
-
+ 
 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 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
-
+import re
+ 
+ 
 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
-
+ 
-
+ 
+# sum field  of pipe laying (pipe_150_mm)
+PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+# sum fields of MH dc (d_0_to_0_75)
+D_RANGE_PATTERN = re.compile( r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
+ 
+ 
 # NORMALIZER
 def normalize_key(value):
     if value is None:
         return None
     return str(value).strip().upper()
-
+ 
-
+ 
 # HEADER FORMATTER
 def format_header(header):
     if "-" in header:
@@ -32,11 +41,11 @@ def format_header(header):
         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]}")
@@ -44,98 +53,111 @@ 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 
+# 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[(location, key_val)] = r
+            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
-
+ 
-        s = contractor_lookup.get((client_location, client_key))
+        subs = contractor_lookup.get((client_location, client_key))
-        if not s:
+        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 D_RANGE_PATTERN.match(k)
+            or PIPE_MM_PATTERN.match(k)
         )
-
+ 
         sub_total = sum(
             float(v or 0)
             for k, v in s.items()
             if k.endswith("_total")
+            or D_RANGE_PATTERN.match(k)
+            or PIPE_MM_PATTERN.match(k)
         )
-
+ 
-        diff = client_total - sub_total
-
         row = {
             "Location": client_location,
             key_field.replace("_", " "): client_key
         }
-
+ 
-        # CLIENT DATA
         for k, v in c.items():
-            if k in ["id", "created_at"]:
+            if k not in ["id", "created_at"]:
-                continue
+                row[f"Client-{k}"] = v
-            row[f"Client-{k}"] = v
+ 
-
         row["Client-Total"] = round(client_total, 2)
         row[" "] = ""
-
+ 
-        # SUBCONTRACTOR DATA
         for k, v in s.items():
-            if k in ["id", "created_at", "subcontractor_id"]:
+            if k not in ["id", "created_at", "subcontractor_id"]:
-                continue
+                row[f"Subcontractor-{k}"] = v
-            row[f"Subcontractor-{k}"] = v
+ 
-
         row["Subcontractor-Total"] = round(sub_total, 2)
-        row["Diff"] = round(diff, 2)
+        row["Diff"] = round(client_total - sub_total, 2)
-
+ 
         output.append(row)
-
+ 
     df = pd.DataFrame(output)
     df.columns = [format_header(col) for col in df.columns]
     return df
-
+ 
-
+ 
+ 
+ 
 # EXCEL SHEET WRITER
 def write_sheet(writer, df, sheet_name, subcontractor_name):
     workbook = writer.book
     df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
     ws = writer.sheets[sheet_name]
-
+ 
     title_fmt = workbook.add_format({"bold": True, "font_size": 14})
-    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
+    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#B6DAED"})
-    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
+    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F3A081"})
-    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
+    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7D261"})
-    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
+    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#82DD49"})
     default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})
-
+ 
-
+ 
     ws.merge_range(
         0, 0, 0, len(df.columns) - 1,
         "CLIENT vs SUBCONTRACTOR",
@@ -146,72 +168,75 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
         f"Subcontractor Name - {subcontractor_name}",
         title_fmt
     )
-
+ 
+ 
     for col_num, col_name in enumerate(df.columns):
         if col_name.startswith("Client-"):
             ws.write(3, col_num, col_name, client_fmt)
         elif col_name.startswith("Subcontractor-"):
             ws.write(3, col_num, col_name, sub_fmt)
-        elif col_name.endswith("Total"):
+        elif col_name.endswith("_total") or col_name.endswith("_total") :
             ws.write(3, col_num, col_name, total_fmt)
         elif col_name == "Diff":
             ws.write(3, col_num, col_name, diff_fmt)
         else:
             ws.write(3, col_num, col_name, default_header_fmt)
-
+ 
         ws.set_column(col_num, col_num, 20)
-
+ 
-
+ 
 # REPORT ROUTE
 @generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
 @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")
             return render_template("generate_comparison_report.html",subcontractors=subcontractors)
-
+ 
         subcontractor = Subcontractor.query.get_or_404(subcontractor_id)
-
+ 
         # -------- DATA --------
         tr_client = [r.serialize() for r in TrenchExcavationClient.query.all()]
         tr_sub = [r.serialize() for r in TrenchExcavation.query.filter_by(
             subcontractor_id=subcontractor_id
         ).all()]
         df_tr = build_comparison(tr_client, tr_sub, "MH_NO")
-
+ 
         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")
-
+        # df_dc = build_comparison_mh_dc(dc_client, dc_sub, "MH_NO")
+ 
         lay_client = [r.serialize() for r in LayingClient.query.all()]
         lay_sub = [r.serialize() for r in Laying.query.filter_by(
             subcontractor_id=subcontractor_id
         ).all()]
         df_lay = build_comparison(lay_client, lay_sub, "MH_NO")
-
+        # df_lay = build_comparison_laying(lay_client, lay_sub, "MH_NO")
-
+ 
+ 
         # -------- EXCEL --------
         output = io.BytesIO()
         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)
             write_sheet(writer, df_mh, "Mh.Ex", subcontractor.subcontractor_name)
             write_sheet(writer, df_dc, "MH & DC", subcontractor.subcontractor_name)
             write_sheet(writer, df_lay, "Laying", subcontractor.subcontractor_name)
-
+ 
         output.seek(0)
         return send_file(
             output,
@@ -219,7 +244,109 @@ def comparison_report():
             download_name=filename,
             mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         )
-
+ 
     return render_template("generate_comparison_report.html",subcontractors=subcontractors)
-
+ 
-
+ 
+# def build_comparison_mh_dc(client_rows, contractor_rows, key_field):
+#     contractor_lookup = make_lookup(contractor_rows, key_field)
+#     mh_dc_fields = ManholeDomesticChamberClient.sum_mh_dc_fields()
+ 
+#     output = []
+ 
+#     for c in client_rows:
+#         loc = normalize_key(c.get("Location"))
+#         key = normalize_key(c.get(key_field))
+#         if not loc or not key:
+#             continue
+ 
+#         s = contractor_lookup.get((loc, key))
+#         if not s:
+#             continue
+ 
+#         client_total = sum(float(c.get(f, 0) or 0) for f in mh_dc_fields)
+#         sub_total = sum(float(s.get(f, 0) or 0) for f in mh_dc_fields)
+ 
+#         row = {
+#             "Location": loc,
+#             key_field.replace("_", " "): key
+#         }
+ 
+#         # CLIENT – ALL FIELDS
+#         for k, v in c.items():
+#             if k in ["id", "created_at"]:
+#                 continue
+#             row[f"Client-{k}"] = v
+ 
+#         row["Client-Total"] = round(client_total, 2)
+#         row[" "] = ""
+ 
+#         # SUBCONTRACTOR – ALL FIELDS
+#         for k, v in s.items():
+#             if k in ["id", "created_at", "subcontractor_id"]:
+#                 continue
+#             row[f"Subcontractor-{k}"] = v
+ 
+#         row["Subcontractor-Total"] = round(sub_total, 2)
+#         row["Diff"] = round(client_total - sub_total, 2)
+ 
+#         output.append(row)
+ 
+#     df = pd.DataFrame(output)
+#     df.columns = [format_header(col) for col in df.columns]
+#     return df
+ 
+ 
+# def build_comparison_laying(client_rows, contractor_rows, key_field):
+#     contractor_lookup = make_lookup(contractor_rows, key_field)
+#     laying_fields = Laying.sum_laying_fields()
+ 
+#     output = []
+ 
+#     for c in client_rows:
+#         loc = normalize_key(c.get("Location"))
+#         key = normalize_key(c.get(key_field))
+#         if not loc or not key:
+#             continue
+ 
+#         s = contractor_lookup.get((loc, key))
+#         if not s:
+#             continue
+ 
+#         client_total = sum(float(c.get(f, 0) or 0) for f in laying_fields)
+#         sub_total = sum(float(s.get(f, 0) or 0) for f in laying_fields)
+ 
+#         print("--------------",key,"----------")
+#         print("sum -client_total ",client_total)
+#         print("sum -sub_total ",sub_total)
+#         print("Diff ---- ",client_total - sub_total)
+#         print("------------------------")
+#         row = {
+#             "Location": loc,
+#             key_field.replace("_", " "): key
+#         }
+ 
+#         # CLIENT – ALL FIELDS
+#         for k, v in c.items():
+#             if k in ["id", "created_at"]:
+#                 continue
+#             row[f"Client-{k}"] = v
+ 
+#         row["Client-Total"] = round(client_total, 2)
+#         row[" "] = ""
+ 
+#         # SUBCONTRACTOR – ALL FIELDS
+#         for k, v in s.items():
+#             if k in ["id", "created_at", "subcontractor_id"]:
+#                 continue
+#             row[f"Subcontractor-{k}"] = v
+ 
+#         row["Subcontractor-Total"] = round(sub_total, 2)
+#         row["Diff"] = round(client_total - sub_total, 2)
+ 
+#         output.append(row)
+ 
+#     df = pd.DataFrame(output)
+#     df.columns = [format_header(col) for col in df.columns]
+#     return df
+ 

app/services/dashboard_service.py

@@ -0,0 +1,49 @@
+from app.config import Config
+from app import db
+import matplotlib
+matplotlib.use("Agg")
+from app.routes.dashboard import plot_to_base64
+import matplotlib.pyplot as plt
+import io
+import base64
+
+from app.utils.plot_utils import plot_to_base64
+
+# Subcontractor models import
+from app.models.trench_excavation_model import TrenchExcavation
+
+# Client models import
+# from app.models.tr_ex_client_model import TrenchExcavationClient
+
+
+class DashboardService:
+
+
+    # bar chart
+    def bar_chart_of_tr_ex():
+        categories = ["Soft Murum", "Hard Murum", "Soft Rock", "Hard Rock"]
+        values = [120, 80, 150, 60]
+
+        tr = TrenchExcavation()
+
+        record = TrenchExcavation.query.first()
+        print(" RA_Bill_No::",record["RA_Bill_No"])
+
+        totals = tr.excavation_category_sums()
+
+        # print(totals["Soft_Murum_Total"])
+        # print(totals["Hard_Rock_Total"])
+
+
+        plt.figure()
+        plt.bar(categories, values)
+        plt.title("Trench Excavation Work Category Report")
+        plt.xlabel("Excavation category")
+        plt.ylabel("Quantity")
+
+        return plot_to_base64(plt)
+
+
+    def subcontractor_dash():
+            return True
+        

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

@@ -4,17 +4,6 @@
 <div class="container-fluid mt-4">
     <h2 class="mb-4">Client File Reports</h2>
 
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
-    {% endfor %}
-    {% endif %}
-    {% endwith %}
-
     <div class="card p-4 shadow-sm mb-5">
         <form method="POST">
             <label class="form-label fw-bold">RA Bill No</label>
@@ -27,12 +16,13 @@
                 </div>
                 <div class="col-md-6">
                     <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
-                        Report</button>
+                        Report Anish anassdfsdfdfasfd Prajakta</button>
-                </div>
+                </div> 
             </div>
         </form>
     </div>
 
+
     {% if tables.tr or tables.mh or tables.dc or tables.laying %}
     <div class="card shadow-sm p-3">
         <h4 class="mb-3">Comparison Preview</h4>
@@ -40,19 +30,20 @@
         <ul class="nav nav-tabs" id="reportTabs" role="tablist">
             <li class="nav-item">
                 <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
-                    type="button">Tr.Ex </button>
+                    type="button">Tr.Ex Comparison</button>
             </li>
             <li class="nav-item">
                 <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
-                    </button>
+                    Comparison</button>
             </li>
             <li class="nav-item">
                 <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
-                    </button>
+                    Comparison</button>
             </li>
             <li class="nav-item">
-                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
-                    & Bedding </button>
+                    type="button">Laying
+                    & Bedding Comparison</button>
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">
@@ -76,9 +67,9 @@
                     {{ tables.laying|safe }}
                 </div>
 
+            </div>
         </div>
-    </div>
+        {% endif %}
-    {% endif %}
 
-</div>
+    </div>
-{% endblock %}
+    {% endblock %}

app/templates/dashboard.html

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

app/templates/subcontractor/add.html

@@ -13,7 +13,7 @@
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Contact Person</label>
+            <label class="form-label">Contact Person Name</label>
             <input type="text" class="form-control" name="contact_person">
         </div>
 

app/utils/plot_utils.py

@@ -0,0 +1,10 @@
+import base64
+from io import BytesIO
+import matplotlib
+matplotlib.use("Agg")
+
+def plot_to_base64(plt):
+    img = BytesIO()
+    plt.savefig(img, format="png", bbox_inches="tight")
+    img.seek(0)
+    return base64.b64encode(img.read()).decode("utf-8")

docker-compose.yml

@@ -0,0 +1,46 @@
+version: '3.8'
+
+services:
+  db:
+    image: mysql:8.0
+    container_name: comparison_db
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: admin
+      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: admin
+
+    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:

requirements.txt

@@ -7,3 +7,5 @@ python-dotenv
 cryptography
 xlsxwriter
 matplotlib 
+flask_sqlalchemy
+flask_migrate

test_ra_bills.py

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