Merge pull request 'Dowload report of client report fix' (#10 ) from dev-anish into main

Reviewed-on: #10
Dowload report of client report fix
2026-01-19 06:54:02 +00:00 · 2026-01-17 18:06:58 +05:30 · 2026-01-17 12:12:03 +00:00 · 2026-01-17 17:39:31 +05:30 · 2026-01-17 12:05:47 +00:00 · 2026-01-17 17:33:07 +05:30
25 changed files with 1615 additions and 528 deletions
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
 # -----------------------------
 FLASK_ENV=development
 FLASK_DEBUG=True
-FLASK_HOST=127.0.0.1
+FLASK_HOST='0.0.0.0'
 FLASK_PORT=5001

 # -----------------------------
@@ -24,8 +24,3 @@ DB_PASSWORD=root

 # DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb

-
-
-
-
-
--- a/README.md
+++ b/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
--- a/app/init.py
+++ b/app/init.py
@@ -1,34 +1,3 @@
-# from flask import Flask
-# from app.config import Config
-# from app.services.db_service import db
-
-# def create_app():
-#     app = Flask(__name__)
-#     app.config.from_object(Config)
-
-#     db.init_app(app)
-
-#     from app.routes.auth import auth_bp
-#     from app.routes.user import user_bp
-#     from app.routes.dashboard import dashboard_bp
-#     from app.routes.subcontractor_routes import subcontractor_bp
-#     from app.routes.file_import import file_import_bp
-#     from app.routes.file_report import file_report_bp
-#     from app.routes.generate_comparison_report import generate_report_bp
-#     from app.routes.file_format import file_format
-
-#     app.register_blueprint(auth_bp)
-#     app.register_blueprint(user_bp)
-#     app.register_blueprint(dashboard_bp)
-#     app.register_blueprint(subcontractor_bp)
-#     app.register_blueprint(file_import_bp)
-#     app.register_blueprint(file_report_bp)
-#     app.register_blueprint(generate_report_bp)
-#     app.register_blueprint(file_format)
-
-#     return app
-
-
 from flask import Flask, redirect, url_for
 from app.config import Config
 from app.services.db_service import db
--- a/app/models/laying_client_model.py
+++ b/app/models/laying_client_model.py
@@ -0,0 +1,47 @@
+from app import db
+from datetime import datetime
+
+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)
+ 
+    Pipe_Dia_mm = db.Column(db.Float)
+    ID_of_MH_m = db.Column(db.Float)
+    Laying_Length = db.Column(db.Float)
+
+    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)
+    
+    
+    Total = db.Column(db.Float)
+    Remarks = db.Column(db.String(500))
+    RA_Bill_No=db.Column(db.String(500))
+    
+    created_at = db.Column(db.DateTime, default=datetime.today)
+
+
+    def __repr__(self):
+        return f"<LayingModel {self.Location}>"
+
+    def serialize(self):
+        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
--- a/app/models/laying_model.py
+++ b/app/models/laying_model.py
@@ -0,0 +1,47 @@
+from app import db
+from datetime import datetime
+
+class Laying(db.Model):
+    __tablename__ = "laying"
+
+    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)
+ 
+    Pipe_Dia_mm = db.Column(db.Float)
+    ID_of_MH_m = db.Column(db.Float)
+    Laying_Length = db.Column(db.Float)
+
+    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)
+    
+    
+    Total = db.Column(db.Float)
+    Remarks = db.Column(db.String(500))
+    RA_Bill_No=db.Column(db.String(500))
+    
+    created_at = db.Column(db.DateTime, default=datetime.today)
+
+
+    def __repr__(self):
+        return f"<LayingModel {self.Location}>"
+
+    def serialize(self):
+        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
--- a/app/models/manhole_domestic_chamber_model.py
+++ b/app/models/manhole_domestic_chamber_model.py
@@ -49,3 +49,4 @@ class ManholeDomesticChamber(db.Model):

    def serialize(self):
        return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
--- a/app/routes/dashboard.py
+++ b/app/routes/dashboard.py
@@ -1,11 +1,82 @@
+import matplotlib
+matplotlib.use("Agg")

 from flask import Blueprint, render_template, session, redirect, url_for
+import matplotlib.pyplot as plt
+import io
+import base64

 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="Dashboard")
+    return render_template(
+        "dashboard.html",
+        title="Dashboard",
+        bar_chart=bar_chart(),
+        pie_chart=pie_chart(),
+        histogram=histogram_chart()
+    )
+
+# subcontractor dashboard
+@dashboard_bp.route("/subcontractor_dashboard")
+def subcontractor_dashboard():
+    if not session.get("user_id"):
+        return redirect(url_for("auth.login"))
+
+    return render_template(
+        "subcontractor_dashboard.html",
+        title="Dashboard",
+        bar_chart=bar_chart(),
+        pie_chart=pie_chart(),
+        histogram=histogram_chart()
+    )
--- a/app/routes/file_import.py
+++ b/app/routes/file_import.py
@@ -5,7 +5,8 @@ from app.utils.helpers import login_required

 file_import_bp = Blueprint("file_import", __name__, url_prefix="/file")

-@file_import_bp.route("/import", methods=["GET", "POST"])
+# this is contractractor immport routes
+@file_import_bp.route("/import_Subcontractor", methods=["GET", "POST"])
@login_required
 def import_file():
    subcontractors = Subcontractor.query.all()
@@ -21,13 +22,13 @@ def import_file():
        flash(msg, "success" if success else "danger")

    return render_template(
-        "file_import.html",
+        "file_import_subcontractor.html",
        title="Sub-cont. File Import",
        subcontractors=subcontractors
    )


-# this route import client files
+# this is client import routes
@file_import_bp.route("/import_client", methods=["GET", "POST"])
@login_required
 def client_import_file():
--- a/app/routes/file_report.py
+++ b/app/routes/file_report.py
@@ -1,303 +1,230 @@
+import pandas as pd
+import io
 from flask import Blueprint, render_template, request, send_file, flash
+from app.utils.helpers import login_required
+
 from app.models.subcontractor_model import Subcontractor
+
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
+
 from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
-from app.utils.helpers import login_required
+from app.models.laying_client_model import LayingClient

-import pandas as pd
-import io
-from enum import Enum
-
-file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
-
-class BillType(Enum):
-    Client = 1
-    Subcontractor = 2
-
-class SubcontractorBill:
-    df_tr = []
-    df_mh = []
-    df_dc =[]
-
-    def Fetch(self, RA_Bill_No):
-              # CLIENT DATA (RA BILL WISE)
-
-        trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-        mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-        dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-
-        self.df_tr = pd.DataFrame([c.__dict__ for c in trench])
-        self.df_mh = pd.DataFrame([c.__dict__ for c in mh])
-        self.df_dc = pd.DataFrame([c.__dict__ for c in dc])
-
-        # CLEAN COLUMNS
-        drop_cols = ["id","created_at","Remarks","_sa_instance_state"]
-
-        for df in [self.df_tr, self.df_mh, self.df_dc]:
-            if not df.empty:
-                df.drop(columns=drop_cols, errors="ignore", inplace=True)
-
-        mh_exc_columns = [
-            "Location", "MH_NO", "Upto_IL_Depth", "Cutting_Depth", "ID_of_MH_m",
-            "Ex_Dia_of_Manhole", "Area_of_Manhole",
-
-            "Soft_Murum_0_to_1_5", "Soft_Murum_1_5_to_3_0", "Soft_Murum_3_0_to_4_5",
-            "Hard_Murum_0_to_1_5", "Hard_Murum_1_5_to_3_0",
-            "Soft_Rock_0_to_1_5", "Soft_Rock_1_5_to_3_0",
-            "Hard_Rock_0_to_1_5", "Hard_Rock_1_5_to_3_0",
-            "Hard_Rock_3_0_to_4_5", "Hard_Rock_4_5_to_6_0", "Hard_Rock_6_0_to_7_5",
-
-            "Soft_Murum_0_to_1_5_total", "Soft_Murum_1_5_to_3_0_total",
-            "Soft_Murum_3_0_to_4_5_total",
-            "Hard_Murum_0_to_1_5_total", "Hard_Murum_1_5_and_above_total",
-            "Soft_Rock_0_to_1_5_total", "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total", "Hard_Rock_1_5_and_above_total",
-            "Hard_Rock_3_0_to_4_5_total", "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total",
-
-            "Remarks", "Total"
-        ]
-
-        trench_columns = [
-            "Location", "MH_NO", "CC_length", "Invert_Level", "MH_Top_Level",
-            "Ground_Level", "ID_of_MH_m", "Actual_Trench_Length", "Pipe_Dia_mm",
-
-            "Width_0_to_2_5", "Width_2_5_to_3_0", "Width_3_0_to_4_5", "Width_4_5_to_6_0",
-
-            "Upto_IL_Depth", "Cutting_Depth", "Avg_Depth",
-
-            "Soft_Murum_0_to_1_5", "Soft_Murum_1_5_to_3_0", "Soft_Murum_3_0_to_4_5",
-            "Hard_Murum_0_to_1_5", "Hard_Murum_1_5_to_3_0",
-            "Soft_Rock_0_to_1_5", "Soft_Rock_1_5_to_3_0",
-            "Hard_Rock_0_to_1_5", "Hard_Rock_1_5_to_3_0",
-            "Hard_Rock_3_0_to_4_5", "Hard_Rock_4_5_to_6_0", "Hard_Rock_6_0_to_7_5",
-
-            "Soft_Murum_0_to_1_5_total", "Soft_Murum_1_5_to_3_0_total",
-            "Soft_Murum_3_0_to_4_5_total",
-            "Hard_Murum_0_to_1_5_total", "Hard_Murum_1_5_and_above_total",
-            "Soft_Rock_0_to_1_5_total", "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total", "Hard_Rock_1_5_and_above_total",
-            "Hard_Rock_3_0_to_4_5_total", "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total",
-
-            "Remarks", "Total"
-        ]
-
-        domestic_columns = [
-            "Location", "Node_No", "Depth_of_MH",
-            "d_0_to_0_75", "d_1_06_to_1_65", "d_1_66_to_2_15",
-            "d_2_16_to_2_65", "d_2_66_to_3_15", "d_3_16_to_3_65",
-            "d_3_66_to_4_15", "d_4_16_to_4_65", "d_4_66_to_5_15",
-            "d_5_16_to_5_65", "d_5_66_to_6_15", "d_6_16_to_6_65",
-            "d_6_66_to_7_15", "d_7_16_to_7_65", "d_7_66_to_8_15",
-            "d_8_16_to_8_65", "d_8_66_to_9_15", "d_9_16_to_9_65",
-            "Domestic_Chambers"
-        ]
-
-
-
-        # Reorder columns serial wise 
-        df_mh_exc = self.df_mh.reindex(columns=mh_exc_columns, fill_value="")
-        df_trench = self.df_tr.reindex(columns=trench_columns, fill_value="")
-        df_domestic = self.df_dc.reindex(columns=domestic_columns, fill_value="")
-
-        
-
-# get report by contractor id and dowanload
-@file_report_bp.route("/report", methods=["GET", "POST"])
-@login_required
-def report_file():
-    subcontractors = Subcontractor.query.all()
-
-    if request.method == "POST":
-        subcontractor_id = request.form.get("subcontractor_id")
-
-        if not subcontractor_id:
-            flash("Please select a subcontractor.", "danger")
-            return render_template("report.html", subcontractors=subcontractors)
-
-        # Fetch subcontractor for file name
-        subcontractor = Subcontractor.query.get(subcontractor_id)
-        subcontractorBill = SubcontractorBill()
-        
-        
-        #  WRITE EXCEL FILE
-        output = io.BytesIO()
-        file_name = f"{subcontractor.subcontractor_name}_Report.xlsx"
-
-        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            subcontractorBill.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
-            subcontractorBill.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
-            subcontractorBill.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
-
-        output.seek(0)
-
-        return send_file(
-            output,
-            download_name=file_name,
-            as_attachment=True,
-            mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-        )
-
-    return render_template("report.html", subcontractors=subcontractors)
-
-
-class ClientBill:
-    df_tr = []
-    df_mh = []
-    df_dc =[]
-
-    def Fetch(self, RA_Bill_No):
-              # CLIENT DATA (RA BILL WISE)
 
+# --- BLUEPRINT DEFINITION ---
+file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
+ 
+# --- Client class ---
+class ClientBill:
+    def __init__(self):
+        self.df_tr = pd.DataFrame()
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
+        self.df_laying = pd.DataFrame()
+ 
+    def Fetch(self, RA_Bill_No):
        trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
        mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
        dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
+        lay = LayingClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
 
-        self.df_tr = pd.DataFrame([c.__dict__ for c in trench])
-        self.df_mh = pd.DataFrame([c.__dict__ for c in mh])
-        self.df_dc = pd.DataFrame([c.__dict__ for c in dc])
-
-        # CLEAN COLUMNS
-        drop_cols = ["id","created_at","Remarks","_sa_instance_state"]
-
-        for df in [self.df_tr, self.df_mh, self.df_dc]:
+        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+  
+        drop_cols = ["id", "created_at", "_sa_instance_state"]
+        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
            if not df.empty:
                df.drop(columns=drop_cols, errors="ignore", inplace=True)
-
-        
-
-@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
+ 
+# --- Subcontractor class ---
+class SubcontractorBill:
+    def __init__(self):
+        self.df_tr = pd.DataFrame()
+        self.df_mh = pd.DataFrame()
+        self.df_dc = pd.DataFrame()
+        self.df_laying = pd.DataFrame()
+ 
+    def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
+        filters = {}
+        if subcontractor_id:
+            filters["subcontractor_id"] = subcontractor_id
+        if RA_Bill_No:
+            filters["RA_Bill_No"] = RA_Bill_No
+ 
+        trench = TrenchExcavation.query.filter_by(**filters).all()
+        mh = ManholeExcavation.query.filter_by(**filters).all()
+        dc = ManholeDomesticChamber.query.filter_by(**filters).all()
+        lay = Laying.query.filter_by(**filters).all()
+ 
+        self.df_tr = pd.DataFrame([c.serialize() for c in trench])
+        self.df_mh = pd.DataFrame([c.serialize() for c in mh])
+        self.df_dc = pd.DataFrame([c.serialize() for c in dc])
+        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+  
+        drop_cols = ["id", "created_at", "_sa_instance_state"]
+        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_laying]:
+            if not df.empty:
+                df.drop(columns=drop_cols, errors="ignore", inplace=True)
+ 
+# --- subcontractor report only  ---
+@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
+@login_required
+def report_file():
+    subcontractors = Subcontractor.query.all()
+    tables = None 
+    selected_sc_id = None
+    ra_bill_no = None
+    download_all = False
+ 
+    if request.method == "POST":
+        subcontractor_id = request.form.get("subcontractor_id")
+        ra_bill_no = request.form.get("ra_bill_no")
+        download_all = request.form.get("download_all") == "true"
+        action = request.form.get("action")
+ 
+        if not subcontractor_id:
+            flash("Please select a subcontractor.", "danger")
+            return render_template("report.html", subcontractors=subcontractors)
+ 
+        subcontractor = Subcontractor.query.get(subcontractor_id)
+        bill_gen = SubcontractorBill()
+ 
+        if download_all:
+            bill_gen.Fetch(subcontractor_id=subcontractor_id)
+            file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
+        else:
+            if not ra_bill_no:
+                flash("Please enter an RA Bill Number.", "danger")
+                return render_template("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)
+ 
+        # If download is clicked, return file immediately
+        if action == "download":
+            output = io.BytesIO()
+            with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+                bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
+                bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
+                bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
+                bill_gen.df_laying.to_excel(writer, index=False, sheet_name="Laying")
+            output.seek(0)
+            return send_file(output, download_name=file_name, as_attachment=True)
+ 
+        # We add bootstrap classes directly to the pandas output
+        table_classes = "table table-bordered table-striped table-hover table-sm mb-0"
+        tables = {
+            "tr": bill_gen.df_tr.to_html(classes=table_classes, index=False),
+            "mh": bill_gen.df_mh.to_html(classes=table_classes, index=False),
+            "dc": bill_gen.df_dc.to_html(classes=table_classes, index=False),
+            "laying": bill_gen.df_laying.to_html(classes=table_classes, index=False)
+        }
+        selected_sc_id = subcontractor_id
+ 
+    return render_template(
+        "subcontractor_report.html",
+        subcontractors=subcontractors,
+        tables=tables,
+        selected_sc_id=selected_sc_id,
+        ra_bill_no=ra_bill_no,
+        download_all=download_all
+    )
+ 
+# --- client report only --- 
+@file_report_bp.route("/client_report", methods=["GET", "POST"])
@login_required
 def client_vs_all_subcontractor():
-    
+    # Initialize dictionary keys to match HTML variables
+    tables = {"tr": None, "mh": None, "dc": None, "laying": None}
+    ra_val = ""

    if request.method == "POST":
        RA_Bill_No = request.form.get("RA_Bill_No")
+        action = request.form.get("action")  # Identify if 'download' or 'preview'
+        ra_val = RA_Bill_No

        if not RA_Bill_No:
-            flash("Please select RA Bill No.", "danger")
-            return render_template("generate_comparison_client_vs_subcont.html")
+            flash("Please enter RA Bill No.", "danger")
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)

        clientBill = ClientBill()
        clientBill.Fetch(RA_Bill_No=RA_Bill_No)
-
        contractorBill = SubcontractorBill()
        contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
-      
-        # GROUP SUBCONTRACTOR DATA
+
+        # Safety Check: Verify if data exists
+        if clientBill.df_tr.empty and clientBill.df_mh.empty and clientBill.df_laying.empty:
+            flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
+
+        # Define columns based on your model field names
        qty_cols = [
-            "Soft_Murum_0_to_1_5_total",
-            "Soft_Murum_1_5_to_3_0_total",
-            "Soft_Murum_3_0_to_4_5_total",
-            "Hard_Murum_0_to_1_5_total",
-            "Hard_Murum_1_5_and_above_total",
-            "Soft_Rock_0_to_1_5_total",
-            "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total",
-            "Hard_Rock_1_5_to_3_0_total",
-            "Hard_Rock_3_0_to_4_5_total",
-            "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total"
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm", "pipe_300_mm", 
+            "pipe_350_mm", "pipe_400_mm", "pipe_450_mm", "pipe_500_mm", 
+            "pipe_600_mm", "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
        ]
+        mh_dc_qty_cols = ["qty", "total"]  # Update these based on your DC model fields
+        mh_lay_qty_cols = qty_cols + ["Laying_Length", "CC_length"]

-        mh_dc_qty_cols = [
-            "d_0_to_0_75",
-            "d_0_76_to_1_05",
-            "d_1_06_to_1_65",
-            "d_1_66_to_2_15",
-            "d_2_16_to_2_65",
-            "d_2_66_to_3_15",
-            "d_3_16_to_3_65",
-            "d_3_66_to_4_15",
-            "d_4_16_to_4_65",
-            "d_4_66_to_5_15",
-            "d_5_16_to_5_65",
-            "d_5_66_to_6_15",
-            "d_6_16_to_6_65",
-            "d_6_66_to_7_15",
-            "d_7_16_to_7_65",
-            "d_7_66_to_8_15",
-            "d_8_16_to_8_65",
-            "d_8_66_to_9_15",
-            "d_9_16_to_9_65",
-            "Domestic_Chambers"
-        ]
+        def aggregate_df(df, group_cols, sum_cols):
+            if df.empty:
+                return pd.DataFrame(columns=group_cols + sum_cols)
+            existing_cols = [c for c in sum_cols if c in df.columns]
+            for col in group_cols:
+                if col not in df.columns:
+                    df[col] = "N/A"
+            return df.groupby(group_cols, as_index=False)[existing_cols].sum()

-        df_sub_tr_grp = (contractorBill.df_tr.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
+        # Aggregate data from Subcontractor tables
+        df_sub_tr_grp = aggregate_df(contractorBill.df_tr, ["Location", "MH_NO"], qty_cols)
+        df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols)
+        df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_dc_qty_cols)
+        # FIXED: Aggregating from .df_laying
+        df_sub_lay_grp = aggregate_df(contractorBill.df_laying, ["Location", "MH_NO"], mh_lay_qty_cols)

-        df_sub_mh_grp = (contractorBill.df_mh.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
+        # Standardize "Location" column to prevent merge keys being missing
+        for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying]:
+            if not df_client.empty and "Location" not in df_client.columns:
+                df_client["Location"] = "Unknown"

-        df_sub_dc_grp = (contractorBill.df_dc.groupby(["Location", "Node_No"], as_index=False)[mh_dc_qty_cols].sum())
+        try:
+            # Final Merge for Comparison
+            df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
+            df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
+            df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
+            df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))

-        # MERGE CLIENT VS SUBCONTRACTOR
-        df_tr_cmp = clientBill.df_tr.merge(
-            df_sub_tr_grp,
-            on=["Location", "MH_NO"],
-            how="left",
-            suffixes=("_Client", "_Sub")
-        )
+            # --- EXCEL DOWNLOAD LOGIC ---
+            if action == "download":
+                output = io.BytesIO()
+                with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
+                    df_tr_cmp.to_excel(writer, index=False, sheet_name="Tr.Ex ")
+                    df_mh_cmp.to_excel(writer, index=False, sheet_name="Mh.Ex ")
+                    df_dc_cmp.to_excel(writer, index=False, sheet_name="DC ")
+                    df_lay_cmp.to_excel(writer, index=False, sheet_name="Laying and Bedding")
+                output.seek(0)
+                file_name = f"Client_Comparison_RA_{RA_Bill_No}.xlsx"
+                return send_file(output, download_name=file_name, as_attachment=True)

-        df_mh_cmp = clientBill.df_mh.merge(
-            df_sub_mh_grp,
-            on=["Location", "MH_NO"],
-            how="left",
-            suffixes=("_Client", "_Sub")
-        )
+            # --- PREVIEW HTML LOGIC ---
+            table_classes = 'table table-striped table-hover table-sm border shadow-sm'
+            tables["tr"] = df_tr_cmp.to_html(classes=table_classes, index=False)
+            tables["mh"] = df_mh_cmp.to_html(classes=table_classes, index=False)
+            tables["dc"] = df_dc_cmp.to_html(classes=table_classes, index=False)
+            tables["laying"] = df_lay_cmp.to_html(classes=table_classes, index=False)

-        if "MH_NO" in clientBill.df_dc.columns:
-            clientBill.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
+        except KeyError as e:
+            flash(f"Merge Error: Missing column {str(e)}", "danger")
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)

-        df_dc_cmp = clientBill.df_dc.merge(
-            df_sub_dc_grp,
-            on=["Location", "Node_No"],
-            how="left",
-            suffixes=("_Client", "_Sub")
-        )
-       
-        # CALCULATE DIFFERENCE
-        for col in qty_cols:
-            if f"{col}_Client" in df_tr_cmp.columns:
-                df_tr_cmp[f"{col}_Diff"] = (
-                    df_tr_cmp[f"{col}_Client"].fillna(0)
-                    - df_tr_cmp[f"{col}_Sub"].fillna(0)
-                )
-
-                print("Sum of df_tr_cmp::",df_tr_cmp)
-
-                df_mh_cmp[f"{col}_Diff"] = (
-                    df_mh_cmp[f"{col}_Client"].fillna(0)
-                    - df_mh_cmp[f"{col}_Sub"].fillna(0)
-                )
-                print("Sum of df_mh_cmp::",df_mh_cmp)
-
-
-        df_dc_cmp["Domestic_Chambers_Diff"] = (
-            df_dc_cmp["Domestic_Chambers_Client"].fillna(0)
-            - df_dc_cmp["Domestic_Chambers_Sub"].fillna(0)
-        )
-
-       
-        # EXPORT EXCEL
-        output = io.BytesIO()
-        file_name = f"Client_vs_All_Subcontractor_RA_{RA_Bill_No}.xlsx"
-
-        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            df_tr_cmp.to_excel(writer, sheet_name="Tr.Ex", index=False)
-            df_mh_cmp.to_excel(writer, sheet_name="Mh.Ex", index=False)
-            df_dc_cmp.to_excel(writer, sheet_name="MH & DC", index=False)
-
-        output.seek(0)
-
-        return send_file(
-            output,
-            download_name=file_name,
-            as_attachment=True,
-            mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-        )
-
-    return render_template("generate_comparison_client_vs_subcont.html")
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)
--- a/app/routes/generate_comparison_report.py
+++ b/app/routes/generate_comparison_report.py
@@ -4,11 +4,15 @@ import io

 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
-from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.manhole_excavation_model import ManholeExcavation
-from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.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

 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
@@ -191,6 +195,13 @@ def comparison_report():
        ).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"
@@ -199,6 +210,7 @@ def comparison_report():
            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(
--- a/app/routes/subcontractor_routes.py
+++ b/app/routes/subcontractor_routes.py
@@ -2,9 +2,108 @@ from flask import Blueprint, render_template, request, redirect, flash
 from app import db
 from app.models.subcontractor_model import Subcontractor
 from app.utils.helpers import login_required
-
+ 
 subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
-
+ 
+# ---------------- ADD -----------------
+@subcontractor_bp.route("/add")
+@login_required
+def add_subcontractor():
+    return render_template("subcontractor/add.html")
+@subcontractor_bp.route("/save", methods=["POST"])
+@login_required
+def save_subcontractor():
+    # 1. Get and clean the name from the form
+    name = request.form.get("subcontractor_name", "").strip()
+ 
+    # 2. Basic validation: Ensure the name isn't empty
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+ 
+    # 3. Check if a subcontractor with this name already exists
+    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
+ 
+    if existing_sub:
+        flash(f"Subcontractor with name '{name}' already exists!", "danger")
+        return redirect("/subcontractor/add")
+ 
+    # 4. If no duplicate is found, proceed to save
+    try:
+        subcontractor = Subcontractor(
+            subcontractor_name=name,
+            contact_person=request.form.get("contact_person"),
+            mobile_no=request.form.get("mobile_no"),
+            email_id=request.form.get("email_id"),
+            gst_no=request.form.get("gst_no")
+        )
+       
+        db.session.add(subcontractor)
+        db.session.commit()
+        flash("Subcontractor added successfully!", "success")
+       
+    except Exception as e:
+        db.session.rollback()
+        flash("An error occurred while saving. Please try again.", "danger")
+ 
+    return redirect("/subcontractor/list")
+ 
+# ---------------- LIST -----------------
+@subcontractor_bp.route("/list")
+@login_required
+def subcontractor_list():
+    subcontractors = Subcontractor.query.all()
+    return render_template("subcontractor/list.html", subcontractors=subcontractors)
+ 
+# ---------------- EDIT -----------------
+@subcontractor_bp.route("/edit/<int:id>")
+@login_required
+def edit_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+    return render_template("subcontractor/edit.html", subcontractor=subcontractor)
+ 
+# ---------------- UPDATE -----------------
+@subcontractor_bp.route("/update/<int:id>", methods=["POST"])
+@login_required
+def update_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+    new_name = request.form.get("subcontractor_name")
+ 
+    # Check if the new name is taken by someone ELSE (not this current ID)
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
+ 
+    if duplicate:
+        flash("Another subcontractor already uses this name.", "danger")
+        return redirect(f"/subcontractor/edit/{id}")
+ 
+    subcontractor.subcontractor_name = new_name
+   
+    db.session.commit()
+   
+    flash("Subcontractor updated successfully!", "success")
+    return redirect("/subcontractor/list")
+ 
+# ---------------- DELETE -----------------
+@subcontractor_bp.route("/delete/<int:id>")
+@login_required
+def delete_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+ 
+    db.session.delete(subcontractor)
+    db.session.commit()
+ 
+    flash("Subcontractor deleted successfully!", "success")
+    return redirect("/subcontractor/list")
+from flask import Blueprint, render_template, request, redirect, flash
+from app import db
+from app.models.subcontractor_model import Subcontractor
+from app.utils.helpers import login_required
+ 
+subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
+ 
 # ---------------- ADD -----------------
@subcontractor_bp.route("/add")
@login_required
@@ -14,50 +113,71 @@ def add_subcontractor():
@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")
+    name = request.form.get("subcontractor_name", "").strip()
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
+ 
+    if existing_sub:
+        flash(f"Subcontractor with name '{name}' already exists!", "danger")
+        return redirect("/subcontractor/add")
+    try:
+        subcontractor = Subcontractor(
+            subcontractor_name=name,
+            contact_person=request.form.get("contact_person"),
+            mobile_no=request.form.get("mobile_no"),
+            email_id=request.form.get("email_id"),
+            gst_no=request.form.get("gst_no")
+        )
+       
+        db.session.add(subcontractor)
+        db.session.commit()
+        flash("Subcontractor added successfully!", "success")
+       
+    except Exception as e:
+        db.session.rollback()
+        flash("An error occurred while saving. Please try again.", "danger")
+ 
    return redirect("/subcontractor/list")
-
+ 
 # ---------------- LIST -----------------
@subcontractor_bp.route("/list")
@login_required
 def subcontractor_list():
    subcontractors = Subcontractor.query.all()
    return render_template("subcontractor/list.html", subcontractors=subcontractors)
-
+ 
 # ---------------- EDIT -----------------
@subcontractor_bp.route("/edit/<int:id>")
@login_required
 def edit_subcontractor(id):
    subcontractor = Subcontractor.query.get_or_404(id)
    return render_template("subcontractor/edit.html", subcontractor=subcontractor)
-
+ 
 # ---------------- UPDATE -----------------
@subcontractor_bp.route("/update/<int:id>", methods=["POST"])
@login_required
 def update_subcontractor(id):
    subcontractor = Subcontractor.query.get_or_404(id)
-
-    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")
-
+    new_name = request.form.get("subcontractor_name")
+ 
+    # Check if the new name is taken by someone ELSE (not this current ID)
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
+ 
+    if duplicate:
+        flash("Another subcontractor already uses this name.", "danger")
+        return redirect(f"/subcontractor/edit/{id}")
+ 
+    subcontractor.subcontractor_name = new_name
    db.session.commit()
-
+   
    flash("Subcontractor updated successfully!", "success")
    return redirect("/subcontractor/list")
-
+ 
 # ---------------- DELETE -----------------
@subcontractor_bp.route("/delete/<int:id>")
@login_required
@@ -68,4 +188,4 @@ def delete_subcontractor(id):
    db.session.commit()

    flash("Subcontractor deleted successfully!", "success")
-    return redirect("/subcontractor/list")
+    return redirect("/subcontractor/list")
--- a/app/services/file_service.py
+++ b/app/services/file_service.py
@@ -1,19 +1,23 @@
 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

+# Subcontractor models import
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying

+# Client models import
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
+from app.models.laying_client_model import LayingClient

-from app.utils.file_utils import ensure_upload_folder


 class FileService:
@@ -60,10 +64,12 @@ class FileService:
            df_tr_ex = pd.read_excel(filepath, sheet_name="Tr.Ex.", header=12, dtype={"MH No": str})
            df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=12, dtype={"MH No": str})
            df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=11, dtype={"MH No": str})
+            df_laying = pd.read_excel(filepath, sheet_name="Laying", header=11, dtype={"MH No": str})

            self.process_trench_excavation(df_tr_ex, subcontractor_id, RA_Bill_No)
            self.process_manhole_excavation(df_mh_ex, subcontractor_id, RA_Bill_No)
            self.process_manhole_domestic_chamber(df_mh_dc, subcontractor_id, RA_Bill_No)
+            self.process_laying(df_laying, subcontractor_id, RA_Bill_No)

            return True, "SUBCONTRACTOR File uploaded successfully."

@@ -96,18 +102,18 @@ class FileService:
            if not location or not mh_no:
                continue

-            exists = TrenchExcavation.query.filter_by(
-                subcontractor_id=subcontractor_id,
-                RA_Bill_No=RA_Bill_No,
-                Location=location,
-                MH_NO=mh_no,
-            ).first()
+            # exists = TrenchExcavation.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()

-            if exists:
-                errors.append(
-                    f"Model-Tr.Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
-                )
-                continue
+            # if exists:
+            #     errors.append(
+            #         f"Model-Tr.Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue

            record_data = {}
            for col in df.columns:
@@ -154,18 +160,18 @@ class FileService:
            if not location or not mh_no:
                continue

-            exists = ManholeExcavation.query.filter_by(
-                subcontractor_id=subcontractor_id,
-                RA_Bill_No=RA_Bill_No,
-                Location=location,
-                MH_NO=mh_no,
-            ).first()
+            # exists = ManholeExcavation.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()

-            if exists:
-                errors.append(
-                    f"Model-MH Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
-                )
-                continue
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue

            record_data = {}
            for col in df.columns:
@@ -212,18 +218,18 @@ class FileService:
            if not location or not mh_no:
                continue

-            exists = ManholeDomesticChamber.query.filter_by(
-                subcontractor_id=subcontractor_id,
-                RA_Bill_No=RA_Bill_No,
-                Location=location,
-                MH_NO=mh_no,
-            ).first()
+            # exists = ManholeDomesticChamber.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()

-            if exists:
-                errors.append(
-                    f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
-                )
-                continue
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue

            record_data = {}
            for col in df.columns:
@@ -245,6 +251,66 @@ class FileService:

        db.session.commit()

+    # ---------------- Laying (Subcontractor) ----------------
+    def process_laying(self, df, subcontractor_id, RA_Bill_No):
+
+        df.columns = (
+            df.columns.astype(str)
+            .str.strip()
+            .str.replace(r"[^\w]", "_", regex=True)
+            .str.replace("__+", "_", regex=True)
+            .str.strip("_")
+        )
+
+        df = df.dropna(how="all")
+
+        if "Location" in df.columns:
+            df["Location"] = df["Location"].ffill()
+
+        errors = []
+
+        for idx, row in df.iterrows():
+            location = self.normalize(row.get("Location"))
+            mh_no = self.normalize(row.get("MH_NO"))
+
+            if not location or not mh_no:
+                continue
+
+            # exists = ManholeDomesticChamber.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()
+
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue
+
+            record_data = {}
+            for col in df.columns:
+                if hasattr(Laying, col):
+                    val = row[col]
+                    if pd.isna(val) or str(val).strip() in ["", "-", "—", "nan"]:
+                        val = None
+                    record_data[col] = val
+
+            record = Laying(
+                subcontractor_id=subcontractor_id,
+                RA_Bill_No=RA_Bill_No,
+                **record_data,
+            )
+            db.session.add(record)
+
+        if errors:
+            raise Exception(" | ".join(errors))
+
+        db.session.commit()
+
+
+
    # ---------------- CLIENT FILE UPLOAD ----------------
    def handle_client_file_upload(self, file, RA_Bill_No):

@@ -270,10 +336,12 @@ class FileService:
            df_tr_ex = pd.read_excel(filepath, sheet_name="Tr.Ex.", header=4)
            df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=4)
            df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=3)
+            df_lay = pd.read_excel(filepath, sheet_name="Laying & Bedding", header=3)

            self.save_client_data(df_tr_ex, TrenchExcavationClient, RA_Bill_No)
            self.save_client_data(df_mh_ex, ManholeExcavationClient, RA_Bill_No)
            self.save_client_data(df_mh_dc, ManholeDomesticChamberClient, RA_Bill_No)
+            self.save_client_data(df_lay, LayingClient, RA_Bill_No)

            db.session.commit()
            return True, "Client file uploaded successfully."
@@ -304,3 +372,4 @@ class FileService:

            record = model(RA_Bill_No=RA_Bill_No, **record_data)
            db.session.add(record)
+
--- a/app/static/css/subcontractor.css
+++ b/app/static/css/subcontractor.css
@@ -1,35 +0,0 @@
-body {
-    background: #f5f7fa;
-    font-family: Arial;
-    padding: 40px;
-}
-
-form {
-    width: 420px;
-    padding: 20px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
-
-label {
-    margin-top: 10px;
-    display: block;
-    font-weight: bold;
-}
-
-input,
-textarea {
-    width: 100%;
-    padding: 8px;
-    margin-top: 4px;
-}
-
-button {
-    margin-top: 20px;
-    padding: 10px 20px;
-    background: #0055ff;
-    color: #fff;
-    border: 0;
-    cursor: pointer;
-}
--- a/app/static/downloads/format/subcontractor_format.xlsx
+++ b/app/static/downloads/format/subcontractor_format.xlsx
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -16,7 +16,9 @@
 <body class="bg-light">

    <!-- NAVBAR -->
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm">
+    <!-- <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm"> -->
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm fixed-top">
+
        <div class="container-fluid">

            <!-- Brand -->
@@ -40,10 +42,10 @@
                        </a>
                    </li>

-                    <!-- Subcontractor -->
+                    <!-- Subcontractor Model -->
                    <li class="nav-item dropdown">
                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-people-fill me-1"></i> Subcontractor
+                            <i class="bi bi-people-fill me-1"></i> Subcontractor Model
                        </a>
                        <ul class="dropdown-menu dropdown-menu-dark">
                            <li>
@@ -59,29 +61,36 @@
                        </ul>
                    </li>

-                    <!-- File System -->
+                    <!-- Subcontractor File System -->
                    <li class="nav-item dropdown">
                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-folder-fill me-1"></i> File System
+                            <i class="bi bi-folder-fill me-1"></i>Subcontractor File System
                        </a>
                        <ul class="dropdown-menu dropdown-menu-dark">
                            <li>
-                                <a class="dropdown-item" href="/file/import">
+                                <a class="dropdown-item" href="/file/import_Subcontractor">
                                    <i class="bi bi-upload me-2"></i> Import File
                                </a>
                            </li>
                            <li>
-                                <a class="dropdown-item" href="/file/report">
-                                    <i class="bi bi-download me-2"></i> Download Reports
+                                <a class="dropdown-item" href="/file/Subcontractor_report">
+                                    <i class="bi bi-download me-2"></i> Show Reports
                                </a>
                            </li>
+
+                            <li>
+                                <a class="dropdown-item" href="/dashboard/subcontractor_dashboard">
+                                    <i class="bi bi-speedometer2 me-2"></i> Subcontractor Dashboard
+                                </a>
+                            </li>
+
                        </ul>
                    </li>

                    <!-- Client System -->
                    <li class="nav-item dropdown">
                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-building me-1"></i> Client System
+                            <i class="bi bi-building me-1"></i> Client File System
                        </a>
                        <ul class="dropdown-menu dropdown-menu-dark">
                            <li>
@@ -91,18 +100,34 @@
                            </li>

                            <li>
-                                <a class="dropdown-item" href="/report/comparison_report">
-                                    <i class="bi bi-arrow-left-right me-2"></i> client vs sub-cont. Comparison Report
-                                </a>
-                            </li>
-                            <li>
-                                <a class="dropdown-item" href="/file/client_vs_subcont">
-                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
+                                <a class="dropdown-item" href="/file/client_report">
+                                    <i class="bi bi-arrow-left-right me-2"></i> Show Report
                                </a>
                            </li>
                        </ul>
                    </li>

+                    <!-- Reports -->
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
+                            <i class="bi bi-building me-1"></i> Reports
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-dark">
+
+                            <li>
+                                <a class="dropdown-item" href="/report/comparison_report">
+                                    <i class="bi bi-arrow-left-right me-2"></i> client vs sub-cont. Comparison Report
+                                </a>
+                            </li>
+                            <!-- <li>
+                                <a class="dropdown-item" href="/file/client_vs_subcont">
+                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
+                                </a>
+                            </li> -->
+                        </ul>
+                    </li>
+
+
                    <!-- Formats -->
                    <li class="nav-item">
                        <a class="nav-link" href="/file_format">
@@ -154,25 +179,32 @@
        </div>
    </nav>

-    <!-- FLASH MESSAGES -->
-    <div class="container mt-3">
-        {% with messages = get_flashed_messages(with_categories=true) %}
-        {% if messages %}
-        {% for category, message in messages %}
-        <div class="alert alert-{{ category }} alert-dismissible fade show">
-            {{ message }}
-            <button class="btn-close" data-bs-dismiss="alert"></button>
-        </div>
-        {% endfor %}
-        {% endif %}
-        {% endwith %}
-    </div>

    <!-- PAGE CONTENT -->
-    <div class="container mt-4">
-        {% block content %}{% endblock %}
+    <div class="container-fluid vh-100 pt-5 overflow-hidden">
+        <!-- FLASH MESSAGES -->
+        <div class="container mt-3">
+            {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %}
+            {% for category, message in messages %}
+            <div class="alert alert-{{ category }} alert-dismissible fade show">
+                {{ message }}
+                <button class="btn-close" data-bs-dismiss="alert"></button>
+            </div>
+            {% endfor %}
+            {% endif %}
+            {% endwith %}
+        </div>
+
+
+        <div class="overflow-auto h-100">
+            <div class="container mt-4">
+                {% block content %}{% endblock %}
+            </div>
+        </div>
    </div>

+
    <!-- Bootstrap JS -->
    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>

--- a/app/templates/client_report.html
+++ b/app/templates/client_report.html
@@ -0,0 +1,84 @@
+{% extends "base.html" %}
+
+{% block content %}
+<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>
+            <input type="text" name="RA_Bill_No" class="form-control mb-3" value="{{ ra_val }}" required>
+
+            <div class="row">
+                <div class="col-md-6">
+                    <button type="submit" name="action" value="preview" class="btn btn-secondary w-100">Preview
+                        Data</button>
+                </div>
+                <div class="col-md-6">
+                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
+                        Report</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    {% if tables.tr or tables.mh or tables.dc or tables.laying %}
+    <div class="card shadow-sm p-3">
+        <h4 class="mb-3">Comparison Preview</h4>
+
+        <ul class="nav nav-tabs" id="reportTabs" role="tablist">
+            <li class="nav-item">
+                <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
+                    type="button">Tr.Ex </button>
+            </li>
+            <li class="nav-item">
+                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
+                    </button>
+            </li>
+            <li class="nav-item">
+                <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
+                    </button>
+            </li>
+            <li class="nav-item">
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                    & Bedding </button>
+        </ul>
+
+        <div class="tab-content mt-3" id="reportTabsContent">
+            <div class="tab-pane fade show active" id="tr" role="tabpanel">
+                <div class="table-responsive" style="max-height: 500px;">
+                    {{ tables.tr|safe }}
+                </div>
+            </div>
+            <div class="tab-pane fade" id="mh" role="tabpanel">
+                <div class="table-responsive" style="max-height: 500px;">
+                    {{ tables.mh|safe }}
+                </div>
+            </div>
+            <div class="tab-pane fade" id="dc" role="tabpanel">
+                <div class="table-responsive" style="max-height: 500px;">
+                    {{ tables.dc|safe }}
+                </div>
+            </div>
+            <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>
+{% endblock %}
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -1,10 +1,87 @@
 {% extends "base.html" %}

 {% block content %}
-<h2 class="mb-4">Dashboard</h2>

-<div class="card p-4 shadow-sm">
-    <h5>Welcome to Comparison Project</h5>
-    <p>This is dashboard panel.</p>
+<div class="container-fluid px-2 px-md-4">
+
+    <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>
+                </div>
+            </div>
+        </div>
+
+        <!-- Completed -->
+        <div class="col-12 col-md-4">
+            <div class="card text-white bg-success shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>test Completed</h6>
+                    <h3 class="fw-bold">35%</h3>
+                </div>
+            </div>
+        </div>
+
+        <!-- Pending -->
+        <div class="col-12 col-md-4">
+            <div class="card text-dark bg-warning shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Pending</h6>
+                    <h3 class="fw-bold">35%</h3>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <!-- Charts -->
+    <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>
+            </div>
+        </div>
+
+        <!-- Pie Chart -->
+        <div class="col-12 col-md-6">
+            <div class="card shadow-sm h-100">
+                <div class="card-header bg-dark text-white text-center text-md-start">
+                    Project Status Pie Chart
+                </div>
+                <div class="card-body text-center">
+                    <img src="data:image/png;base64,{{ pie_chart }}" class="img-fluid" style="max-height:300px;">
+                </div>
+            </div>
+        </div>
+
+        <!-- Histogram -->
+        <div class="col-12">
+            <div class="card shadow-sm">
+                <div class="card-header bg-dark text-white text-center text-md-start">
+                    Daily Work Histogram
+                </div>
+                <div class="card-body text-center">
+                    <img src="data:image/png;base64,{{ histogram }}" class="img-fluid" style="max-height:350px;">
+                </div>
+            </div>
+        </div>
+
+    </div>
+
 </div>
+
 {% endblock %}
--- a/app/templates/file_import_subcontractor.html
+++ b/app/templates/file_import_subcontractor.html
--- a/app/templates/generate_comparison_client_vs_subcont.html
+++ b/app/templates/generate_comparison_client_vs_subcont.html
@@ -1,43 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="container mt-4">
-
-    <h2 class="mb-4">File Comparison </h2>
-
-    <!-- FLASH MESSAGES -->
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
-    {% endfor %}
-    {% endif %}
-    {% endwith %}
-
-    <div class="card p-4 shadow-sm">
-
-        <form method="POST">
-
-            <!-- SELECT SUBCONTRACTOR -->
-            <!-- <label class="form-label fw-semibold">Select Subcontractor</label>
-            <select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
-                <option value="">-- Select Subcontractor --</option>
-
-                {% for sc in subcontractors %}
-                <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
-                {% endfor %}
-            </select> -->
-
-            <label class="form-label">RA Bill No</label>
-            <input type="text" name="RA_Bill_No" class="form-control mb-3" required>
-
-
-            <button class="btn btn-primary w-100">Generate Report</button>
-        </form>
-
-    </div>
-</div>
-{% endblock %}
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -31,7 +31,7 @@
                                Laxmi Civil Engineering Services Pvt Ltd
                            </h4>
                            <p class="text-muted mb-0">
-                                Data Comparison System
+                                Data Comparison Software Solapur(UGD)
                            </p>
                        </div>

--- a/app/templates/report.html
+++ b/app/templates/report.html
@@ -1,39 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="container mt-4">
-
-    <h2 class="mb-4">File Report</h2>
-
-    <!-- FLASH MESSAGES -->
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
-    {% endfor %}
-    {% endif %}
-    {% endwith %}
-
-    <div class="card p-4 shadow-sm">
-
-        <form method="POST">
-
-            <!-- SELECT SUBCONTRACTOR -->
-            <label class="form-label fw-semibold">Select Subcontractor</label>
-            <select name="subcontractor_id" id="subcontractor_id" class="form-select mb-3" required>
-                <option value="">-- Select Subcontractor --</option>
-
-                {% for sc in subcontractors %}
-                <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
-                {% endfor %}
-            </select>
-
-            <button class="btn btn-primary w-100">Generate Report</button>
-        </form>
-
-    </div>
-</div>
-{% endblock %}
--- a/app/templates/subcontractor/list.html
+++ b/app/templates/subcontractor/list.html
@@ -5,13 +5,13 @@

    <!-- Header -->
    <div class="row mb-3 align-items-center">
-        <div class="col-12 col-md-6">
+        <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="col-12 col-md-6 text-center text-md-end">
+        <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>
@@ -65,8 +65,8 @@
                            </a>
                        </div>
                    </td>
-                    /tr>
-                    {% endfor %}
+                </tr>
+                {% endfor %}
            </tbody>

            <!-- TOTAL ROW -->
--- a/app/templates/subcontractor_dashboard.html
+++ b/app/templates/subcontractor_dashboard.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<div class="container-fluid px-2 px-md-4">
+
+    <h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
+
+    <!-- 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>
+            </div>
+        </div>
+
+
+    </div>
+
+</div>
+
+{% endblock %}
--- a/app/templates/subcontractor_report.html
+++ b/app/templates/subcontractor_report.html
@@ -0,0 +1,142 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container my-4">
+
+    <h2 class="text-center mb-4">Generate Subcontractor Report</h2>
+
+    <!-- FORM -->
+    <div class="card shadow-sm p-3 p-md-4 mx-auto" style="max-width:600px;">
+        <form method="POST">
+
+            <div class="mb-3">
+                <label class="form-label fw-semibold">Select Subcontractor</label>
+                <select name="subcontractor_id" class="form-select" required>
+                    <option value="">-- Select Subcontractor --</option>
+                    {% for sc in subcontractors %}
+                    <option value="{{ sc.id }}" {% if selected_sc_id==sc.id|string %}selected{% endif %}>
+                        {{ sc.subcontractor_name }}
+                    </option>
+                    {% endfor %}
+                </select>
+            </div>
+
+            <div class="form-check form-switch mb-3">
+                <input class="form-check-input" type="checkbox" id="downloadAllSwitch" name="download_all" value="true"
+                    {% if download_all %}checked{% endif %}>
+                <label class="form-check-label fw-bold text-primary">
+                    Download All RA Bills
+                </label>
+            </div>
+
+            <div class="mb-4" id="ra_bill_container">
+                <label class="form-label fw-semibold">RA Bill Number</label>
+                <input type="text" name="ra_bill_no" id="ra_bill_input" class="form-control"
+                    value="{{ ra_bill_no or '' }}">
+            </div>
+
+            <div class="row g-2">
+                <div class="col-12 col-md-6">
+                    <button class="btn btn-outline-primary w-100" name="action" value="preview">
+                        Preview Data
+                    </button>
+                </div>
+                <div class="col-12 col-md-6">
+                    <button class="btn btn-primary w-100" name="action" value="download">
+                        Download Excel
+                    </button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+    {% if tables %}
+    <!-- REPORT PREVIEW -->
+    <div class="mt-5">
+
+        <h3 class="text-center mb-3">Report Preview</h3>
+
+        <div class="card shadow-sm">
+
+            <!-- MOBILE SCROLLABLE TABS -->
+            <div class="card-header p-0">
+                <ul class="nav nav-tabs flex-nowrap overflow-auto">
+                    <li class="nav-item">
+                        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#tr">
+                            Trench Excavation
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#mh">
+                            Manhole Excavation
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#dc">
+                            Manhole & Domestic Chambers
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#laying">
+                            Pipe Laying
+                        </button>
+                    </li>
+                </ul>
+            </div>
+
+            <!-- TAB CONTENT -->
+            <div class="card-body tab-content">
+
+                <div class="tab-pane fade show active" id="tr">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.tr | safe }}
+                    </div>
+                </div>
+
+                <div class="tab-pane fade" id="mh">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.mh | safe }}
+                    </div>
+                </div>
+
+                <div class="tab-pane fade" id="dc">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.dc | safe }}
+                    </div>
+                </div>
+
+                <div class="tab-pane fade" id="laying">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.laying | safe }}
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    {% endif %}
+
+</div>
+
+<!-- BOOTSTRAP-ONLY JS -->
+<script>
+    function toggleRAInput() {
+        const checkbox = document.getElementById("downloadAllSwitch");
+        const input = document.getElementById("ra_bill_input");
+        const container = document.getElementById("ra_bill_container");
+
+        if (checkbox.checked) {
+            input.value = "";
+            input.disabled = true;
+            container.classList.add("opacity-50");
+        } else {
+            input.disabled = false;
+            container.classList.remove("opacity-50");
+        }
+    }
+
+    document.addEventListener("DOMContentLoaded", toggleRAInput);
+    document.getElementById("downloadAllSwitch").addEventListener("change", toggleRAInput);
+</script>
+{% endblock %}
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,5 @@ xlrd
 Werkzeug
 python-dotenv
 cryptography
-xlsxwriter
+xlsxwriter
+matplotlib
Author	SHA1	Message	Date
pjpatil12	1dceb640bd	Merge pull request 'Dowload report of client report fix' (#10 ) from dev-anish into main Reviewed-on: #10	2026-01-19 06:54:02 +00:00
anishd100	359847958d	Dowload report of client report fix	2026-01-17 18:06:58 +05:30
pjpatil12	90c18383da	Merge pull request 'subcontractor dashboard ui page create' (#9 ) from pankaj-dev into main Reviewed-on: #9	2026-01-17 12:12:03 +00:00
pjpatil12	ac9d964ef4	subcontractor dashboard ui page create	2026-01-17 17:39:31 +05:30
pjpatil12	f22dc0cccd	Merge pull request 'client laying and bedding in ui added' (#8 ) from dev-anish into main Reviewed-on: #8	2026-01-17 12:05:47 +00:00
anishd100	0007d6e87d	client laying and bedding in ui added	2026-01-17 17:33:07 +05:30
pjpatil12	8cba86323e	sub-cont model validations	2026-01-17 15:41:26 +05:30
pjpatil12	e4837b203a	modify file_report	2026-01-17 14:50:30 +05:30
pjpatil12	4fa35fe05a	Renames of report html files	2026-01-17 14:07:32 +05:30
pjpatil12	a07c1ddf8a	renames of report html files	2026-01-17 14:01:15 +05:30
pjpatil12	15b07b3d55	marge code of static Menubar apply boostrap css	2026-01-16 15:01:40 +05:30
pjpatil12	dd4b494435	static Menubar apply boostrap css	2026-01-16 13:04:59 +05:30
pjpatil12	ff5da926f3	Merge pankaj-dev into main	2026-01-16 11:30:49 +05:30
pjpatil12	1022923509	changes of report	2026-01-16 11:27:26 +05:30
pjpatil12	c9a27b098b	import laying model of client side	2026-01-15 23:50:08 +05:30
pjpatil12	8f817c94fd	Merged pankaj-dev into main	2026-01-15 14:29:58 +05:30
pjpatil12	0bb670b152	suncontractor and client download ui changes -a	2026-01-15 14:21:36 +05:30
pjpatil12	aad9b2b967	import modify subcontractor sheet Laying model import added	2026-01-15 12:27:29 +05:30
pjpatil12	e0541ff80c	comment on html page	2026-01-14 11:12:40 +05:30
pjpatil12	ed85313d42	Update README.md	2026-01-13 11:43:08 +00:00
pjpatil12	a853992e64	Update README.md	2026-01-13 11:12:33 +00:00
pjpatil12	677df59863	Merged pankaj-dev into main after resolving conflicts	2026-01-13 15:40:45 +05:30
pjpatil12	d46c7c0936	changes of ui mobile view of dashboard	2026-01-13 15:22:53 +05:30
pjpatil12	de074c68ae	Merge pull request 'added subcontractor report generation by RA bill and subcontractor name' (#1 ) from anish-dev into main Reviewed-on: #1	2026-01-13 08:58:36 +00:00
anishd100	ae5fee8f46	added subcontractor report generation by RA bill and subcontractor name	2026-01-13 13:34:20 +05:30
pjpatil12	a73d8e5ed1	changes of manu bar add report and dashboard	2026-01-13 13:21:06 +05:30