Merge branch 'pankaj-dev'

app/templates/client_report.html

@@ -2,10 +2,10 @@
 
 {% block content %}
 <div class="container-fluid mt-4">
-    <h2 class="mb-4">Client File Reports</h2>
+    <h2 class="mb-4">Client RA Bills Reports</h2>
 
     <div class="card p-4 shadow-sm mb-5">
-        <form method="POST">
+        <form method="POST" class="loading-form">
             <label class="form-label fw-bold">RA Bill No</label>
             <input type="text" name="RA_Bill_No" class="form-control mb-3" value="{{ ra_val }}" required>
 
@@ -15,16 +15,15 @@
                         Data</button>
                 </div>
                 <div class="col-md-6">
-                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel
-                        Report</button>
+                    <button type="submit" name="action" value="download" class="btn btn-primary w-100">Download Excel Report</button>
                 </div>
             </div>
         </form>
     </div>
 
     {% if tables.tr or tables.mh or tables.dc or tables.laying %}
-    <div class="card shadow-sm p-3">
-        <h4 class="mb-3">Comparison Preview</h4>
+    <div class="card shadow-sm p-4">
+        <h4 class="mb-3">Table Preview</h4>
 
         <ul class="nav nav-tabs" id="reportTabs" role="tablist">
             <li class="nav-item">
@@ -32,6 +31,7 @@
                     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>
@@ -48,6 +48,18 @@
                 <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>
+            <li class="nav-item">
+                <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">
+                    MH & DC</button>
+            </li>
+            <li class="nav-item">
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"type="button">
+                    Laying & Bedding </button>
+>>>>>>> pankaj-dev
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">