Change subcontractor report format

update readme file

.env

@@ -1,37 +0,0 @@
-# -----------------------------
-# Flask App Configuration
-# -----------------------------
-FLASK_ENV=development
-FLASK_DEBUG=True
-FLASK_HOST=0.0.0.0
-FLASK_PORT=5015
-
-# -----------------------------
-# 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=root
-
-# DATABASE_URL=mysql+pymysql://root:root@localhost/comparisondb
-
-
-# -----------------------------
-# LDAP Configuration new
-# -----------------------------
-LDAP_SERVER=ldap://host.docker.internal
-LDAP_PORT=389
-LDAP_USE_SSL=False
-
-LDAP_DOMAIN=lcepl.org
-LDAP_BASE_DN=DC=lcepl,DC=org
-LDAP_SEARCH_BASE=OU=Users,DC=lcepl,DC=org

.gitignore

@@ -1,19 +1,22 @@
 # Python
 app/__pycache__/
+__pycache__/
 *.pyc
 *.pyo
 *.pyd
-*.__pycache__
 
-# Ingnor upload files
+# Ignore upload files
 app/static/uploads/
 
-# Ignore env files
+# Virtual environment
-venv
+venv/
+.venv/
 
-# Ignore Log files ss
+# Environment / secrets
+.env
+.env.*
+!.env.example
+
+# Log files
 logs/
 *.log
-
-
-

README.md

@@ -36,7 +36,8 @@ The Comparison Project is designed to:
 
 ## Tech Stack
 
-**Backend Framework**: Flask  
+**Frontend Framework**: HTML, CSS, Js, Bootstrap  
+**Backend Framework**: Python Flask  
 **Database**: SQL Database (MySQL/PostgreSQL/SQLite configured via environment variables)  
 **ORM**: SQLAlchemy  
 **File Processing**: Pandas, OpenPyXL, XlsxWriter  
@@ -580,4 +581,4 @@ Open browser: `http://127.0.0.1:5000/`
 
 For issues, feature requests, or contributions, please contact the development team.
 
-**Last Updated:** January 2026
+**Last Updated:** April 2026

app/routes/file_report.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import io
+from datetime import datetime
 from flask import Blueprint, render_template, request, send_file, flash, jsonify,redirect, url_for
 from app.utils.helpers import login_required
 from app.utils.regex_utils import RegularExpression
@@ -29,17 +30,24 @@ def add_action_columns(df, model_key):
     if df.empty:
         return df
 
-    df.insert(0, "Select", df["Id"].apply(
+    # Edit + Delete side by side in one "Action" column, both as icon buttons.
+    df.insert(0, "Action", df["Id"].apply(
+        lambda x: (
+            f'<div class="d-flex gap-1">'
+            f'<a href="/file/edit/{model_key}/{x}" class="btn btn-sm btn-warning edit-btn" title="Edit">'
+            f'<i class="bi bi-pencil-square"></i></a>'
+            f'<button class="btn btn-sm btn-danger delete-btn" data-id="{x}" data-model="{model_key}" title="Delete">'
+            f'<i class="bi bi-trash"></i></button>'
+            f'</div>'
+        )
+    ))
+
+    df.insert(1, "Select", df["Id"].apply(
         lambda x: f'<input type="checkbox" class="row-check" data-id="{x}">'
     ))
 
-    df["Update"] = df["Id"].apply(
+    df["Id"] = range(1, len(df) + 1)
-        lambda x: f'<a href="/file/edit/{model_key}/{x}" class="btn btn-sm btn-warning edit-btn"><i class="bi bi-pencil-square"></i> Edit</a>'
+    df = df.rename(columns={"Id": "Sr No"})
-    )
-    
-    df["Delete"] = df["Id"].apply(
-        lambda x: f'<button class="btn btn-sm btn-danger delete-btn" data-id="{x}" data-model="{model_key}">Delete</button>'
-    )
 
     return df
 
@@ -47,6 +55,115 @@ def add_action_columns(df, model_key):
 
 
 
+# ---------------- EXCEL SHEET FORMATTING (Tr.Ex / Mh.Ex / MH & DC / Pipe Laying) ----------------
+
+SHEET_TITLES = {
+    "Tr.Ex": "TRENCH EXCAVATION",
+    "Mh.Ex": "MANHOLE EXCAVATION",
+    "MH & DC": "MANHOLE DOMESTIC CHAMBER",
+    "Pipe Laying": "PIPE LAYING",
+}
+
+
+def format_detail_sheet(workbook, worksheet, df, sheet_name, contractor_name="", ra_bill_no="", report_date=""):
+    """
+    Writes an info line (Category / Contractor / RA Bill No / Date) at the
+    top, followed by a bold/bordered table with sensible column widths
+    and a frozen header row.
+
+    Assumes df.to_excel(..., startrow=1) already wrote the header at row 1
+    and the data starting at row 2 - this function overwrites those rows
+    with formatting and fills in row 0 with the info line.
+    """
+    if df.empty:
+        return
+
+    header_format = workbook.add_format({
+        "bold": True,
+        "bg_color": "#D9EAD3",
+        "border": 1,
+        "align": "center",
+        "valign": "vcenter",
+        "text_wrap": True
+    })
+
+    text_format = workbook.add_format({
+        "border": 1,
+        "valign": "vcenter"
+    })
+
+    number_format = workbook.add_format({
+        "border": 1,
+        "valign": "vcenter",
+        "num_format": "#,##0.00"
+    })
+
+    n_rows, n_cols = df.shape
+    header_row = 1  # matches startrow=1 used in df.to_excel()
+
+    # -----------------------------------------------------
+    # INFO LINE (row 0) - separate cells, not one merged block,
+    # so each field (RA Bill No, Date, etc.) can be clicked/copied
+    # on its own. Always starts at column 0, so position is
+    # consistent regardless of how many table columns exist.
+    # -----------------------------------------------------
+    last_col = max(n_cols - 1, 0)
+    report_title = SHEET_TITLES.get(sheet_name, sheet_name.upper())
+
+    label_format = workbook.add_format({"bold": True})
+    value_format = workbook.add_format({})
+
+    info_fields = [
+        ("Category:", report_title),
+        ("Contractor:", contractor_name or "-"),
+        ("RA Bill No:", ra_bill_no or "All"),
+        ("Date:", report_date),
+    ]
+
+    col = 0
+    for label, value in info_fields:
+        worksheet.write(0, col, label, label_format)
+        worksheet.write(0, col + 1, value, value_format)
+        col += 3  # leave one blank column as a visual gap before next field
+
+    # Fill any remaining columns on row 0 with a blank bordered cell so
+    # the row reads cleanly if the sheet is wider than the info fields.
+    if last_col > col:
+        worksheet.write_blank(0, col, None)
+
+    # -----------------------------------------------------
+    # TABLE HEADER (row 1) - re-write with formatting
+    # -----------------------------------------------------
+    for col_idx, col_name in enumerate(df.columns):
+        worksheet.write(header_row, col_idx, col_name, header_format)
+
+    # -----------------------------------------------------
+    # TABLE BODY (rows 2+) - borders / number formatting
+    # -----------------------------------------------------
+    for row_idx in range(n_rows):
+        for col_idx, col_name in enumerate(df.columns):
+            value = df.iat[row_idx, col_idx]
+
+            if pd.isna(value):
+                worksheet.write(header_row + 1 + row_idx, col_idx, "", text_format)
+            elif isinstance(value, (int, float)):
+                worksheet.write_number(header_row + 1 + row_idx, col_idx, float(value), number_format)
+            else:
+                worksheet.write(header_row + 1 + row_idx, col_idx, str(value), text_format)
+
+    # Auto width columns based on header + content length
+    for col_idx, col_name in enumerate(df.columns):
+        max_len = len(str(col_name))
+        if n_rows:
+            col_values = df.iloc[:, col_idx].astype(str)
+            content_max = col_values.map(len).max()
+            max_len = max(max_len, content_max)
+        worksheet.set_column(col_idx, col_idx, min(max_len + 4, 30))
+
+    worksheet.freeze_panes(header_row + 1, 1)
+    worksheet.set_row(header_row, 30)
+
+
 # ---------------- FETCH ----------------
 class SubcontractorBill:
     def __init__(self):
@@ -236,6 +353,30 @@ def report_file():
         else:
             bill.Fetch(ra_bill_no,subcontractor_id,location)
 
+        
+        # ---------------------------------------------------------
+        if (
+            bill.df_tr.empty and
+            bill.df_mh.empty and
+            bill.df_dc.empty and
+            bill.df_laying.empty
+        ):
+            flash(
+                f"No records found for RA Bill No '{ra_bill_no}'. "
+                "Please check the RA Bill No and try again."
+                if ra_bill_no else
+                "No records found for the selected filters.",
+                "warning"
+            )
+            return render_template(
+                "subcontractor_report.html",
+                subcontractors=subcontractors,
+                selected_sc_id=selected_sc_id,
+                selected_ra_bill=ra_bill_no,
+                selected_location=location,
+                selected_category=category
+            )
+            
         # -----------------------------------------
         # Generate Abstract Report for Web
         # -----------------------------------------
@@ -256,10 +397,46 @@ def report_file():
             bill.df_tr = bill.df_mh = bill.df_dc = pd.DataFrame()
 
        
+        if (
+            category in ("tr", "mh", "dc", "laying")
+            and bill.df_tr.empty and bill.df_mh.empty
+            and bill.df_dc.empty and bill.df_laying.empty
+        ):
+            category_labels = {
+                "tr": "Trench Excavation",
+                "mh": "Manhole Excavation",
+                "dc": "Domestic Chamber",
+                "laying": "Pipe Laying",
+            }
+            flash(
+                f"No {category_labels[category]} records found for the "
+                "selected filters.",
+                "warning"
+            )
+            return render_template(
+                "subcontractor_report.html",
+                subcontractors=subcontractors,
+                selected_sc_id=selected_sc_id,
+                selected_ra_bill=ra_bill_no,
+                selected_location=location,
+                selected_category=category
+            )
+            
+
         # ===================================================
         # DOWNLOAD EXCEL
         # ===================================================
         if action in ["excel", "excel_all"]:
+
+            # Look up the contractor's real name once, up front, so it can
+            # be shown in the title block of every sheet.
+            sc_obj = next(
+                (s for s in subcontractors if str(s.id) == str(subcontractor_id)),
+                None
+            )
+            contractor_display_name = sc_obj.subcontractor_name if sc_obj else ""
+            report_date = datetime.now().strftime("%d-%b-%Y")
+
             output = io.BytesIO()
 
             with pd.ExcelWriter(output,engine="xlsxwriter") as writer:
@@ -267,16 +444,52 @@ def report_file():
                 abstract = AbstractReportService(subcontractor_id=subcontractor_id,ra_bill_no=ra_bill_no)
                 abstract.generate(workbook)
 
-                bill.df_tr.to_excel(writer,sheet_name="Tr.Ex",index=False)
+                sheet_map = [
-                bill.df_mh.to_excel(writer,sheet_name="Mh.Ex",index=False)
+                    (bill.df_tr, "Tr.Ex"),
-                bill.df_dc.to_excel(writer,sheet_name="MH & DC",index=False)
+                    (bill.df_mh, "Mh.Ex"),
-                bill.df_laying.to_excel(writer,sheet_name="Pipe Laying",index=False)
+                    (bill.df_dc, "MH & DC"),
+                    (bill.df_laying, "Pipe Laying"),
+                ]
+                for df, sheet_name in sheet_map:
+                    if not df.empty:
+                        # Use a copy for the export only - bill.df_tr etc. still
+                        # need the real "Id" column later for the Edit/Delete
+                        # buttons on the web preview table.
+                        export_df = df.drop(columns=["Id"], errors="ignore").copy()
+                        export_df.insert(0, "Sr No", range(1, len(export_df) + 1))
+
+                        export_df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=1)
+                        worksheet = writer.sheets[sheet_name]
+                        format_detail_sheet(
+                            workbook, worksheet, export_df, sheet_name,
+                            contractor_name=contractor_display_name,
+                            ra_bill_no=ra_bill_no,
+                            report_date=report_date
+                        )
                 writer.close()
             output.seek(0)
 
+            sc_name = re.sub(r'[^A-Za-z0-9_-]+', '_', contractor_display_name or "Subcontractor").strip('_')
+
+            name_parts = [sc_name]
+
+            if ra_bill_no:
+                name_parts.append(f"RA{re.sub(r'[^A-Za-z0-9_-]+', '_', ra_bill_no)}")
+
+            if location:
+                name_parts.append(re.sub(r'[^A-Za-z0-9_-]+', '_', location).strip('_'))
+
+            if category and category != "all":
+                name_parts.append(category.upper())
+
+            if action == "excel_all":
+                name_parts.append("All")
+
+            filename = "_".join(name_parts) + "_Report.xlsx"
+
             return send_file(
                 output,
-                download_name= "subcontractor_Report.xlsx",
+                download_name=filename,
                 as_attachment=True 
             )
 

app/templates/base.html

@@ -124,109 +124,66 @@
                                     <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">
+                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
+                                </a>
+                            </li> -->
                         </ul>
                     </li>
 
-                    <!-- Masters -->
+
-                    <li class="nav-item dropdown">
+                    <!-- Formats -->
-                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="/engi">
+                    <li class="nav-item">
-                            <i class="bi bi-gear me-2"></i> Masters
+                        <a class="nav-link" href="/file_format">
+                            <i class="bi bi-file-earmark-text me-1"></i> Formats
                         </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>
-
-                            <!-- 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>
 
-
                     <!-- USER DROPDOWN -->
-                    <li class="nav-item dropdown">
+                    {% if session.get("user_id") %}
+                    <li class="nav-item dropdown ms-lg-3">
 
-                        <a class="nav-link dropdown-toggle d-flex align-items-center text-white"
+                        <a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#"
-                            href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            data-bs-toggle="dropdown">
-
+                            <i class="bi bi-person-circle fs-5"></i>
-                            <i class="bi bi-person-circle fs-4"></i>
+                            <span class="d-none d-lg-inline">
-                            <span class="ms-2 fw-semibold">
                                 {{ session.get("user_name") }}
                             </span>
                         </a>
 
-                        <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark border-0 shadow-lg bg-dark p-0"
+                        <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark shadow">
-                            style="width:320px;">
 
-                            <!-- Profile Header -->
+                            <!-- User card -->
-                            <li class="text-center py-4 border-bottom border-secondary">
+                            <li class="px-3 py-3 text-center border-bottom">
-                                <i class="bi bi-person-circle text-light" style="font-size:60px;"></i>
+                                <i class="bi bi-person-circle fs-1"></i>
-                                <h5 class="mt-2 mb-0 fw-bold">
+                                <div class="fw-semibold mt-1">
                                     {{ session.get("user_name") }}
-                                </h5>
+                                </div>
-                                <small class="text-secondary">
+                                <small class="text-muted">Logged in user</small>
-                                    {{ session.get("email") }}
-                                </small>
                             </li>
 
-                            <!-- Dashboard -->
                             <li>
-                                <a class="dropdown-item text-light py-2" href="{{ url_for('dashboard.dashboard') }}">
+                                <a class="dropdown-item" href="/dashboard">
                                     <i class="bi bi-speedometer2 me-2"></i> Dashboard
                                 </a>
                             </li>
-
-                            <!-- Activity Log page -->
                             <li>
-                                <a class="dropdown-item text-light py-2" href="{{ url_for('activity.activity') }}">
+                                <a class="dropdown-item" href="{{ url_for('activity.activity') }}">
-                                    <i class="bi bi-clock-history me-2"></i> Activity Log
+                                    <i class="bi bi-clock-history me-2"></i>
+                                    Activity Log
                                 </a>
                             </li>
 
-                            <!--  Manage Account -->
                             <li>
-                                <a class="dropdown-item py-2" href="#">
+                                <a class="dropdown-item text-warning" href="/logout">
-                                    <i class="bi bi-gear me-2"></i> Manage Account
+                                    <i class="bi bi-box-arrow-right me-2"></i> Logout
                                 </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>
@@ -379,6 +336,7 @@
 
                     showLoader();
                     const btn = this.querySelector("button[type='submit']");
+                    const originalBtnHtml = btn ? btn.innerHTML : null;
 
                     if(btn){
                         btn.disabled = true;
@@ -388,10 +346,24 @@
                         `;
                     }
 
+                   
+                    setTimeout(function () {
+                        hideLoader();
+                        if (btn) {
+                            btn.disabled = false;
+                            btn.innerHTML = originalBtnHtml;
+                        }
+                    }, 3000);
+
                 });
             });
         });
 
+
+        window.addEventListener("pageshow", function () {
+            hideLoader();
+        });
+
     </script>
 
 

app/templates/client_report.html

@@ -31,6 +31,24 @@
                     type="button">Tr.Ex </button>
             </li>
             <li class="nav-item">
+<<<<<<< HEAD
+                <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">
+<<<<<<< HEAD
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
+                    type="button">Laying
+                    & Bedding Comparison</button>
+=======
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                    & Bedding </button>
+>>>>>>> 1dceb640bd930c37888799f10f02fe90b219be67
+=======
                 <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">
                     Mh.Ex</button>
             </li>
@@ -41,6 +59,7 @@
             <li class="nav-item">
                 <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"type="button">
                     Laying & Bedding </button>
+>>>>>>> pankaj-dev
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">

app/templates/subcontractor_report.html

@@ -88,7 +88,7 @@
 
                             <option value="dc"
                             {% if request.form.get('category')=='dc' %}selected{% endif %}>
-                                Manhole Domestic Chamber 
+                                Domestic Chamber
                             </option>
 
                             <option value="laying"
@@ -155,51 +155,61 @@
     </div>
 
     {% if tables %}
+    {% set show_all = (not selected_category) or selected_category == 'all' %}
     <!-- Tabs -->
     <div class="card shadow-sm border-0 mt-4">
         <div class="card-header bg-light">
             <ul class="nav nav-pills">
                 <li class="nav-item">
-                    <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#abstract">
+                    <button class="nav-link {% if show_all %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#abstract">
                         <i class="bi bi-file-earmark-text"></i> Abstract 
                     </button>
                 </li>
 
+                {% if show_all or selected_category == 'tr' %}
                 <li class="nav-item">
-                    <button class="nav-link "  data-bs-toggle="tab" data-bs-target="#tr">
+                    <button class="nav-link {% if selected_category == 'tr' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#tr">
                         <i class="bi bi-cone-striped"></i> Trench Excavation
                     </button>
                 </li>
+                {% endif %}
 
+                {% if show_all or selected_category == 'mh' %}
                 <li class="nav-item">
-                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#mh">
+                    <button class="nav-link {% if selected_category == 'mh' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#mh">
                         <i class="bi bi-nut"></i> Manhole Excavation
                     </button>
                 </li>
+                {% endif %}
 
+                {% if show_all or selected_category == 'dc' %}
                 <li class="nav-item">
-                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#dc">
+                    <button class="nav-link {% if selected_category == 'dc' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#dc">
                         <i class="bi bi-grid-3x3"></i> Manhole & Domestic Chambers Construction
                     </button>
                 </li>
+                {% endif %}
 
+                {% if show_all or selected_category == 'laying' %}
                 <li class="nav-item">
-                    <button class="nav-link" data-bs-toggle="tab" data-bs-target="#laying">
+                    <button class="nav-link {% if selected_category == 'laying' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#laying">
                         <i class="bi bi-bezier2"></i> Pipe Laying
                     </button>
                 </li>
+                {% endif %}
             </ul>
         </div>
 
         <div class="card-body">
             <div class="tab-content">
 
-                <div class="tab-pane fade show active" id="abstract">
+                <div class="tab-pane fade {% if show_all %}show active{% endif %}" id="abstract">
                     {{ abstract_html|safe }}
                 </div>
 
+                {% if show_all or selected_category == 'tr' %}
                 <!-- Trench -->
-                <div class="tab-pane fade "id="tr">
+                <div class="tab-pane fade {% if selected_category == 'tr' %}show active{% endif %}" id="tr">
                     <div class="mb-3">
                         <button onclick="deleteSelected('tr')" class="btn btn-danger">
                             <i class="bi bi-trash"></i> Delete Selected
@@ -209,9 +219,11 @@
                         {{ tables.tr|safe }}
                     </div>
                 </div>
+                {% endif %}
 
+                {% if show_all or selected_category == 'mh' %}
                 <!-- MH -->
-                <div class="tab-pane fade" id="mh">
+                <div class="tab-pane fade {% if selected_category == 'mh' %}show active{% endif %}" id="mh">
                     <div class="mb-3">
                         <button onclick="deleteSelected('mh')" class="btn btn-danger">
                             <i class="bi bi-trash"></i>Delete Selected
@@ -221,9 +233,11 @@
                         {{ tables.mh|safe }}
                     </div>
                 </div>
+                {% endif %}
 
+                {% if show_all or selected_category == 'dc' %}
                 <!-- DC -->
-                <div class="tab-pane fade" id="dc">
+                <div class="tab-pane fade {% if selected_category == 'dc' %}show active{% endif %}" id="dc">
                     <div class="mb-3">
                         <button onclick="deleteSelected('dc')"class="btn btn-danger">
                             <i class="bi bi-trash"></i>
@@ -234,9 +248,11 @@
                         {{ tables.dc|safe }}
                     </div>
                 </div>  
+                {% endif %}
 
+                {% if show_all or selected_category == 'laying' %}
                 <!-- Laying -->
-                <div class="tab-pane fade" id="laying">
+                <div class="tab-pane fade {% if selected_category == 'laying' %}show active{% endif %}" id="laying">
                     <div class="mb-3">
                         <button onclick="deleteSelected('laying')"
                                 class="btn btn-danger">
@@ -248,6 +264,7 @@
                         {{ tables.laying|safe }}
                     </div>
                 </div>
+                {% endif %}
             </div>
         </div>
     </div>
@@ -256,31 +273,45 @@
 </div>
 
 <script>
-    // Reset 
+    
-    document.getElementById("resetBtn").addEventListener("click", function () {location.reload();});
+    document.getElementById("resetBtn").addEventListener("click", function () {
+        window.location.href = window.location.pathname;
+    });
 
     // DATATABLE
     $(document).ready(function () {
-        $('.datatable').DataTable({
+       
-            pageLength: 10,
+        $('.datatable').each(function () {
-            dom: 'Bfrtip',
+            $(this).DataTable({
-            buttons: ['copy', 'csv', 'excel', 'print']
+                pageLength: 10,
+                dom: 'Bfrtip',
+                buttons: ['copy', 'csv', 'excel', 'print'],
+                initComplete: function () {
+                   
+                    $(this).closest('.dataTables_wrapper')
+                        .find('thead tr th:first-child')
+                        .html('<input type="checkbox" class="select-all" title="Select All">');
+                }
+            });
         });
-
-        setTimeout(() => {
-            $("table thead tr th:first-child").html('<input type="checkbox" id="select-all">');
-        }, 500);
     });
 
-    // SELECT ALL
+    // SELECT ALL — scoped to the checkbox's own table only
-    $(document).on("change", "#select-all", function () {
+    $(document).on("change", ".select-all", function () {
-        $(".row-check").prop("checked", this.checked);
+        $(this).closest("table").find(".row-check").prop("checked", this.checked);
     });
 
-    // GET IDS
+    // If a row checkbox is unchecked manually, uncheck that table's select-all
-    function getSelectedIds() {
+    $(document).on("change", ".row-check", function () {
+        if (!this.checked) {
+            $(this).closest("table").find(".select-all").prop("checked", false);
+        }
+    });
+
+
+    function getSelectedIds(model) {
         let ids = [];
-        $(".row-check:checked").each(function () {
+        $("#" + model + " .row-check:checked").each(function () {
             ids.push($(this).data("id"));
         });
         return ids;
@@ -288,7 +319,7 @@
 
     // BULK DELETE
     function deleteSelected(model) {
-        let ids = getSelectedIds();
+        let ids = getSelectedIds(model);
         if (ids.length === 0) return alert("Select records");
 
         if (!confirm(`Delete ${ids.length} record(s)?`)) return;