New rate model added

app/__init__.py

@@ -38,7 +38,7 @@ def register_blueprints(app):
 
     # new
     from app.routes.activity_routes import activity_bp
-    from app.routes.engineering import engi_bp
+    from app.routes.engineering_master_routes import engi_bp
 
     app.register_blueprint(auth_bp) 
     app.register_blueprint(user_bp)

app/config.py

@@ -22,3 +22,13 @@ class Config:
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
+
+    # LDAP Configuration New
+    LDAP_SERVER = os.getenv("LDAP_SERVER")
+    LDAP_PORT = int(os.getenv("LDAP_PORT", 389))
+    LDAP_USE_SSL = os.getenv("LDAP_USE_SSL", "False").lower() == "true"
+
+    LDAP_BASE_DN = os.getenv("LDAP_BASE_DN")
+    LDAP_DOMAIN = os.getenv("LDAP_DOMAIN")
+
+    LDAP_SEARCH_BASE = os.getenv("LDAP_SEARCH_BASE")

app/models/subcontractor_rate_model.py

@@ -0,0 +1,23 @@
+from app import db
+from datetime import datetime
+
+class SubcontractorRate(db.Model):
+    __tablename__ = "subcontractor_rates"
+
+    id = db.Column(db.Integer, primary_key=True)
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    subcontractor = db.relationship("Subcontractor", backref="rate_master")
+
+    category = db.Column(db.String(50), nullable=False)
+    item_code = db.Column(db.String(50), nullable=False)
+    item_name = db.Column(db.String(200), nullable=False)
+    unit = db.Column(db.String(20))
+    rate = db.Column(db.Numeric(12,2), nullable=False)
+    effective_from = db.Column(db.Date, nullable=False)
+    effective_to = db.Column(db.Date)
+    status = db.Column(db.String(20), default="Active")
+    created_at = db.Column(db.DateTime, default=datetime.now)
+
+    def __repr__(self):
+        return f"<subcontractor Rate {self.item_name}>"
+    

app/routes/auth.py

@@ -34,6 +34,7 @@ def login():
                 session.clear()
                 session["user_id"] = user.id
                 session["user_name"] = user.name
+                session["email"] = user.email
                 session.permanent = True
                 
                 current_app.logger.info(f"Login successful. User={user.name}")

app/routes/engineering.py

@@ -1,16 +0,0 @@
-from flask import Blueprint
-from app.models.width_model import Width
-
-engi_bp = Blueprint("engineering",__name__, url_prefix="/engi")
-
-
-@engi_bp.route("/add")
-def add_width_md():
-
-    return True
-
-
-@engi_bp.route("/list")
-def display_list():
-
-    return True

app/routes/engineering_master_routes.py

@@ -0,0 +1,56 @@
+from flask import (
+    Blueprint,
+    render_template,
+    request,
+    redirect,
+    url_for,
+    flash
+)
+
+from app.models.subcontractor_model import Subcontractor
+from app.services.subcontractor_rate_service import SubcontractorRateService
+from app.constants.messages import SuccessMessage, ErrorMessage
+
+engi_bp = Blueprint(
+    "engineering",
+    __name__,
+    url_prefix="/engi"
+)
+
+
+    
+@engi_bp.route("/")
+def engineering_master():
+
+    return render_template(
+        "engineering/index.html",
+        title="Engineering Masters"
+    )
+
+
+@engi_bp.route("/subcontractor-rate")
+def add_subcontractor_rates():
+    subcontractors = Subcontractor.query.filter_by(status="Active").all()
+
+    if request.method == "POST":
+        try:
+            SubcontractorRateService.save_rate(request.form)
+            flash(SuccessMessage.SAVE, "success")
+            return redirect(url_for("engineering.add_subcontractor_rates"))
+        except Exception as e:
+            flash(ErrorMessage.INTERNAL_SERVER_ERROR, "danger")
+
+    return render_template(
+        "engineering/add_rate.html",
+        title="Subcontractor Rate Master",
+        subcontractors=subcontractors
+    )
+
+@engi_bp.route("/client-rate")
+def client_rates():
+
+    return render_template(
+        "engineering/client_rate.html",
+        title="Client Rate Master"
+    )
+

app/services/abstract_service.py

@@ -257,18 +257,18 @@ class AbstractReportService:
     def laying_summary(self):
         f = self.filters()
         data = [
-            ("150 mm Pipe","RM",Laying.pipe_150_mm),
+            ("150 mm Dia","RM",Laying.pipe_150_mm),
-            ("200 mm Pipe","RM",Laying.pipe_200_mm),
+            ("200 mm Dia","RM",Laying.pipe_200_mm),
-            ("250 mm Pipe","RM",Laying.pipe_250_mm),
+            ("250 mm Dia","RM",Laying.pipe_250_mm),
-            ("300 mm Pipe","RM",Laying.pipe_300_mm),
+            ("300 mm Dia","RM",Laying.pipe_300_mm),
-            ("350 mm Pipe","RM",Laying.pipe_350_mm),
+            ("350 mm Dia","RM",Laying.pipe_350_mm),
-            ("400 mm Pipe","RM",Laying.pipe_400_mm),
+            ("400 mm Dia","RM",Laying.pipe_400_mm),
-            ("450 mm Pipe","RM",Laying.pipe_450_mm),
+            ("450 mm Dia","RM",Laying.pipe_450_mm),
-            ("500 mm Pipe","RM",Laying.pipe_500_mm),
+            ("500 mm Dia","RM",Laying.pipe_500_mm),
-            ("600 mm Pipe","RM",Laying.pipe_600_mm),
+            ("600 mm Dia","RM",Laying.pipe_600_mm),
-            ("700 mm Pipe","RM",Laying.pipe_700_mm),
+            ("700 mm Dia","RM",Laying.pipe_700_mm),
-            ("900 mm Pipe","RM",Laying.pipe_900_mm),
+            ("900 mm Dia","RM",Laying.pipe_900_mm),
-            ("1200 mm Pipe","RM",Laying.pipe_1200_mm),
+            ("1200 mm Dia","RM",Laying.pipe_1200_mm),
         ]
         return self.make_summary(data, Laying, f)
 

app/services/subcontractor_rate_service.py

@@ -0,0 +1,65 @@
+from app.services.db_service import db
+from app.models.subcontractor_rate_model import SubcontractorRate
+
+
+class SubcontractorRateService:
+
+    @staticmethod
+    def save_rate(form):
+
+        rate = SubcontractorRate(
+            subcontractor_id=form.get("subcontractor_id"),
+            category=form.get("category"),
+            item_code=form.get("item_code"),
+            item_name=form.get("item_name"),
+            unit=form.get("unit"),
+            rate=form.get("rate"),
+            effective_from=form.get("effective_from"),
+            effective_to=form.get("effective_to") or None,
+            status=form.get("status")
+        )
+
+        db.session.add(rate)
+        db.session.commit()
+        return rate
+    
+    
+    @staticmethod
+    def get_all_rates():
+
+        return (
+            SubcontractorRate.query
+            .order_by(SubcontractorRate.created_at.desc())
+            .all()
+        )
+    @staticmethod
+    def get_rate(rate_id):
+
+        return SubcontractorRate.query.get_or_404(rate_id)
+    
+    @staticmethod
+    def update_rate(rate_id, form):
+
+        rate = SubcontractorRate.query.get_or_404(rate_id)
+
+        rate.subcontractor_id = form.get("subcontractor_id")
+        rate.category = form.get("category")
+        rate.item_code = form.get("item_code")
+        rate.item_name = form.get("item_name")
+        rate.unit = form.get("unit")
+        rate.rate = form.get("rate")
+        rate.effective_from = form.get("effective_from")
+        rate.effective_to = form.get("effective_to") or None
+        rate.status = form.get("status")
+
+        db.session.commit()
+        return rate
+    
+    @staticmethod
+    def delete_rate(rate_id):
+
+        rate = SubcontractorRate.query.get_or_404(rate_id)
+
+        db.session.delete(rate)
+
+        db.session.commit()

app/templates/base.html

@@ -124,66 +124,109 @@
                                     <i class="bi bi-arrow-left-right me-2"></i> Client vs Subcontractor
                                 </a>
                             </li>
-                            <!-- <li>
+                            
-                                <a class="dropdown-item" href="/file/client_vs_subcont">
+                        </ul>
-                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
+                    </li>
+
+                    <!-- Masters -->
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/engi">
+                            <i class="bi bi-gear me-2"></i> Masters
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-dark">
+                            <!-- Client Standard Rates -->
+                            <li class="nav-item">
+                                <a class="nav-link" href="/engi/subcontractor-rate">
+                                    <i class="bi bi-file-earmark-text me-1"></i> Rate Master
                                 </a>
-                            </li> -->
+                            </li>
+
+                            <!-- Client Standard Rates -->
+                            <li class="nav-item">
+                                <a class="nav-link" href="/engi/client-rate">
+                                    <i class="bi bi-file-earmark-text me-1"></i> Client Standard Rates
+                                </a>
+                            </li>
+
+                            <!-- Formats -->
+                            <li class="nav-item">
+                                <a class="nav-link" href="/file_format">
+                                    <i class="bi bi-file-earmark-text me-1"></i> Formats
+                                </a>
+                            </li>
+                            
                         </ul>
                     </li>
 
 
-                    <!-- Formats -->
-                    <li class="nav-item">
-                        <a class="nav-link" href="/file_format">
-                            <i class="bi bi-file-earmark-text me-1"></i> Formats
-                        </a>
-                    </li>
-
                     <!-- USER DROPDOWN -->   
-                    {% if session.get("user_id") %}
+                    <li class="nav-item dropdown">
-                    <li class="nav-item dropdown ms-lg-3">
 
-                        <a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#"
+                        <a class="nav-link dropdown-toggle d-flex align-items-center text-white"
-                            data-bs-toggle="dropdown">
+                            href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            <i class="bi bi-person-circle fs-5"></i>
+
-                            <span class="d-none d-lg-inline">
+                            <i class="bi bi-person-circle fs-4"></i>
+                            <span class="ms-2 fw-semibold">
                                 {{ session.get("user_name") }}
                             </span>
                         </a>
 
-                        <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark shadow">
+                        <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark border-0 shadow-lg bg-dark p-0"
+                            style="width:320px;">
 
-                            <!-- User card -->
+                            <!-- Profile Header -->
-                            <li class="px-3 py-3 text-center border-bottom">
+                            <li class="text-center py-4 border-bottom border-secondary">
-                                <i class="bi bi-person-circle fs-1"></i>
+                                <i class="bi bi-person-circle text-light" style="font-size:60px;"></i>
-                                <div class="fw-semibold mt-1">
+                                <h5 class="mt-2 mb-0 fw-bold">
                                     {{ session.get("user_name") }}
-                                </div>
+                                </h5>
-                                <small class="text-muted">Logged in user</small>
+                                <small class="text-secondary">
+                                    {{ session.get("email") }}
+                                </small>
                             </li>
 
+                            <!-- Dashboard -->
                             <li>
-                                <a class="dropdown-item" href="/dashboard">
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('dashboard.dashboard') }}">
                                     <i class="bi bi-speedometer2 me-2"></i> Dashboard
                                 </a>
                             </li>
+
+                            <!-- Activity Log page -->
                             <li>
-                                <a class="dropdown-item" href="{{ url_for('activity.activity') }}">
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('activity.activity') }}">
-                                    <i class="bi bi-clock-history me-2"></i>
+                                    <i class="bi bi-clock-history me-2"></i> Activity Log
-                                    Activity Log
                                 </a>
                             </li>
 
+                            <!--  Manage Account -->
                             <li>
-                                <a class="dropdown-item text-warning" href="/logout">
+                                <a class="dropdown-item py-2" href="#">
-                                    <i class="bi bi-box-arrow-right me-2"></i> Logout
+                                    <i class="bi bi-gear me-2"></i> Manage Account
                                 </a>
                             </li>
                             
+                            <li><hr class="dropdown-divider border-secondary m-0"></li>
+
+                            <!--  Logout Account -->
+                            <li>
+                                <a class="dropdown-item text-warning py-2" href="{{ url_for('auth.logout') }}">
+                                    <i class="bi bi-box-arrow-right me-2"></i>
+                                    Logout
+                                </a>
+                            </li>
+
+                            <!-- Footer -->
+                            <li class="text-center py-3 bg-secondary bg-opacity-10 border-top border-secondary">
+                                <small class="text-light">
+                                    <i class="bi bi-shield-check text-success"></i>
+                                    Secured by <strong>LCEPL</strong>
+                                </small>
+                            </li>
+
                         </ul>
+
                     </li>
-                    {% endif %}
 
                 </ul>
             </div>

app/templates/engineering/add.html

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

app/templates/engineering/add_rate.html

@@ -0,0 +1,236 @@
+{% extends "base.html" %}
+{% block content %}
+<div class="container-fluid mt-4">
+
+    <div class="card shadow">
+
+        <div class="card-header bg-primary text-white">
+            <h4 class="mb-0">
+                <i class="bi bi-currency-rupee"></i>
+                Subcontractor Rate Master
+            </h4>
+        </div>
+
+        <div class="card-body">
+
+            <form method="POST">
+
+                <div class="row">
+
+                    <!-- Subcontractor -->
+                    <div class="col-md-4 mb-3">
+                        <label class="form-label fw-bold">
+                            Subcontractor
+                        </label>
+
+                        <select name="subcontractor_id"
+                                class="form-select"
+                                required>
+
+                            <option value="">
+                                Select Subcontractor
+                            </option>
+
+                            {% for sub in subcontractors %}
+                            <option value="{{ sub.id }}">
+                                {{ sub.subcontractor_name }}
+                            </option>
+                            {% endfor %}
+
+                        </select>
+                    </div>
+
+                    <!-- Category -->
+                    <div class="col-md-4 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Category
+                        </label>
+
+                        <select name="category"
+                                class="form-select"
+                                required>
+
+                            <option value="">
+                                Select Category
+                            </option>
+
+                            <option value="TR_EX">
+                                Trench Excavation
+                            </option>
+
+                            <option value="MH_EX">
+                                Manhole Excavation
+                            </option>
+
+                            <option value="MH_DC">
+                                Manhole & Domestic Chamber
+                            </option>
+
+                            <option value="LAYING">
+                                Pipe Laying
+                            </option>
+
+                        </select>
+
+                    </div>
+
+                    <!-- Status -->
+                    <div class="col-md-4 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Status
+                        </label>
+
+                        <select name="status"
+                                class="form-select">
+
+                            <option value="Active">
+                                Active
+                            </option>
+
+                            <option value="Inactive">
+                                Inactive
+                            </option>
+
+                        </select>
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <!-- Item Code -->
+                    <div class="col-md-3 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Item Code
+                        </label>
+
+                        <input type="text"
+                               name="item_code"
+                               class="form-control"
+                               placeholder="SM01"
+                               required>
+
+                    </div>
+
+                    <!-- Item Name -->
+                    <div class="col-md-5 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Item Name
+                        </label>
+
+                        <input type="text"
+                               name="item_name"
+                               class="form-control"
+                               placeholder="Soft Murum 0-1.5"
+                               required>
+
+                    </div>
+
+                    <!-- Unit -->
+                    <div class="col-md-2 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Unit
+                        </label>
+
+                        <select name="unit"
+                                class="form-select">
+
+                            <option value="Cum">Cum</option>
+                            <option value="Nos">Nos</option>
+                            <option value="Rmt">Rmt</option>
+                            <option value="Sqm">Sqm</option>
+
+                        </select>
+
+                    </div>
+
+                    <!-- Rate -->
+                    <div class="col-md-2 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Rate (₹)
+                        </label>
+
+                        <input type="number"
+                               step="0.01"
+                               min="0"
+                               name="rate"
+                               class="form-control"
+                               placeholder="0.00"
+                               required>
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <!-- Effective From -->
+                    <div class="col-md-3 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Effective From
+                        </label>
+
+                        <input type="date"
+                               name="effective_from"
+                               class="form-control"
+                               required>
+
+                    </div>
+
+                    <!-- Effective To -->
+                    <div class="col-md-3 mb-3">
+
+                        <label class="form-label fw-bold">
+                            Effective To
+                        </label>
+
+                        <input type="date"
+                               name="effective_to"
+                               class="form-control">
+
+                    </div>
+
+                </div>
+
+                <hr>
+
+                <div class="text-end">
+
+                    <button type="reset"
+                            class="btn btn-secondary">
+
+                        <i class="bi bi-arrow-clockwise"></i>
+
+                        Reset
+
+                    </button>
+
+                    <button type="submit"
+                            class="btn btn-success">
+
+                        <i class="bi bi-check-circle"></i>
+
+                        Save Rate
+
+                    </button>
+
+                </div>
+
+            </form>
+
+        </div>
+
+    </div>
+
+</div>
+
+
+{% endblock %}

app/templates/engineering/index.html

@@ -0,0 +1,83 @@
+{% extends "base.html" %}
+{% block content %}
+
+<div class="container-fluid mt-4">
+
+    <div class="row mb-4">
+        <div class="col-12">
+            <h3 class="fw-bold">
+                <i class="bi bi-gear-fill text-primary"></i>
+                Engineering Masters
+            </h3>
+            <hr>
+        </div>
+    </div>
+
+    <div class="row g-4">
+
+        <!-- Subcontractor Rate Master -->
+        <div class="col-lg-4 col-md-6">
+            <div class="card shadow h-100">
+
+                <div class="card-body text-center">
+
+                    <i class="bi bi-cash-stack text-success"
+                       style="font-size:55px;"></i>
+
+                    <h5 class="mt-3">
+                        Subcontractor Rate Master
+                    </h5>
+
+                    <p class="text-muted">
+                        Manage subcontractor-wise rates.
+                    </p>
+
+                    <a href="{{ url_for('engineering.add_subcontractor_rates') }}"
+                       class="btn btn-success">
+
+                        <i class="bi bi-arrow-right-circle"></i>
+                        Open Module
+
+                    </a>
+
+                </div>
+
+            </div>
+        </div>
+
+        <!-- Client Rate Master -->
+        <div class="col-lg-4 col-md-6">
+            <div class="card shadow h-100">
+
+                <div class="card-body text-center">
+
+                    <i class="bi bi-building text-primary"
+                       style="font-size:55px;"></i>
+
+                    <h5 class="mt-3">
+                        Client Standard Rate Master
+                    </h5>
+
+                    <p class="text-muted">
+                        Manage client standard rates.
+                    </p>
+
+                    <a href="{{ url_for('engineering.client_rates') }}"
+                       class="btn btn-primary">
+
+                        <i class="bi bi-arrow-right-circle"></i>
+                        Open Module
+
+                    </a>
+
+                </div>
+
+            </div>
+        </div>
+
+        
+    </div>
+
+</div>
+
+{% endblock %}

app/templates/login.html

@@ -84,10 +84,11 @@
                                     </span>
 
                                     <input
-                                        type="email"
+                                        type="text"
                                         name="email"
                                         class="form-control"
-                                        placeholder="Enter Email"
+                                        placeholder="Enter Domain Username"
+                                        autocomplete="username"
                                         required>
 
                                 </div>

app/templates/subcontractor/add.html

@@ -1,50 +1,170 @@
 {% extends "base.html" %}
 {% block content %}
 
-<div class="card shadow-sm p-4">
+<div class="container-fluid">
-    <h4 class="mb-3">Add New Subcontractor</h4>
 
-    <form action="{{ url_for('subcontractor.save_subcontractor') }}" method="POST">
+    <!-- Page Header -->
-
+    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div class="mb-3">
+        <div>
-            <label class="form-label">Subcontractor Name:</label>
+            <h3 class="fw-bold mb-1">
-            <input type="text" class="form-control" name="subcontractor_name" required>
+                <i class="bi bi-person-plus-fill text-success me-2"></i>
+                Add New Subcontractor
+            </h3>
+            <p class="text-muted mb-0">
+                Enter the subcontractor details below.
+            </p>
         </div>
 
-        <div class="mb-3">
+        <a href="{{ url_for('subcontractor.subcontractor_list') }}"
-            <label class="form-label">Contact Person Name:</label>
+           class="btn btn-outline-secondary">
-            <input type="text" class="form-control" name="contact_person">
+            <i class="bi bi-arrow-left me-2"></i>
+            Back to List
+        </a>
+    </div>
+
+    <div class="card shadow border-0">
+
+        <div class="card-header bg-success text-white">
+            <h5 class="mb-0">
+                <i class="bi bi-building-fill-add me-2"></i>
+                Subcontractor Information
+            </h5>
         </div>
 
-        <div class="mb-3">
+        <div class="card-body">
-            <label class="form-label">Address:</label>
+
-            <textarea type="text" class="form-control" name="address"></textarea>
+            <form action="{{ url_for('subcontractor.save_subcontractor') }}"
+                  method="POST"
+                  class="loading-form">
+
+                <div class="row g-4">
+
+                    <!-- Subcontractor Name -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-building me-1"></i>
+                            Subcontractor Name
+                            <span class="text-danger">*</span>
+                        </label>
+
+                        <input type="text"
+                               class="form-control"
+                               name="subcontractor_name"
+                               placeholder="Enter Subcontractor Name"
+                               required>
+                    </div>
+
+                    <!-- Contact Person -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-person-fill me-1"></i>
+                            Contact Person
+                        </label>
+
+                        <input type="text"
+                               class="form-control"
+                               name="contact_person"
+                               placeholder="Enter Contact Person">
+                    </div>
+
+                    <!-- Mobile -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-telephone-fill me-1"></i>
+                            Mobile Number
+                        </label>
+
+                        <input type="text"
+                               class="form-control"
+                               name="mobile_no"
+                               maxlength="10"
+                               placeholder="Enter Mobile Number">
+                    </div>
+
+                    <!-- Email -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-envelope-fill me-1"></i>
+                            Email Address
+                        </label>
+
+                        <input type="email"
+                               class="form-control"
+                               name="email_id"
+                               placeholder="Enter Email Address">
+                    </div>
+
+                    <!-- GST -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-receipt-cutoff me-1"></i>
+                            GST Number
+                        </label>
+
+                        <input type="text"
+                            class="form-control"
+                            name="gst_no"
+                            placeholder="Enter GST Number">
+                    </div>
+
+                    <!-- PAN -->
+                    <div class="col-md-6">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-credit-card-2-front-fill me-1"></i>
+                            PAN Number
+                        </label>
+
+                        <input type="text"
+                            class="form-control"
+                            name="pan_no"
+                            placeholder="Enter PAN Number">
+                    </div>
+
+                    <!-- Address -->
+                    <div class="col-12">
+                        <label class="form-label fw-semibold">
+                            <i class="bi bi-geo-alt-fill me-1"></i>
+                            Address
+                        </label>
+
+                        <textarea class="form-control"
+                                  rows="4"
+                                  name="address"
+                                  placeholder="Enter Complete Address"></textarea>
+                    </div>
+
+                </div>
+
+                <hr class="my-4">
+
+                <div class="d-flex justify-content-end gap-2">
+
+                    <button type="reset"
+                            class="btn btn-outline-warning">
+                        <i class="bi bi-arrow-clockwise me-2"></i>
+                        Reset
+                    </button>
+
+                    <a href="{{ url_for('subcontractor.subcontractor_list') }}"
+                       class="btn btn-outline-secondary">
+                        <i class="bi bi-x-circle me-2"></i>
+                        Cancel
+                    </a>
+
+                    <button type="submit"
+                            class="btn btn-success">
+                        <i class="bi bi-check-circle-fill me-2"></i>
+                        Save Subcontractor
+                    </button>
+
+                </div>
+
+            </form>
+
         </div>
 
-        <div class="mb-3">
+    </div>
-            <label class="form-label">Mobile No:</label>
-            <input type="text" class="form-control" name="mobile_no">
-        </div>
 
-        <div class="mb-3">
-            <label class="form-label">Email:</label>
-            <input type="email" class="form-control" name="email_id">
-        </div>
-
-        <div class="mb-3">
-            <label class="form-label">GST No:</label>
-            <input type="text" class="form-control" name="gst_no">
-        </div>
-
-        <div class="mb-3">
-            <label class="form-label">PAN No:</label>
-            <input type="text" class="form-control" name="pan_no">
-        </div>
-
-        <button class="btn btn-success">Save</button>
-        <a href="{{ url_for('subcontractor.subcontractor_list') }}" class="btn btn-secondary">Back</a>
-
-    </form>
 </div>
 
 {% endblock %}

app/templates/subcontractor_report.html

@@ -88,7 +88,7 @@
 
                             <option value="dc"
                             {% if request.form.get('category')=='dc' %}selected{% endif %}>
-                                Domestic Chamber
+                                Manhole Domestic Chamber 
                             </option>
 
                             <option value="laying"

app/templates/test.html

@@ -1,119 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
-
-<div class="container mt-3">
-
-    <h4>RA Bill Dashboard</h4>
-
-    <div class="row mb-3">
-
-        <!-- Contractor -->
-        <div class="col-md-4">
-            <select id="subcontractor" class="form-control">
-                <option value="">Select Contractor</option>
-                {% for s in subcontractors %}
-                <option value="{{s.id}}">{{s.subcontractor_name}}</option>
-                {% endfor %}
-            </select>
-        </div>
-
-        <!-- Category -->
-        <div class="col-md-4">
-            <select id="category" class="form-control">
-                <option value="">Select Category</option>
-                <option value="trench_excavation">Trench Excavation</option>
-                <option value="manhole_excavation">Manhole Excavation</option>
-            </select>
-        </div>
-
-        <!-- RA Bill -->
-        <div class="col-md-4">
-            <select id="ra_bill" class="form-control">
-                <option value="">RA Bill</option>
-            </select>
-        </div>
-
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            <canvas id="comparisonChart"></canvas>
-        </div>
-    </div>
-
-</div>
-
-<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-<script>
-
-    let chart;
-
-    // ✅ Load RA Bills
-    function loadRABills() {
-
-        let subcontractor = document.getElementById("subcontractor").value
-        let category = document.getElementById("category").value
-
-        if (!subcontractor || !category) return
-
-        fetch(`/dashboard/api/get-ra-bills?subcontractor=${subcontractor}&category=${category}`)
-            .then(res => res.json())
-            .then(data => {
-
-                let ra = document.getElementById("ra_bill")
-                ra.innerHTML = '<option value="">RA Bill</option>'
-
-                data.ra_bills.forEach(bill => {
-                    ra.innerHTML += `<option value="${bill}">${bill}</option>`
-                })
-            })
-    }
-
-    // ✅ Load Chart
-    function loadChart() {
-
-        let subcontractor = document.getElementById("subcontractor").value
-        let ra_bill = document.getElementById("ra_bill").value
-
-        fetch(`/dashboard/api/trench-analysis?subcontractor=${subcontractor}&ra_bill=${ra_bill}`)
-            .then(res => res.json())
-            .then(data => {
-
-                if (chart) chart.destroy()
-
-                chart = new Chart(document.getElementById("comparisonChart"), {
-                    type: "bar",
-                    data: {
-                        labels: data.labels,
-                        datasets: [
-                            {
-                                label: "Depth",
-                                data: data.depth,
-                                backgroundColor: "green"
-                            },
-                            {
-                                label: "Excavation Qty (cum)",
-                                data: data.qty,
-                                backgroundColor: "blue"
-                            }
-                        ]
-                    }
-                })
-            })
-    }
-
-    // Events
-    document.getElementById("subcontractor").addEventListener("change", () => {
-        loadRABills()
-    })
-
-    document.getElementById("category").addEventListener("change", () => {
-        loadRABills()
-    })
-
-    document.getElementById("ra_bill").addEventListener("change", loadChart)
-
-</script>
-
-{% endblock %}