replace

Merge branch 'pankaj-dev'
Update README.md
2026-08-06 13:39:13 +05:30 · 2026-08-06 12:46:16 +05:30 · 2026-04-07 11:42:23 +00:00 · 2026-03-18 04:51:41 +00:00 · 2026-03-17 12:54:08 +00:00 · 2026-03-11 08:04:07 +00:00
6 changed files with 142 additions and 209 deletions
--- a/README.md
+++ b/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
--- a/app/routes/file_report.py
+++ b/app/routes/file_report.py
@@ -29,24 +29,17 @@ def add_action_columns(df, model_key):
    if df.empty:
        return df

-    # 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(
+    df.insert(0, "Select", df["Id"].apply(
        lambda x: f'<input type="checkbox" class="row-check" data-id="{x}">'
    ))
-
-    df["Id"] = range(1, len(df) + 1)
-    df = df.rename(columns={"Id": "Sr No"})
+    
+    df["Update"] = df["Id"].apply(
+        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["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

@@ -242,30 +235,6 @@ def report_file():
            bill.Fetch(subcontractor_id=subcontractor_id)
        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
@@ -285,32 +254,6 @@ def report_file():
            bill.df_tr = bill.df_mh = bill.df_laying = pd.DataFrame()
        elif category == "laying":
            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
-            )
            

        # ===================================================
@@ -324,46 +267,16 @@ def report_file():
                abstract = AbstractReportService(subcontractor_id=subcontractor_id,ra_bill_no=ra_bill_no)
                abstract.generate(workbook)
                
-             
-                sheet_map = [
-                    (bill.df_tr, "Tr.Ex"),
-                    (bill.df_mh, "Mh.Ex"),
-                    (bill.df_dc, "MH & DC"),
-                    (bill.df_laying, "Pipe Laying"),
-                ]
-                for df, sheet_name in sheet_map:
-                    if not df.empty:
-                        df.to_excel(writer, sheet_name=sheet_name, index=False)
+                bill.df_tr.to_excel(writer,sheet_name="Tr.Ex",index=False)
+                bill.df_mh.to_excel(writer,sheet_name="Mh.Ex",index=False)
+                bill.df_dc.to_excel(writer,sheet_name="MH & DC",index=False)
+                bill.df_laying.to_excel(writer,sheet_name="Pipe Laying",index=False)
                writer.close()
            output.seek(0)
-
-           
-            sc_obj = next(
-                (s for s in subcontractors if str(s.id) == str(subcontractor_id)),
-                None
-            )
-            sc_name = sc_obj.subcontractor_name if sc_obj else "Subcontractor"
-            sc_name = re.sub(r'[^A-Za-z0-9_-]+', '_', sc_name).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=filename,
+                download_name= "subcontractor_Report.xlsx",
                as_attachment=True 
            )

--- a/app/templates/base.html
+++ b/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">
-                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
+                            
+                        </ul>
+                    </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 -->   
+                    <li class="nav-item dropdown">

-                    <!-- USER 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"
+                            href="#" id="profileDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">

-                        <a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#"
-                            data-bs-toggle="dropdown">
-                            <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 -->
-                            <li class="px-3 py-3 text-center border-bottom">
-                                <i class="bi bi-person-circle fs-1"></i>
-                                <div class="fw-semibold mt-1">
+                            <!-- Profile Header -->
+                            <li class="text-center py-4 border-bottom border-secondary">
+                                <i class="bi bi-person-circle text-light" style="font-size:60px;"></i>
+                                <h5 class="mt-2 mb-0 fw-bold">
                                    {{ session.get("user_name") }}
-                                </div>
-                                <small class="text-muted">Logged in user</small>
+                                </h5>
+                                <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') }}">
-                                    <i class="bi bi-clock-history me-2"></i>
-                                    Activity Log
+                                <a class="dropdown-item text-light py-2" href="{{ url_for('activity.activity') }}">
+                                    <i class="bi bi-clock-history me-2"></i> Activity Log
                                </a>
                            </li>

+                            <!--  Manage Account -->
                            <li>
-                                <a class="dropdown-item text-warning" href="/logout">
-                                    <i class="bi bi-box-arrow-right me-2"></i> Logout
+                                <a class="dropdown-item py-2" href="#">
+                                    <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>
@@ -336,7 +379,6 @@

                    showLoader();
                    const btn = this.querySelector("button[type='submit']");
-                    const originalBtnHtml = btn ? btn.innerHTML : null;

                    if(btn){
                        btn.disabled = true;
@@ -346,24 +388,10 @@
                        `;
                    }

-                   
-                    setTimeout(function () {
-                        hideLoader();
-                        if (btn) {
-                            btn.disabled = false;
-                            btn.innerHTML = originalBtnHtml;
-                        }
-                    }, 3000);
-
                });
            });
        });

-
-        window.addEventListener("pageshow", function () {
-            hideLoader();
-        });
-
    </script>


--- a/app/templates/client_report.html
+++ b/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">
--- a/app/templates/subcontractor_report.html
+++ b/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"
@@ -155,61 +155,51 @@
    </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 {% if show_all %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#abstract">
+                    <button class="nav-link active" 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 {% if selected_category == 'tr' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#tr">
+                    <button class="nav-link "  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 {% if selected_category == 'mh' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#mh">
+                    <button class="nav-link" 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 {% if selected_category == 'dc' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#dc">
+                    <button class="nav-link" 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 {% if selected_category == 'laying' %}active{% endif %}" data-bs-toggle="tab" data-bs-target="#laying">
+                    <button class="nav-link" 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 {% if show_all %}show active{% endif %}" id="abstract">
+                <div class="tab-pane fade show active" id="abstract">
                    {{ abstract_html|safe }}
                </div>

-                {% if show_all or selected_category == 'tr' %}
                <!-- Trench -->
-                <div class="tab-pane fade {% if selected_category == 'tr' %}show active{% endif %}" id="tr">
+                <div class="tab-pane fade "id="tr">
                    <div class="mb-3">
                        <button onclick="deleteSelected('tr')" class="btn btn-danger">
                            <i class="bi bi-trash"></i> Delete Selected
@@ -219,11 +209,9 @@
                        {{ tables.tr|safe }}
                    </div>
                </div>
-                {% endif %}

-                {% if show_all or selected_category == 'mh' %}
                <!-- MH -->
-                <div class="tab-pane fade {% if selected_category == 'mh' %}show active{% endif %}" id="mh">
+                <div class="tab-pane fade" id="mh">
                    <div class="mb-3">
                        <button onclick="deleteSelected('mh')" class="btn btn-danger">
                            <i class="bi bi-trash"></i>Delete Selected
@@ -233,11 +221,9 @@
                        {{ tables.mh|safe }}
                    </div>
                </div>
-                {% endif %}

-                {% if show_all or selected_category == 'dc' %}
                <!-- DC -->
-                <div class="tab-pane fade {% if selected_category == 'dc' %}show active{% endif %}" id="dc">
+                <div class="tab-pane fade" id="dc">
                    <div class="mb-3">
                        <button onclick="deleteSelected('dc')"class="btn btn-danger">
                            <i class="bi bi-trash"></i>
@@ -248,11 +234,9 @@
                        {{ tables.dc|safe }}
                    </div>
                </div>  
-                {% endif %}

-                {% if show_all or selected_category == 'laying' %}
                <!-- Laying -->
-                <div class="tab-pane fade {% if selected_category == 'laying' %}show active{% endif %}" id="laying">
+                <div class="tab-pane fade" id="laying">
                    <div class="mb-3">
                        <button onclick="deleteSelected('laying')"
                                class="btn btn-danger">
@@ -264,7 +248,6 @@
                        {{ tables.laying|safe }}
                    </div>
                </div>
-                {% endif %}
            </div>
        </div>
    </div>
@@ -273,45 +256,31 @@
 </div>

 <script>
-    
-    document.getElementById("resetBtn").addEventListener("click", function () {
-        window.location.href = window.location.pathname;
-    });
+    // Reset 
+    document.getElementById("resetBtn").addEventListener("click", function () {location.reload();});

    // DATATABLE
    $(document).ready(function () {
-       
-        $('.datatable').each(function () {
-            $(this).DataTable({
-                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">');
-                }
-            });
+        $('.datatable').DataTable({
+            pageLength: 10,
+            dom: 'Bfrtip',
+            buttons: ['copy', 'csv', 'excel', 'print']
        });
+
+        setTimeout(() => {
+            $("table thead tr th:first-child").html('<input type="checkbox" id="select-all">');
+        }, 500);
    });

-    // SELECT ALL — scoped to the checkbox's own table only
-    $(document).on("change", ".select-all", function () {
-        $(this).closest("table").find(".row-check").prop("checked", this.checked);
+    // SELECT ALL
+    $(document).on("change", "#select-all", function () {
+        $(".row-check").prop("checked", this.checked);
    });

-    // If a row checkbox is unchecked manually, uncheck that table's select-all
-    $(document).on("change", ".row-check", function () {
-        if (!this.checked) {
-            $(this).closest("table").find(".select-all").prop("checked", false);
-        }
-    });
-
-
-    function getSelectedIds(model) {
+    // GET IDS
+    function getSelectedIds() {
        let ids = [];
-        $("#" + model + " .row-check:checked").each(function () {
+        $(".row-check:checked").each(function () {
            ids.push($(this).data("id"));
        });
        return ids;
@@ -319,7 +288,7 @@

    // BULK DELETE
    function deleteSelected(model) {
-        let ids = getSelectedIds(model);
+        let ids = getSelectedIds();
        if (ids.length === 0) return alert("Select records");

        if (!confirm(`Delete ${ids.length} record(s)?`)) return;
--- a/logs/app.log
+++ b/logs/app.log
@@ -0,0 +1,3 @@
+2026-08-06 12:44:45 | INFO     | User=System | IP=- | - | - | ======================================================================
+2026-08-06 12:44:45 | INFO     | User=System | IP=- | - | - | Application Started Successfully
+2026-08-06 12:44:45 | INFO     | User=System | IP=- | - | - | ======================================================================
Author	SHA1	Message	Date
pjpatil12	de7b85034d	replace	2026-08-06 13:39:13 +05:30
pjpatil12	2f99c290df	Merge branch 'pankaj-dev'	2026-08-06 12:46:16 +05:30
Pankaj J Patil	5577576112	Update README.md update readme file	2026-04-07 11:42:23 +00:00
Pankaj J Patil	ce0e4f90cf	Merge pull request 'updateds folder path and regex' (#14 ) from pankaj-dev into main Reviewed-on: #14	2026-03-18 04:51:41 +00:00
Pankaj J Patil	446778a50c	Merge pull request 'pankaj-dev' (#13 ) from pankaj-dev into main Reviewed-on: #13	2026-03-17 12:54:08 +00:00
Pankaj J Patil	310ab40bf9	Merge pull request 'dataase field updateds and model updateds' (#12 ) from pankaj-dev into main Reviewed-on: #12	2026-03-11 08:04:07 +00:00
pjpatil12	bb56f00a6c	Resolved merge conflicts	2026-02-28 16:59:24 +05:30
pjpatil12	8353bb6426	Merge branch 'pankaj-dev'	2026-02-28 16:55:19 +05:30
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