dabase column field type changes

Reviewed-on: #9

.dockerignore

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

.env

@@ -3,8 +3,8 @@
 # -----------------------------
 FLASK_ENV=development
 FLASK_DEBUG=True
-FLASK_HOST='0.0.0.0'
-FLASK_PORT=5001
+FLASK_HOST=0.0.0.0
+FLASK_PORT=5011
 
 # -----------------------------
 # Security
@@ -24,8 +24,3 @@ DB_PASSWORD=root
 
 # DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
 
-
-
-
-
-

.gitignore

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

Dockerfile

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

README.md

@@ -1,3 +1,583 @@
-# Comparison_Project
+# Comparison Project - Backend Documentation
 
-Comparison Project 
+A Flask-based web application for comparing and managing construction project data (excavation and manhole work) between subcontractors and clients. The system imports data from Excel files, stores it in a database, and generates comparison reports.
+
+## Table of Contents
+
+- [Project Overview](#project-overview)
+- [Tech Stack](#tech-stack)
+- [Project Structure](#project-structure)
+- [Database Schema](#database-schema)
+- [Application Flow](#application-flow)
+- [API Routes & Endpoints](#api-routes--endpoints)
+- [Setup & Installation](#setup--installation)
+
+---
+
+## Project Overview
+
+The Comparison Project is designed to:
+- **Manage subcontractors** and their excavation data (Manhole Excavation, Trench Excavation, Domestic Chambers)
+- **Import client-side project data** for comparison
+- **Compare subcontractor work** against client specifications
+- **Generate detailed reports** highlighting differences between client and subcontractor data
+- **User authentication** with login/registration system
+
+### Key Features
+
+✅ User Authentication (Register/Login/Logout)  
+✅ Subcontractor Management (Add/Edit/List/Delete)  
+✅ File Import (Excel/CSV) for both Client and Subcontractor data  
+✅ Data validation and duplicate detection  
+✅ Comparison Reports with Excel export  
+✅ Dashboard with file management  
+
+---
+
+## Tech Stack
+
+**Backend Framework**: Flask  
+**Database**: SQL Database (MySQL/PostgreSQL/SQLite configured via environment variables)  
+**ORM**: SQLAlchemy  
+**File Processing**: Pandas, OpenPyXL, XlsxWriter  
+**Authentication**: Werkzeug (Password hashing)  
+**Configuration**: Python Dotenv  
+
+### Dependencies
+
+```
+Flask
+pandas
+openpyxl
+xlrd
+Werkzeug
+python-dotenv
+cryptography
+xlsxwriter
+matplotlib 
+
+```
+
+---
+
+## Project Structure
+
+```
+Comparison_Project/
+├── run.py                          # Application entry point
+├── requirements.txt                # Python dependencies
+├── .env                            # Environment variables (DB, secrets)
+├── README.md                       # This file
+│
+├── app/
+│   ├── __init__.py                # Flask app initialization
+│   ├── config.py                  # Configuration settings
+│   │
+│   ├── models/                    # Database models (SQLAlchemy ORM)
+│   │   ├── user_model.py          # User table schema
+│   │   ├── subcontractor_model.py # Subcontractor table schema
+│   │   ├── manhole_excavation_model.py        # Subcontractor MH excavation
+│   │   ├── trench_excavation_model.py         # Subcontractor Trench excavation
+│   │   ├── manhole_domestic_chamber_model.py  # Subcontractor Domestic chamber
+│   │   ├── mh_ex_client_model.py   # Client MH excavation
+│   │   ├── tr_ex_client_model.py   # Client Trench excavation
+│   │   └── mh_dc_client_model.py   # Client Domestic chamber
+│   │
+│   ├── routes/                    # Flask Blueprints (API endpoints)
+│   │   ├── auth.py                # Login, Register, Logout
+│   │   ├── dashboard.py           # Dashboard page
+│   │   ├── file_import.py         # File upload endpoints
+│   │   ├── file_report.py         # Fetch and format data for reports
+│   │   ├── generate_comparison_report.py  # Comparison logic & Excel export
+│   │   ├── subcontractor_routes.py        # CRUD for subcontractors
+│   │   ├── user.py                # User management routes
+│   │   └── file_format.py         # File format validation
+│   │
+│   ├── services/                  # Business logic layer
+│   │   ├── db_service.py          # Database connection & SQLAlchemy init
+│   │   ├── file_service.py        # File parsing & data insertion
+│   │   └── user_service.py        # User authentication logic
+│   │
+│   ├── utils/                     # Helper functions
+│   │   ├── file_utils.py          # File path utilities
+│   │   ├── helpers.py             # Decorators, common helpers
+│   │   └── __pycache__/
+│   │
+│   ├── static/                    # Static assets
+│   │   ├── css/                   # Stylesheets
+│   │   ├── images/                # Images
+│   │   ├── uploads/               # Uploaded files directory
+│   │   │   ├── Client_Bill_1/
+│   │   │   └── sub_1/
+│   │   └── downloads/             # Generated reports
+│   │
+│   ├── templates/                 # Jinja2 HTML templates
+│   │   ├── base.html              # Base template
+│   │   ├── login.html
+│   │   ├── register.html
+│   │   ├── dashboard.html
+│   │   ├── file_import.html
+│   │   ├── file_import_client.html
+│   │   ├── file_format.html
+│   │   ├── file_report.html
+│   │   ├── generate_comparison_report.html
+│   │   ├── generate_comparison_client_vs_subcont.html
+│   │   ├── list_user.html
+│   │   ├── report.html
+│   │   ├── users.htm
+│   │   └── subcontractor/
+│   │       ├── add.html
+│   │       ├── edit.html
+│   │       └── list.html
+│   │
+│   └── logs/                      # Application logs
+│
+├── instance/                      # Instance folder (DB, temp files)
+└── logs/                          # Root level logs
+```
+
+---
+
+## Database Schema
+
+### 1. **Users Table** (`users`)
+Stores user authentication data.
+
+| Column | Type | Constraints | Purpose |
+|--------|------|-------------|---------|
+| `id` | Integer | Primary Key | User identifier |
+| `name` | String(120) | NOT NULL | User's full name |
+| `email` | String(120) | UNIQUE, NOT NULL | User's email |
+| `password_hash` | String(255) | NOT NULL | Hashed password (Werkzeug) |
+
+**Key Methods:**
+- `set_password(password)` - Hash and store password
+- `check_password(password)` - Verify password
+
+---
+
+### 2. **Subcontractors Table** (`subcontractors`)
+Stores subcontractor company information.
+
+| Column | Type | Constraints | Purpose |
+|--------|------|-------------|---------|
+| `id` | Integer | Primary Key | Subcontractor ID |
+| `subcontractor_name` | String(255) | NOT NULL | Company name |
+| `address` | String(500) | - | Company address |
+| `gst_no` | String(50) | - | GST number |
+| `pan_no` | String(50) | - | PAN number |
+| `mobile_no` | String(20) | - | Contact phone |
+| `email_id` | String(150) | - | Contact email |
+| `contact_person` | String(150) | - | Contact person name |
+| `status` | String(20) | Default: "Active" | Active/Inactive status |
+| `created_at` | DateTime | Default: today | Record creation date |
+
+**Relationships:**
+- One-to-Many with `manhole_excavation`
+- One-to-Many with `trench_excavation`
+- One-to-Many with `manhole_domestic_chamber`
+
+---
+
+### 3. **Manhole Excavation (Subcontractor)** (`manhole_excavation`)
+Stores manhole excavation work data from subcontractors.
+
+| Column Type | Purpose |
+|-----|---------|
+| `id` | Primary Key |
+| `subcontractor_id` | Foreign Key → Subcontractor |
+| `Location` | Worksite location |
+| `MH_NO` | Manhole number |
+| `RA_Bill_No` | RA Bill reference (for grouping) |
+| `Upto_IL_Depth`, `Cutting_Depth`, `ID_of_MH_m`, `Ex_Dia_of_Manhole`, `Area_of_Manhole` | Dimension fields |
+| **Excavation Categories** (by depth ranges): | |
+| Soft_Murum_0_to_1_5, Soft_Murum_1_5_to_3_0, etc. | Material type + depth range |
+| Hard_Murum_0_to_1_5, Hard_Murum_1_5_to_3_0, etc. | Hard mudstone layers |
+| Soft_Rock_0_to_1_5, Soft_Rock_1_5_to_3_0, etc. | Soft rock layers |
+| Hard_Rock_0_to_1_5 through Hard_Rock_6_0_to_7_5 | Hard rock layers |
+| **Totals** | Sum per category |
+| `Total` | Grand total excavation |
+| `Remarks`, `created_at` | Notes and timestamp |
+
+---
+
+### 4. **Trench Excavation (Subcontractor)** (`trench_excavation`)
+Stores trench/sewer line excavation work data from subcontractors.
+
+**Similar structure to Manhole Excavation with additional fields:**
+- Width categories: `Width_0_to_2_5`, `Width_2_5_to_3_0`, etc.
+- `Avg_Depth`, `Actual_Trench_Length`, `Pipe_Dia_mm`
+
+---
+
+### 5. **Manhole Domestic Chamber (Subcontractor)** (`manhole_domestic_chamber`)
+Stores domestic chamber construction data.
+
+| Key Fields | Purpose |
+|-----------|---------|
+| `id`, `subcontractor_id` | Primary & Foreign Key |
+| `Location`, `MH_NO`, `RA_Bill_No` | Identification |
+| `Depth_of_MH`, `MH_TOP_LEVEL`, `MH_IL_LEVEL` | Dimensions |
+| `d_0_to_1_5` through `d_6_0_to_6_5` | Depth-based excavation categories |
+| `Domestic_Chambers` | Count of chambers |
+| `DWC_Pipe_Length`, `UPVC_Pipe_Length` | Pipe lengths |
+
+---
+
+### 6-8. **Client Data Tables** (Similar structure to subcontractor models)
+
+- **`mh_ex_client`** - Manhole Excavation (Client specifications)
+- **`tr_ex_client`** - Trench Excavation (Client specifications)
+- **`mh_dc_client`** - Manhole Domestic Chamber (Client specifications)
+
+**Note:** Client tables do NOT have `subcontractor_id` as they represent client baseline data.
+
+---
+
+## Application Flow
+
+### 1. **User Authentication Flow**
+```
+User Access (/) 
+  ↓
+Redirect to /login
+  ↓
+[Login Page]
+  ├─ POST /auth/login
+  │   ↓
+  │   UserService.validate_login(email, password)
+  │   ↓
+  │   Query User table, verify password
+  │   ↓
+  │   Set session["user_id"], session["user_name"]
+  ↓
+Redirect to /dashboard
+```
+
+### 2. **Subcontractor File Import Flow**
+```
+User → /file/import [GET]
+  ↓
+Display form with subcontractor dropdown
+  ↓
+User selects subcontractor & uploads Excel file
+  ↓
+POST /file/import
+  ↓
+FileService.handle_file_upload()
+  ├─ Validate file type (xlsx, xls, csv)
+  ├─ Create upload folder: static/uploads/sub_{id}/
+  ├─ Save file
+  │
+  ├─ Read Excel sheets:
+  │  ├─ "Tr.Ex." (Trench Excavation)
+  │  ├─ "MH Ex." (Manhole Excavation)
+  │  └─ "MH & DC" (Manhole & Domestic Chamber)
+  │
+  ├─ Process each sheet:
+  │  ├─ Normalize column names
+  │  ├─ Clean data (handle NaN, empty values)
+  │  ├─ Check for duplicates by (Location, MH_NO, RA_Bill_No, subcontractor_id)
+  │  ├─ Insert records into respective tables
+  │  └─ Commit to database
+  │
+  └─ Return success/error message
+```
+
+### 3. **Client File Import Flow**
+```
+User → /file/import_client [GET]
+  ↓
+Display form for client file upload
+  ↓
+User uploads Excel file with client specifications
+  ↓
+POST /file/import_client
+  ↓
+FileService.handle_client_file_upload()
+  ├─ Validate & save file
+  ├─ Read sheets: "Tr.Ex.", "MH Ex.", "MH & DC"
+  ├─ Process and insert into:
+  │  ├─ mh_ex_client
+  │  ├─ tr_ex_client
+  │  └─ mh_dc_client
+  └─ Return status
+```
+
+### 4. **Comparison Report Generation Flow**
+```
+User → /report/generate_comparison [GET]
+  ↓
+Display form to select RA Bill No.
+  ↓
+User selects bill number
+  ↓
+POST /report/generate_comparison
+  ↓
+generate_report_bp routes request
+  ├─ Fetch client data (mh_ex_client, tr_ex_client, mh_dc_client)
+  ├─ Fetch subcontractor data (by RA_Bill_No)
+  ├─ For each record type:
+  │  ├─ Create lookup table by (Location, MH_NO)
+  │  ├─ Match client records with subcontractor records
+  │  ├─ Calculate totals for each category
+  │  ├─ Compute differences/variances
+  │  └─ Format for Excel output
+  │
+  ├─ Generate Excel file with comparison results:
+  │  ├─ Summary sheet
+  │  ├─ Detailed Trench Excavation comparison
+  │  ├─ Detailed Manhole Excavation comparison
+  │  └─ Detailed Domestic Chamber comparison
+  │
+  └─ Send file to client as download
+```
+
+### 5. **Dashboard & Data Retrieval Flow**
+```
+User → /dashboard [GET]
+  ↓
+Check session["user_id"] (authentication)
+  ↓
+Render dashboard.html
+  ├─ Display available reports
+  ├─ List recent RA Bills
+  ├─ Show subcontractor list
+  └─ Provide navigation to:
+     ├─ File import
+     ├─ Reports
+     ├─ Subcontractor management
+     └─ Logout
+```
+
+---
+
+## API Routes & Endpoints
+
+### Authentication Routes (`/auth`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET/POST | `/login` | Login form & validation | ❌ |
+| GET/POST | `/register` | User registration | ❌ |
+| GET | `/logout` | Clear session & logout | ✅ |
+
+### Dashboard Route (`/dashboard`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET | `/dashboard/` | Main dashboard | ✅ |
+
+### Subcontractor Routes (`/subcontractor`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET | `/subcontractor/add` | Add form | ✅ |
+| POST | `/subcontractor/save` | Save new subcontractor | ✅ |
+| GET | `/subcontractor/list` | List all subcontractors | ✅ |
+| GET | `/subcontractor/edit/<id>` | Edit form | ✅ |
+| POST | `/subcontractor/update/<id>` | Update subcontractor | ✅ |
+| GET | `/subcontractor/delete/<id>` | Delete subcontractor | ✅ |
+
+### File Import Routes (`/file`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET/POST | `/file/import` | Subcontractor file upload | ✅ |
+| GET/POST | `/file/import_client` | Client file upload | ✅ |
+| GET/POST | `/file/report` | View imported data report | ✅ |
+
+### Report Routes (`/report`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET/POST | `/report/generate_comparison` | Generate comparison report | ✅ |
+| GET/POST | `/report/generate_comparison_client_vs_subcont` | Alternative comparison | ✅ |
+
+### User Routes (`/user`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET | `/user/list` | List all users | ✅ |
+| Other | (Check routes) | User management | ✅ |
+
+### File Format Route (`/format`)
+| Method | Endpoint | Purpose | Auth |
+|--------|----------|---------|------|
+| GET/POST | `/format/...` | File format reference | ✅ |
+
+---
+
+## Setup & Installation
+
+### Prerequisites
+- Python 3.7+
+- MySQL/PostgreSQL (or SQLite for development)
+- pip (Python package manager)
+
+### 1. Clone & Install Dependencies
+```bash
+cd d:\New folder\Comparison\Comparison_Project
+pip install -r requirements.txt
+```
+
+### 2. Configure Environment Variables
+Create a `.env` file in the project root:
+```env
+# -----------------------------
+# Flask App Configuration
+# -----------------------------
+FLASK_ENV=development
+FLASK_DEBUG=True
+FLASK_HOST='0.0.0.0'
+FLASK_PORT=5001
+
+# -----------------------------
+# Security
+# -----------------------------
+SECRET_KEY=change-this-to-strong-secret-key
+
+# -----------------------------
+# Database Configuration
+# -----------------------------
+DB_DIALECT=mysql
+DB_DRIVER=pymysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_NAME=comparisondb
+DB_USER=root
+DB_PASSWORD=your_password
+
+
+```
+
+### 3. Initialize Database
+```bash
+python run.py
+```
+This will:
+- Load environment variables
+- Create Flask app with configuration
+- Initialize SQLAlchemy
+- Create all tables (if not exist)
+- Start Flask development server
+
+### 4. Access Application
+Open browser: `http://127.0.0.1:5000/`
+- First time: Redirect to `/login`
+- Register a new account
+- Login and start using the application
+
+---
+
+## Key Services & Utilities
+
+### FileService (`app/services/file_service.py`)
+**Purpose:** Handles file uploads, parsing, and data validation
+
+**Key Methods:**
+- `handle_file_upload(file, subcontractor_id, RA_Bill_No)` - Upload & process subcontractor file
+- `handle_client_file_upload(file, RA_Bill_No)` - Upload & process client file
+- `process_trench_excavation(df, subcontractor_id, RA_Bill_No)` - Parse & insert trench data
+- `process_manhole_excavation(df, subcontractor_id, RA_Bill_No)` - Parse & insert manhole data
+- `process_manhole_domestic_chamber(df, subcontractor_id, RA_Bill_No)` - Parse & insert chamber data
+
+### UserService (`app/services/user_service.py`)
+**Purpose:** User authentication & management
+
+**Key Methods:**
+- `register_user(name, email, password)` - Register new user
+- `validate_login(email, password)` - Authenticate user
+- `get_all_users()` - Fetch all users
+
+### DBService (`app/services/db_service.py`)
+**Purpose:** Database connection & SQLAlchemy initialization
+
+**Exports:**
+- `db` - SQLAlchemy instance for ORM operations
+- `migrate` - Flask-Migrate for schema migrations
+
+---
+
+## Authentication & Security
+
+### Session Management
+- Uses Flask `session` object
+- Stores `user_id` and `user_name` after successful login
+- `@login_required` decorator validates authenticated requests
+
+### Password Security
+- Passwords hashed using Werkzeug's `generate_password_hash()`
+- Verification via `check_password_hash()`
+- No plaintext passwords stored in database
+
+### File Security
+- File uploads sanitized with `secure_filename()`
+- Only allowed extensions: `.xlsx`, `.xls`, `.csv`
+- Files stored in user-specific subfolders
+
+---
+
+## Error Handling & Validation
+
+### File Import Validation
+1. **File Type Check** - Only CSV/XLS/XLSX allowed
+2. **Sheet Validation** - Required sheets must exist
+3. **Column Normalization** - Auto-fixes column name inconsistencies
+4. **Data Type Conversion** - Converts to appropriate types
+5. **Duplicate Detection** - Prevents duplicate records by (Location, MH_NO, RA_Bill_No)
+6. **Null Handling** - Converts empty/NaN values to None
+
+### Database Constraints
+- Foreign key relationships enforced
+- Unique email constraint on users
+- NOT NULL constraints on critical fields
+
+---
+
+## Example: Typical User Workflow
+
+```
+1. User registers/logs in
+   → POST /auth/register (new user) or /auth/login
+   
+2. User adds subcontractors
+   → GET /subcontractor/add
+   → POST /subcontractor/save
+   
+3. User uploads subcontractor data (Excel file with 3 sheets)
+   → GET /file/import
+   → POST /file/import (file, subcontractor_id, RA_Bill_No)
+   → Database populated with excavation data
+   
+4. User uploads client specifications (Excel file with same 3 sheets)
+   → GET /file/import_client
+   → POST /file/import_client (file, RA_Bill_No)
+   → Database populated with client data
+   
+5. User generates comparison report
+   → GET /report/generate_comparison
+   → POST /report/generate_comparison (RA_Bill_No)
+   → System compares client vs subcontractor data
+   → Generates Excel file showing differences
+   → User downloads report
+   
+6. User logs out
+   → GET /auth/logout
+   → Session cleared, redirected to login
+```
+
+---
+
+## Future Enhancements
+
+- [ ] Email notifications for report generation
+- [ ] Data visualization dashboards
+- [ ] Role-based access control (Admin, User, Viewer)
+- [ ] Bulk report generation
+- [ ] Data export to PDF format
+- [ ] Audit logs for data modifications
+- [ ] API documentation (Swagger/OpenAPI)
+- [ ] Unit & integration tests
+
+---
+
+## Support & Contribution
+
+For issues, feature requests, or contributions, please contact the development team.
+
+**Last Updated:** January 2026

app/__init__.py

@@ -1,6 +1,7 @@
 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__)
@@ -9,6 +10,9 @@ def create_app():
     # Initialize extensions
     db.init_app(app)
 
+    # Initialize Logger
+    LoggerService.init_app(app)
+
     # Register blueprints
     register_blueprints(app)
     # Register error handlers
@@ -32,7 +36,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)
@@ -43,10 +47,15 @@ def register_blueprints(app):
 
 
 def register_error_handlers(app):
+
+    from flask import current_app
+
     @app.errorhandler(404)
     def page_not_found(e):
+        current_app.logger.warning("404 Page Not Found")
         return "Page Not Found", 404
 
     @app.errorhandler(500)
     def internal_error(e):
-        return "Internal Server Error", 500
+        current_app.logger.exception("500 Internal Server Error")
+        return "Internal Server Error", 500

app/config.py

@@ -1,12 +1,10 @@
 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 varibles 
+    # Database variables 
     DB_DIALECT = os.getenv("DB_DIALECT")
     DB_DRIVER = os.getenv("DB_DRIVER")
     DB_USER = os.getenv("DB_USER")
@@ -23,7 +21,4 @@ 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

@@ -0,0 +1,11 @@
+class HTTPStatus:
+    OK = 200
+    CREATED = 201
+    BAD_REQUEST = 400
+    UNAUTHORIZED = 401
+    FORBIDDEN = 403
+    NOT_FOUND = 404
+    METHOD_NOT_ALLOWED = 405
+    CONFLICT = 409
+    UNPROCESSABLE_ENTITY = 422
+    INTERNAL_SERVER_ERROR = 500

app/constants/messages.py

@@ -0,0 +1,17 @@
+class SuccessMessage:
+    FETCHED = "Data fetched successfully"
+    CREATED = "Resource created successfully"
+    UPDATED = "Resource updated successfully"
+    DELETED = "Resource deleted successfully"
+    LOGIN = "Login successful"
+    LOGOUT = "Logout successful"
+
+
+class ErrorMessage:
+    INVALID_REQUEST = "Invalid request data"
+    UNAUTHORIZED = "Unauthorized access"
+    FORBIDDEN = "Access forbidden"
+    NOT_FOUND = "Resource not found"
+    VALIDATION_FAILED = "Validation failed"
+    INTERNAL_ERROR = "Internal server error"
+    DUPLICATE_ENTRY = "Duplicate record found"

app/errors/error_handlers.py

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

app/models/laying_client_model.py

@@ -1,39 +1,43 @@
 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"
 
     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)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
+    # Bedding Qty.
+    Outer_dia_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    Bedding_Length = db.Column(db.Numeric(10, 4), default=0)
+    Width = db.Column(db.Numeric(10, 4), default=0)
+    Depth = db.Column(db.Numeric(10, 4), default=0)
+    Qty = db.Column(db.Numeric(10, 4), default=0)
  
-    Pipe_Dia_mm = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Laying_Length = db.Column(db.Float)
+    #  PIPE LAYING Qty. 
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    Laying_Length = db.Column(db.Numeric(10, 4), default=0)
 
-    pipe_150_mm = db.Column(db.Float)
-    pipe_200_mm = db.Column(db.Float)
-    pipe_250_mm = db.Column(db.Float)
-    pipe_300_mm = db.Column(db.Float)
-    pipe_350_mm = db.Column(db.Float)
-    pipe_400_mm = db.Column(db.Float)
-    pipe_450_mm = db.Column(db.Float)
-    pipe_500_mm = db.Column(db.Float)
-    pipe_600_mm = db.Column(db.Float)
-    pipe_700_mm = db.Column(db.Float)
-    pipe_900_mm = db.Column(db.Float)
-    pipe_1200_mm = db.Column(db.Float)
+    pipe_150_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_200_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_250_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_300_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_350_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_400_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_450_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_500_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_600_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_700_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_900_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_1200_mm = db.Column(db.Numeric(10, 4), default=0)
     
-    
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -45,3 +49,15 @@ 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 calculate_laying_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = round(total)
+
+event.listen(LayingClient, "before_insert", calculate_laying_total)
+event.listen(LayingClient, "before_update", calculate_laying_total)

app/models/laying_model.py

@@ -1,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class Laying(db.Model):
     __tablename__ = "laying"
@@ -10,30 +12,28 @@ 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)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    Laying_Length = db.Column(db.Numeric(10, 4), default=0)
 
-    pipe_150_mm = db.Column(db.Float)
-    pipe_200_mm = db.Column(db.Float)
-    pipe_250_mm = db.Column(db.Float)
-    pipe_300_mm = db.Column(db.Float)
-    pipe_350_mm = db.Column(db.Float)
-    pipe_400_mm = db.Column(db.Float)
-    pipe_450_mm = db.Column(db.Float)
-    pipe_500_mm = db.Column(db.Float)
-    pipe_600_mm = db.Column(db.Float)
-    pipe_700_mm = db.Column(db.Float)
-    pipe_900_mm = db.Column(db.Float)
-    pipe_1200_mm = db.Column(db.Float)
+    pipe_150_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_200_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_250_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_300_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_350_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_400_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_450_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_500_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_600_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_700_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_900_mm = db.Column(db.Numeric(10, 4), default=0)
+    pipe_1200_mm = db.Column(db.Numeric(10, 4), default=0)
     
-    
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -45,3 +45,15 @@ class Laying(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+
+# AUTO TOTAL USING REGEX
+def calculate_laying_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.PIPE_MM_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = 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,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class ManholeDomesticChamber(db.Model):
     __tablename__ = "manhole_domestic_chamber"
@@ -13,35 +15,35 @@ class ManholeDomesticChamber(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Depth_of_MH = db.Column(db.Float)
+    Depth_of_MH = db.Column(db.Numeric(10, 4), default=0)
  
     # Excavation categories 
-    d_0_to_0_75 = db.Column(db.Float)
-    d_0_76_to_1_05 = db.Column(db.Float)
-    d_1_06_to_1_65 = db.Column(db.Float)
-    d_1_66_to_2_15 = db.Column(db.Float)
-    d_2_16_to_2_65 = db.Column(db.Float)
-    d_2_66_to_3_15 = db.Column(db.Float)
-    d_3_16_to_3_65= db.Column(db.Float)
-    d_3_66_to_4_15 = db.Column(db.Float)
-    d_4_16_to_4_65 = db.Column(db.Float)
-    d_4_66_to_5_15 = db.Column(db.Float)
-    d_5_16_to_5_65 = db.Column(db.Float)
+    d_0_to_0_75 = db.Column(db.Numeric(10, 4), default=0)
+    d_0_76_to_1_05 = db.Column(db.Numeric(10, 4), default=0)
+    d_1_06_to_1_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_1_66_to_2_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_16_to_2_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_66_to_3_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_3_16_to_3_65= db.Column(db.Numeric(10, 4), default=0)
+    d_3_66_to_4_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_4_16_to_4_65 = db.Column(db.Numeric(10, 4), default=0)
+    d_4_66_to_5_15 = db.Column(db.Numeric(10, 4), default=0)
+    d_5_16_to_5_65 = db.Column(db.Numeric(10, 4), default=0)
+    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)
 
-    d_5_66_to_6_15 = db.Column(db.Float)
-    d_6_16_to_6_65 = db.Column(db.Float)
-    d_6_66_to_7_15 = db.Column(db.Float)
-    d_7_16_to_7_65 = db.Column(db.Float)
-    d_7_66_to_8_15 = db.Column(db.Float)
-    d_8_16_to_8_65 = db.Column(db.Float)
-    d_8_66_to_9_15 = db.Column(db.Float)
-    d_9_16_to_9_65 = db.Column(db.Float)
-
-    Domestic_Chambers = db.Column(db.Float)
-    DWC_Pipe_Length = db.Column(db.Float)
-    UPVC_Pipe_Length = db.Column(db.Float)
+    Domestic_Chambers = db.Column(db.Numeric(10, 4), default=0)
+    DWC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
+    UPVC_Pipe_Length = db.Column(db.Numeric(10, 4), default=0)
     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):
@@ -49,4 +51,15 @@ class ManholeDomesticChamber(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    
+# AUTO TOTAL USING REGEX
+def calculate_mh_dc_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = round(total)
 
+event.listen(ManholeDomesticChamber, "before_insert", calculate_mh_dc_total)
+event.listen(ManholeDomesticChamber, "before_update", calculate_mh_dc_total)

app/models/manhole_excavation_model.py

@@ -1,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class ManholeExcavation(db.Model):
     __tablename__ = "manhole_excavation"
@@ -14,47 +16,47 @@ class ManholeExcavation(db.Model):
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
    
-    Upto_IL_Depth = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Ex_Dia_of_Manhole = db.Column(db.Float)
-    Area_of_Manhole = db.Column(db.Float)
+    Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    Ex_Dia_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
+    Area_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
    
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0 = 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.Float)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0 = 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.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_and_above_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.Float)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_and_above_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.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
 
@@ -65,3 +67,15 @@ class ManholeExcavation(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+# AUTO TOTAL USING REGEX
+def calculate_Manhole_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = 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,41 +1,37 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class ManholeDomesticChamberClient(db.Model):
     __tablename__ = "mh_dc_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor table
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="mh_dc_records")
 
     # Basic Fields
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    MH_TOP_LEVEL = db.Column(db.Float)
-    MH_IL_LEVEL = db.Column(db.Float)
-    Depth_of_MH = db.Column(db.Float)
+    MH_TOP_LEVEL = db.Column(db.Numeric(10, 4), default=0)
+    MH_IL_LEVEL = db.Column(db.Numeric(10, 4), default=0)
+    Depth_of_MH = db.Column(db.Numeric(10, 4), default=0)
    
- 
     # Excavation categories 
-    d_0_to_1_5 = db.Column(db.Float)
-    d_1_5_to_2_0 = db.Column(db.Float)
-    d_2_0_to_2_5 = db.Column(db.Float)
-    d_2_5_to_3_0 = db.Column(db.Float)
+    d_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    d_1_5_to_2_0 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_0_to_2_5 = db.Column(db.Numeric(10, 4), default=0)
+    d_2_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    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)
 
-    d_3_0_to_3_5 = db.Column(db.Float)
-    d_3_5_to_4_0 = db.Column(db.Float)
-    d_4_0_to_4_5= db.Column(db.Float)
-    d_4_5_to_5_0 = db.Column(db.Float)
-
-    d_5_0_to_5_5 = db.Column(db.Float)
-    d_5_5_to_6_0 = db.Column(db.Float)
-    d_6_0_to_6_5 = db.Column(db.Float)
-
-    Domestic_Chambers = db.Column(db.Float)
+    Domestic_Chambers = db.Column(db.Numeric(10, 4), default=0)
 
+    Total = db.Column(db.Numeric(12, 4), default=0)
     created_at = db.Column(db.DateTime, default=datetime.today)
 
     def __repr__(self):
@@ -44,3 +40,16 @@ 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 calculate_mh_dc_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.D_RANGE_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = round(total)
+
+
+event.listen(ManholeDomesticChamberClient, "before_insert", calculate_mh_dc_total)
+event.listen(ManholeDomesticChamberClient, "before_update", calculate_mh_dc_total)

app/models/mh_ex_client_model.py

@@ -1,78 +1,76 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class ManholeExcavationClient(db.Model):
     __tablename__ = "mh_ex_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor table
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="mh_ex_records")
 
     # Basic Fields
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    Ground_Level = db.Column(db.Float)
-    MH_Invert_Level = db.Column(db.Float)
-    MH_Top_Level = db.Column(db.Float)
-    Ex_Level = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    MH_Depth = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
+    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
+    MH_Invert_Level = db.Column(db.Numeric(10, 4), default=0)
+    MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
+    Ex_Level = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    MH_Depth = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
 
-    Dia_of_MH_Cutting = db.Column(db.Float)
-    Area_of_Manhole = db.Column(db.Float)
+    Dia_of_MH_Cutting = db.Column(db.Numeric(10, 4), default=0)
+    Area_of_Manhole = db.Column(db.Numeric(10, 4), default=0)
    
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_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.Float)
-    Soft_Murum_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_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
-    Hard_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_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_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.Float)
-    Soft_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_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_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.Float)
-    Soft_Murum_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_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
-    Hard_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_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_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.Float)
-    Soft_Rock_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_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_3_0_to_4_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.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
     Remarks = db.Column(db.String(500))
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Numeric(12, 4), default=0)
 
     created_at = db.Column(db.DateTime, default=datetime.today)
 
@@ -81,3 +79,16 @@ class ManholeExcavationClient(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+
+# AUTO TOTAL USING REGEX
+def calculate_Manhole_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = 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,82 +1,80 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class TrenchExcavationClient(db.Model):
     __tablename__ = "tr_ex_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor table
-    # subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
-    # Relationship for easy access (subcontractor.subcontractor_name)
-    # subcontractor = db.relationship("Subcontractor", backref="tr_ex_records")
 
     # Basic Fields
     RA_Bill_No=db.Column(db.String(500))
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float)
-    Actual_Trench_Length = db.Column(db.Float)
-    Ground_Level = db.Column(db.Float)
-    Invert_Level = db.Column(db.Float)
-    Excavated_level = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    Avg_Depth = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Float)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
+    Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
+    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
+    Invert_Level = db.Column(db.Numeric(10, 4), default=0)
+    Excavated_level = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
  
     # width
-    Width_0_to_1_5_m = db.Column(db.Float)
-    Width_1_5_to_3_0_m = db.Column(db.Float)
-    Width_3_0_to_4_5_m = db.Column(db.Float)
-    Width_4_5_to_6_0_m = db.Column(db.Float)
-    Width_6_0_to_7_5_m = db.Column(db.Float)
+    Width_0_to_1_5_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_1_5_to_3_0_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_3_0_to_4_5_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_4_5_to_6_0_m = db.Column(db.Numeric(10, 4), default=0)
+    Width_6_0_to_7_5_m = db.Column(db.Numeric(10, 4), default=0)
 
     # Excavation categories
-    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5 = db.Column(db.Float)
+    Marshi_Muddy_Slushy_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_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.Float)
-    Soft_Murum_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_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
-    Hard_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_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_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.Float)
-    Soft_Rock_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_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_3_0_to_4_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.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Float)
-    Marshi_Muddy_Slushy_3_0_to_4_5_total = db.Column(db.Float)
+    Marshi_Muddy_Slushy_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Marshi_Muddy_Slushy_3_0_to_4_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.Float)
-    Soft_Murum_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_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
-    Hard_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_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_3_0_to_4_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.Float)
-    Soft_Rock_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_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_3_0_to_4_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.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
 
     created_at = db.Column(db.DateTime, default=datetime.today)
@@ -86,3 +84,15 @@ class TrenchExcavationClient(db.Model):
     
     def serialize(self):
             return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+
+# AUTO TOTAL USING REGEX
+def calculate_trench_client_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = 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,5 +1,7 @@
 from app import db
 from datetime import datetime
+from sqlalchemy import event
+from app.utils.regex_utils import RegularExpression
 
 class TrenchExcavation(db.Model):
     __tablename__ = "trench_excavation"
@@ -13,59 +15,59 @@ class TrenchExcavation(db.Model):
     # Basic Fields
     Location = db.Column(db.String(500))
     MH_NO = db.Column(db.String(100))
-    CC_length = db.Column(db.Float)
-    Invert_Level = db.Column(db.Float)
-    MH_Top_Level = db.Column(db.Float)
-    Ground_Level = db.Column(db.Float)
-    ID_of_MH_m = db.Column(db.Float)
-    Actual_Trench_Length = db.Column(db.Float)
-    Pipe_Dia_mm = db.Column(db.Float)
+    CC_length = db.Column(db.Numeric(10, 4), default=0)
+    Invert_Level = db.Column(db.Numeric(10, 4), default=0)
+    MH_Top_Level = db.Column(db.Numeric(10, 4), default=0)
+    Ground_Level = db.Column(db.Numeric(10, 4), default=0)
+    ID_of_MH_m = db.Column(db.Numeric(10, 4), default=0)
+    Actual_Trench_Length = db.Column(db.Numeric(10, 4), default=0)
+    Pipe_Dia_mm = db.Column(db.Numeric(10, 4), default=0)
 
     # width
-    Width_0_to_2_5 = db.Column(db.Float)
-    Width_2_5_to_3_0 = db.Column(db.Float)
-    Width_3_0_to_4_5 = db.Column(db.Float)
-    Width_4_5_to_6_0 = db.Column(db.Float)
+    Width_0_to_2_5 = db.Column(db.Numeric(10, 4), default=0)
+    Width_2_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Width_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Width_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
 
-    Upto_IL_Depth = db.Column(db.Float)
-    Cutting_Depth = db.Column(db.Float)
-    Avg_Depth = db.Column(db.Float)
+    Upto_IL_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Cutting_Depth = db.Column(db.Numeric(10, 4), default=0)
+    Avg_Depth = db.Column(db.Numeric(10, 4), default=0)
 
     # Excavation categories
-    Soft_Murum_0_to_1_5 = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0 = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5 = db.Column(db.Float)
+    Soft_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
+    Hard_Murum_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_to_3_0 = 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.Float)
+    Soft_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_to_3_0 = 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.Float)
-    Hard_Rock_3_0_to_4_5 = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0 = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5 = db.Column(db.Float)
+    Hard_Rock_0_to_1_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0 = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5 = db.Column(db.Numeric(10, 4), default=0)
 
     # Totals
-    Soft_Murum_0_to_1_5_total = db.Column(db.Float)
-    Soft_Murum_1_5_to_3_0_total = db.Column(db.Float)
-    Soft_Murum_3_0_to_4_5_total = db.Column(db.Float)
+    Soft_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Murum_3_0_to_4_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.Float)
+    Hard_Murum_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Murum_1_5_and_above_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.Float)
+    Soft_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Soft_Rock_1_5_and_above_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.Float)
-    Hard_Rock_3_0_to_4_5_total = db.Column(db.Float)
-    Hard_Rock_4_5_to_6_0_total = db.Column(db.Float)
-    Hard_Rock_6_0_to_7_5_total = db.Column(db.Float)
+    Hard_Rock_0_to_1_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_1_5_to_3_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_3_0_to_4_5_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_4_5_to_6_0_total = db.Column(db.Numeric(10, 4), default=0)
+    Hard_Rock_6_0_to_7_5_total = db.Column(db.Numeric(10, 4), default=0)
 
-    Total = db.Column(db.Float)
+    Total = db.Column(db.Numeric(12, 4), default=0)
     Remarks = db.Column(db.String(500))
     RA_Bill_No=db.Column(db.String(500))
     
@@ -77,3 +79,16 @@ class TrenchExcavation(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_total(mapper, connection, target):
+    total = 0
+    for column in target.__table__.columns:
+        if RegularExpression.STR_TOTAL_PATTERN.match(column.name):
+            total += getattr(target, column.name) or 0
+    target.Total = total
+
+
+event.listen(TrenchExcavation, "before_insert", calculate_trench_total)
+event.listen(TrenchExcavation, "before_update", calculate_trench_total)

app/models/user_model.py

@@ -5,7 +5,7 @@ class User(db.Model):
     __tablename__ = "users"
 
     id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(120), nullable=False)
+    name = db.Column(db.String(200), nullable=False)
     email = db.Column(db.String(120), unique=True, nullable=False)
     password_hash = db.Column(db.String(255), nullable=False)
 

app/routes/dashboard.py

@@ -1,82 +1,244 @@
 import matplotlib
 matplotlib.use("Agg")
 
-from flask import Blueprint, render_template, session, redirect, url_for
+from flask import Blueprint, render_template, session, redirect, url_for, jsonify, request
 import matplotlib.pyplot as plt
 import io
 import base64
+from app.utils.plot_utils import plot_to_base64
+from app.services.dashboard_service import DashboardService
+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")
 
-# 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("Category")
-    plt.ylabel("Count")
-
-
-    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="Business Intelligence Dashboard")
+
+
+@dashboard_bp.route("/api/live-stats")
+def live_stats():
+    try:
+        # 1. Overall Volume
+        t_count = TrenchExcavation.query.count()
+        m_count = ManholeExcavation.query.count()
+        l_count = Laying.query.count()
+
+        # 2. Location Distribution (Business reach)
+        loc_results = db.session.query(
+            TrenchExcavation.Location, 
+            func.count(TrenchExcavation.id)
+        ).group_by(TrenchExcavation.Location).all()
+
+        # 3. Work Timeline (Business productivity trend)
+        # Assuming your models have a 'created_at' field
+        timeline_results = db.session.query(
+            func.date(TrenchExcavation.created_at), 
+            func.count(TrenchExcavation.id)
+        ).group_by(func.date(TrenchExcavation.created_at)).order_by(func.date(TrenchExcavation.created_at)).all()
+
+        return jsonify({
+            "summary": {
+                "trench": t_count,
+                "manhole": m_count,
+                "laying": l_count,
+                "total": t_count + m_count + l_count
+            },
+            "locations": {row[0]: row[1] for row in loc_results if row[0]},
+            "timeline": {str(row[0]): row[1] for row in timeline_results}
+        })
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
 
-    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"))
 
+    subcontractors = Subcontractor.query.all()
+
     return render_template(
         "subcontractor_dashboard.html",
-        title="Dashboard",
-        bar_chart=bar_chart(),
-        pie_chart=pie_chart(),
-        histogram=histogram_chart()
+        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,5 +1,6 @@
 from flask import Blueprint, render_template, send_from_directory, abort, current_app
 from app.utils.helpers import login_required
+from app.utils.file_utils import get_download_format_folder
 import os
 
 file_format_bp  = Blueprint("file_format", __name__)
@@ -14,10 +15,7 @@ def download_format():
 @login_required
 def download_excel_format(filename):
 
-    download_folder = os.path.join(
-        current_app.root_path, "static", "downloads/format"
-    )
-
+    download_folder = get_download_format_folder()
     file_path = os.path.join(download_folder, filename)
 
     if not os.path.exists(file_path):

app/routes/file_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

@@ -72,7 +72,8 @@ class SubcontractorBill:
         for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
- 
+
+
 # --- subcontractor report only  ---
 @file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
 @login_required
@@ -91,7 +92,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 +103,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":
@@ -140,70 +141,65 @@ def report_file():
         download_all=download_all
     )
  
-# --- client report only --- 
+
+# --- CLIENT REPORT (PREVIEW + DOWNLOAD) ---
 @file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
-def client_vs_all_subcontractor():
-    tables = {"tr": None, "mh": None, "dc": None}
+def client_report():
+
+    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("generate_comparison_client_vs_subcont.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 data exists before merging ---
-        if clientBill.df_tr.empty and clientBill.df_mh.empty:
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+
+        # -------- FETCH CLIENT DATA --------
+        bill_gen = ClientBill()
+        bill_gen.Fetch(RA_Bill_No)
+
+        # If no data
+        if (
+            bill_gen.df_tr.empty and
+            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("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
- 
-        qty_cols = [...] # (Keep your existing list)
-        mh_dc_qty_cols = [...] # (Keep your existing list)
- 
-        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" # Fill missing join keys
-            return df.groupby(group_cols, as_index=False)[existing_cols].sum()
- 
-        # 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)
- 
-        # --- FINAL MERGE LOGIC ---
-        # 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]:
-            if not df_client.empty and "Location" not in df_client.columns:
-                df_client["Location"] = "Unknown"
- 
-        try:
-            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"))
-        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("generate_comparison_client_vs_subcont.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)
- 
-   
-    return render_template("client_report.html", tables=tables, ra_val=ra_val)   
- 
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+
+        # -------- DOWNLOAD --------
+        if action == "download":
+
+            output = io.BytesIO()
+
+            with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+                bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Trench")
+                bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH")
+                bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
+                bill_gen.df_laying.to_excel(writer, index=False, sheet_name="Laying")
+
+            output.seek(0)
+
+            return send_file(
+                output,
+                download_name=f"Client_RA_{RA_Bill_No}_Report.xlsx",
+                as_attachment=True
+            )
+
+        # -------- PREVIEW --------
+        table_class = "table table-bordered table-striped table-hover table-sm"
+
+        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)
+        tables["dc"] = bill_gen.df_dc.to_html(classes=table_class, index=False)
+        tables["laying"] = bill_gen.df_laying.to_html(classes=table_class, index=False)
+
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)

app/routes/generate_comparison_report.py

@@ -1,4 +1,5 @@
 from flask import Blueprint, render_template, request, send_file, flash
+from collections import defaultdict
 import pandas as pd
 import io
 
@@ -7,24 +8,28 @@ 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")
+ 
+ 
 
-
+ 
 # 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 +37,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 +49,122 @@ 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))
-        if not s:
+ 
+        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)
         )
-
-        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"]:
-                continue
-            row[f"Client-{k}"] = v
-
+            if k not in ["id", "created_at"]:
+                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"]:
-                continue
-            row[f"Subcontractor-{k}"] = v
-
+            if k not in ["id", "created_at", "subcontractor_id"]:
+                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)
+    # formatting headers    
     df.columns = [format_header(col) for col in df.columns]
+    
     return df
-
-
+ 
+ 
+ 
 # EXCEL SHEET WRITER
 def write_sheet(writer, df, sheet_name, subcontractor_name):
     workbook = writer.book
+
+    # write dataframe (data already correct)
     df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
     ws = writer.sheets[sheet_name]
 
+    # formats
     title_fmt = workbook.add_format({"bold": True, "font_size": 14})
     client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
     sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
     total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
     diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
-    default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})
-
+    default_header_fmt = workbook.add_format({
+        "bold": True,
+        "border": 1,
+        "bg_color": "#E7E6E6",
+        "align": "center",
+        "valign": "vcenter"
+    })
 
+    # titles
     ws.merge_range(
         0, 0, 0, len(df.columns) - 1,
         "CLIENT vs SUBCONTRACTOR",
@@ -147,6 +176,7 @@ def write_sheet(writer, df, sheet_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)
@@ -161,57 +191,56 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
 
         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")
-
+ 
         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)
             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 +248,6 @@ def comparison_report():
             download_name=filename,
             mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         )
-
+ 
     return render_template("generate_comparison_report.html",subcontractors=subcontractors)
-
-
+ 

app/routes/subcontractor_routes.py

@@ -1,62 +1,141 @@
-from flask import Blueprint, render_template, request, redirect, flash
-from app import db
+from flask import Blueprint, render_template, request, redirect, flash, current_app, url_for
+from app.services.db_service import db
 from app.models.subcontractor_model import Subcontractor
 from app.utils.helpers import login_required
 
 subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
 
+
 # ---------------- ADD -----------------
 @subcontractor_bp.route("/add")
 @login_required
 def add_subcontractor():
+    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():
-    subcontractor = Subcontractor(
-        subcontractor_name=request.form.get("subcontractor_name"),
-        contact_person=request.form.get("contact_person"),
-        mobile_no=request.form.get("mobile_no"),
-        email_id=request.form.get("email_id"),
-        gst_no=request.form.get("gst_no")
-    )
-    db.session.add(subcontractor)
-    db.session.commit()
 
-    flash("Subcontractor added successfully!", "success")
-    return redirect("/subcontractor/list")
+    name = request.form.get("subcontractor_name", "").strip()
 
-# ---------------- LIST -----------------
+    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"))
+
+    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"))
+
+    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"),
+            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:
+        db.session.rollback()
+        current_app.logger.exception("Error while saving subcontractor")
+        flash("An error occurred while saving.", "danger")
+
+    return redirect(url_for("subcontractor.subcontractor_list"))
+
+
+# ---------------- LIST (UPDATED WITH PAGINATION) -----------------
 @subcontractor_bp.route("/list")
 @login_required
 def subcontractor_list():
-    subcontractors = Subcontractor.query.all()
-    return render_template("subcontractor/list.html", subcontractors=subcontractors)
+
+    page = request.args.get("page", 1, type=int)
+    per_page = 10  # Change how many records per page
+
+    pagination = Subcontractor.query.order_by(
+        Subcontractor.created_at
+    ).paginate(
+        page=page,
+        per_page=per_page,
+        error_out=False
+    )
+
+    subcontractors = pagination.items
+
+    current_app.logger.info(f"Viewed Subcontractor List - Page {page}")
+
+    return render_template(
+        "subcontractor/list.html",
+        subcontractors=subcontractors,
+        pagination=pagination
+    )
+
 
 # ---------------- EDIT -----------------
 @subcontractor_bp.route("/edit/<int:id>")
 @login_required
 def edit_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
+    current_app.logger.info(f"Editing Subcontractor ID: {id}")
     return render_template("subcontractor/edit.html", subcontractor=subcontractor)
 
+
 # ---------------- UPDATE -----------------
 @subcontractor_bp.route("/update/<int:id>", methods=["POST"])
 @login_required
 def update_subcontractor(id):
+
     subcontractor = Subcontractor.query.get_or_404(id)
+    new_name = request.form.get("subcontractor_name", "").strip()
 
-    subcontractor.subcontractor_name = request.form.get("subcontractor_name")
-    subcontractor.contact_person = request.form.get("contact_person")
-    subcontractor.mobile_no = request.form.get("mobile_no")
-    subcontractor.email_id = request.form.get("email_id")
-    subcontractor.gst_no = request.form.get("gst_no")
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
 
-    db.session.commit()
+    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))
+
+    try:
+        old_name = subcontractor.subcontractor_name
+
+        subcontractor.subcontractor_name = new_name
+        subcontractor.contact_person = request.form.get("contact_person")
+        subcontractor.address = request.form.get("address")
+        subcontractor.mobile_no = request.form.get("mobile_no")
+        subcontractor.email_id = request.form.get("email_id")
+        subcontractor.gst_no = request.form.get("gst_no")
+        subcontractor.pan_no = request.form.get("pan_no")
+        subcontractor.status = request.form.get("status")
+
+        db.session.commit()
+
+        current_app.logger.info(f"Subcontractor Updated: {old_name} → {new_name}")
+        flash("Subcontractor updated successfully!", "success")
+
+    except Exception:
+        db.session.rollback()
+        current_app.logger.exception("Error updating subcontractor")
+        flash("Update failed!", "danger")
+
+    return redirect(url_for("subcontractor.subcontractor_list"))
 
-    flash("Subcontractor updated successfully!", "success")
-    return redirect("/subcontractor/list")
 
 # ---------------- DELETE -----------------
 @subcontractor_bp.route("/delete/<int:id>")
@@ -64,8 +143,17 @@ def update_subcontractor(id):
 def delete_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
 
-    db.session.delete(subcontractor)
-    db.session.commit()
+    try:
+        name = subcontractor.subcontractor_name
+        db.session.delete(subcontractor)
+        db.session.commit()
 
-    flash("Subcontractor deleted successfully!", "success")
-    return redirect("/subcontractor/list")
+        current_app.logger.info(f"Subcontractor Deleted: {name}")
+        flash("Subcontractor deleted successfully!", "success")
+
+    except Exception:
+        db.session.rollback()
+        current_app.logger.exception("Error deleting subcontractor")
+        flash("Delete failed!", "danger")
+
+    return redirect(url_for("subcontractor.subcontractor_list"))

app/routes/user.py

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

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

app/services/logger_service.py

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

app/templates/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>
@@ -33,7 +22,7 @@
         </form>
     </div>
 
-    {% if tables.tr or tables.mh or tables.dc %}
+    {% 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>
 
@@ -50,6 +39,10 @@
                 <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
                     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
+                    & Bedding Comparison</button>
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">
@@ -68,9 +61,15 @@
                     {{ tables.dc|safe }}
                 </div>
             </div>
-        </div>
-    </div>
-    {% endif %}
+            <div class="tab-pane fade" id="laying" role="tabpanel">
+                <div class="table-responsive" style="max-height: 500px;">
+                    {{ tables.laying|safe }}
+                </div>
 
+            </div>
+        </div>
+        {% endif %}
+
+    </div>
 </div>
 {% endblock %}

app/templates/dashboard.html

@@ -1,87 +1,118 @@
 {% extends "base.html" %}
 
 {% block content %}
-
 <div class="container-fluid px-2 px-md-4">
+    <h4 class="mb-3 text-center text-md-start">Comparison Software Solapur (UGD) - Live Dashboard</h4>
 
-    <h4 class="mb-3 text-center text-md-start">Comparison Software Solapur(UGD) </h4>
-
-    <!-- Summary Cards -->
     <div class="row g-3 mb-4">
-
-        <!-- Total Work -->
         <div class="col-12 col-md-4">
             <div class="card text-white bg-primary shadow h-100">
                 <div class="card-body text-center text-md-start">
-                    <h6>Test Total Work</h6>
-                    <h3 class="fw-bold">30%</h3>
+                    <h6>Trenching Units</h6>
+                    <h3 class="fw-bold" id="card-trench">0</h3>
                 </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>
+                    <h6>Manhole Units</h6>
+                    <h3 class="fw-bold" id="card-manhole">0</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>
+                    <h6>Laying Units</h6>
+                    <h3 class="fw-bold" id="card-laying">0</h3>
                 </div>
             </div>
         </div>
-
     </div>
 
-    <!-- Charts -->
     <div class="row g-3">
-
-        <!-- Bar Chart -->
         <div class="col-12 col-md-6">
             <div class="card shadow-sm h-100">
-                <div class="card-header bg-dark text-white text-center text-md-start">
-                    Work Category Bar Chart
-                </div>
-                <div class="card-body text-center">
-                    <img src="data:image/png;base64,{{ bar_chart }}" class="img-fluid" style="max-height:300px;">
+                <div class="card-header bg-dark text-white">Live Category Bar Chart</div>
+                <div class="card-body">
+                    <canvas id="liveBarChart" style="max-height:300px;"></canvas>
                 </div>
             </div>
         </div>
 
-        <!-- 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 class="card-header bg-dark text-white">Location Distribution Pie Chart</div>
+                <div class="card-body">
+                    <canvas id="livePieChart" style="max-height:300px;"></canvas>
                 </div>
             </div>
         </div>
-
-        <!-- 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>
-
 </div>
 
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+<script>
+    // 2. Initialize the Bar Chart
+    const barCtx = document.getElementById('liveBarChart').getContext('2d');
+    let liveBarChart = new Chart(barCtx, {
+        type: 'bar',
+        data: {
+            labels: ['Trenching', 'Manholes', 'Laying'],
+            datasets: [{
+                label: 'Units Completed',
+                data: [0, 0, 0],
+                backgroundColor: ['#0d6efd', '#198754', '#ffc107']
+            }]
+        },
+        options: { responsive: true, maintainAspectRatio: false }
+    });
+
+    // 3. Initialize the Pie Chart
+    const pieCtx = document.getElementById('livePieChart').getContext('2d');
+    let livePieChart = new Chart(pieCtx, {
+        type: 'pie',
+        data: {
+            labels: [], // Will be filled from SQL
+            datasets: [{
+                data: [],
+                backgroundColor: ['#0d6efd', '#198754', '#ffc107', '#6f42c1', '#fd7e14']
+            }]
+        },
+        options: { responsive: true, maintainAspectRatio: false }
+    });
+
+    // 4. Function to Fetch Live Data from your Python API
+    function fetchLiveData() {
+        fetch('/dashboard/api/live-stats') // This matches the route we created in the "Kitchen"
+            .then(response => response.json())
+            .then(data => {
+                // Update the Summary Cards
+                document.getElementById('card-trench').innerText = data.summary.trench;
+                document.getElementById('card-manhole').innerText = data.summary.manhole;
+                document.getElementById('card-laying').innerText = data.summary.laying;
+
+                // Update Bar Chart
+                liveBarChart.data.datasets[0].data = [
+                    data.summary.trench,
+                    data.summary.manhole,
+                    data.summary.laying
+                ];
+                liveBarChart.update();
+
+                // Update Pie Chart (Location stats)
+                livePieChart.data.labels = Object.keys(data.locations);
+                livePieChart.data.datasets[0].data = Object.values(data.locations);
+                livePieChart.update();
+            })
+            .catch(err => console.error("Error fetching live data:", err));
+    }
+
+    // 5. Check for updates every 10 seconds (Real-time effect)
+    setInterval(fetchLiveData, 10000);
+    fetchLiveData(); // Load immediately on page open
+</script>
+
 {% endblock %}

app/templates/subcontractor/add.html

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

app/templates/subcontractor/edit.html

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

app/templates/subcontractor/list.html

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

app/templates/subcontractor_dashboard.html

@@ -1,29 +1,118 @@
 {% extends "base.html" %}
-
 {% block content %}
 
-<div class="container-fluid px-2 px-md-4">
+<div class="container mt-3">
 
-    <h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
+    <h4>RA Bill Dashboard</h4>
 
-    <!-- Charts -->
-    <div class="row g-3">
+    <div class="row mb-3">
 
-        <!-- Bar Chart -->
-        <div class="col-12 col-md-6">
-            <div class="card shadow-sm h-100">
-                <div class="card-header bg-dark text-white text-center text-md-start">
-                    Work Category Bar Chart
-                </div>
-                <div class="card-body text-center">
-                    <img src="data:image/png;base64,{{ bar_chart }}" class="img-fluid" style="max-height:300px;">
-                </div>
-            </div>
+        <!-- Contractor -->
+        <div class="col-md-4">
+            <select id="subcontractor" class="form-control">
+                <option value="">Select Contractor</option>
+                {% for s in subcontractors %}
+                <option value="{{s.id}}">{{s.subcontractor_name}}</option>
+                {% endfor %}
+            </select>
         </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

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

app/utils/file_utils.py

@@ -1,6 +1,26 @@
 import os
-from app.config import Config
+from flask import current_app
+
+
+# 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(Config.UPLOAD_FOLDER):
-        os.makedirs(Config.UPLOAD_FOLDER)
+    if not os.path.exists(get_uploads_folder()):
+        os.makedirs(get_uploads_folder())

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")

app/utils/regex_utils.py

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

app/utils/response_handler.py

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

docker-compose.yml

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

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

requirements.txt

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