From 5b557efd80e0f1249a56f8d82992c8dda18c5eb5 Mon Sep 17 00:00:00 2001
From: pjpatil12 <pankajjpatil2001@gmail.com>
Date: Fri, 23 Jan 2026 13:09:51 +0530
Subject: [PATCH] added new changes

---
 .env                                 |  2 +-
 app/routes/dashboard.py              |  4 ++--
 app/routes/file_report.py            | 10 +++-------
 app/templates/client_report.html     | 22 ++++++----------------
 app/templates/subcontractor/add.html |  2 +-
 requirements.txt                     |  2 ++
 6 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/.env b/.env
index c4c74c7..e70a331 100644
--- a/.env
+++ b/.env
@@ -3,7 +3,7 @@
 # -----------------------------
 FLASK_ENV=development
 FLASK_DEBUG=True
-FLASK_HOST='0.0.0.0'
+FLASK_HOST=0.0.0.0
 FLASK_PORT=5001
 
 # -----------------------------
diff --git a/app/routes/dashboard.py b/app/routes/dashboard.py
index 067c214..cd101d5 100644
--- a/app/routes/dashboard.py
+++ b/app/routes/dashboard.py
@@ -28,8 +28,8 @@ def bar_chart():
     plt.figure()
     plt.bar(categories, values)
     plt.title("Work Category Report")
-    plt.xlabel("Category")
-    plt.ylabel("Count")
+    plt.xlabel("test Category")
+    plt.ylabel("test Quantity")
 
 
     return plot_to_base64(plt)
diff --git a/app/routes/file_report.py b/app/routes/file_report.py
index c574c33..0daaade 100644
--- a/app/routes/file_report.py
+++ b/app/routes/file_report.py
@@ -73,10 +73,6 @@ class SubcontractorBill:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
 
-        print(":::-- TR. EX --:::",self.df_tr,"\n")
-        print(":::--MH EX--:::",self.df_mh,"\n")
-        print(":::--MH DC--:::",self.df_dc,"\n")
-        print(":::--Laying--:::",self.df_laying,"\n")
 
 # --- subcontractor report only  ---
 @file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
@@ -96,7 +92,7 @@ def report_file():
  
         if not subcontractor_id:
             flash("Please select a subcontractor.", "danger")
-            return render_template("report.html", subcontractors=subcontractors)
+            return render_template("subcontractor_report.html", subcontractors=subcontractors)
  
         subcontractor = Subcontractor.query.get(subcontractor_id)
         bill_gen = SubcontractorBill()
@@ -107,13 +103,13 @@ def report_file():
         else:
             if not ra_bill_no:
                 flash("Please enter an RA Bill Number.", "danger")
-                return render_template("report.html", subcontractors=subcontractors)
+                return render_template("subcontractor_report.html", subcontractors=subcontractors)
             bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
             file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
  
         if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
             flash("No data found for this selection.", "warning")
-            return render_template("report.html", subcontractors=subcontractors)
+            return render_template("subcontractor_report.html", subcontractors=subcontractors)
  
         # If download is clicked, return file immediately
         if action == "download":
diff --git a/app/templates/client_report.html b/app/templates/client_report.html
index ee633c3..ab95e43 100644
--- a/app/templates/client_report.html
+++ b/app/templates/client_report.html
@@ -4,17 +4,6 @@
 <div class="container-fluid mt-4">
     <h2 class="mb-4">Client File Reports</h2>
 
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-    {% for category, message in messages %}
-    <div class="alert alert-{{ category }} alert-dismissible fade show" role="alert">
-        {{ message }}
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
-    {% endfor %}
-    {% endif %}
-    {% endwith %}
-
     <div class="card p-4 shadow-sm mb-5">
         <form method="POST">
             <label class="form-label fw-bold">RA Bill No</label>
@@ -51,7 +40,8 @@
                     Comparison</button>
             </li>
             <li class="nav-item">
-                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
+                <button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
+                    type="button">Laying
                     & Bedding Comparison</button>
         </ul>
 
@@ -76,9 +66,9 @@
                     {{ tables.laying|safe }}
                 </div>
 
+            </div>
         </div>
-    </div>
-    {% endif %}
+        {% endif %}
 
-</div>
-{% endblock %}
\ No newline at end of file
+    </div>
+    {% endblock %}
\ No newline at end of file
diff --git a/app/templates/subcontractor/add.html b/app/templates/subcontractor/add.html
index 61d15fa..ef73ac1 100644
--- a/app/templates/subcontractor/add.html
+++ b/app/templates/subcontractor/add.html
@@ -13,7 +13,7 @@
         </div>
 
         <div class="mb-3">
-            <label class="form-label">Contact Person</label>
+            <label class="form-label">Contact Person Name</label>
             <input type="text" class="form-control" name="contact_person">
         </div>
 
diff --git a/requirements.txt b/requirements.txt
index 3398384..cf84ea1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,3 +7,5 @@ python-dotenv
 cryptography
 xlsxwriter
 matplotlib 
+flask_sqlalchemy
+flask_migrate
\ No newline at end of file