git issue solved

app/models/laying_model.py

@@ -0,0 +1,47 @@
+from app import db
+from datetime import datetime
+
+class Laying(db.Model):
+    __tablename__ = "laying"
+
+    id = db.Column(db.Integer, primary_key=True)
+    #  Foreign Key to Subcontractor table
+    subcontractor_id = db.Column(db.Integer, db.ForeignKey("subcontractors.id"), nullable=False)
+    # Relationship for easy access (subcontractor.subcontractor_name)
+    subcontractor = db.relationship("Subcontractor", backref="laying_records")
+
+    # Basic Fields
+    Location = db.Column(db.String(500))
+    MH_NO = db.Column(db.String(100))
+    CC_length = db.Column(db.Float)
+
+    Pipe_Dia_mm = db.Column(db.Float)
+    ID_of_MH_m = db.Column(db.Float)
+    Laying_Length = db.Column(db.Float)
+
+    pipe_150_mm = db.Column(db.Float)
+    pipe_200_mm = db.Column(db.Float)
+    pipe_250_mm = db.Column(db.Float)
+    pipe_300_mm = db.Column(db.Float)
+    pipe_350_mm = db.Column(db.Float)
+    pipe_400_mm = db.Column(db.Float)
+    pipe_450_mm = db.Column(db.Float)
+    pipe_500_mm = db.Column(db.Float)
+    pipe_600_mm = db.Column(db.Float)
+    pipe_700_mm = db.Column(db.Float)
+    pipe_900_mm = db.Column(db.Float)
+    pipe_1200_mm = db.Column(db.Float)
+    
+    
+    Total = db.Column(db.Float)
+    Remarks = db.Column(db.String(500))
+    RA_Bill_No=db.Column(db.String(500))
+    
+    created_at = db.Column(db.DateTime, default=datetime.today)
+
+
+    def __repr__(self):
+        return f"<LayingModel {self.Location}>"
+
+    def serialize(self):
+        return {c.name: getattr(self, c.name) for c in self.__table__.columns}

app/models/manhole_domestic_chamber_model.py

@@ -49,3 +49,4 @@ class ManholeDomesticChamber(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+

app/routes/dashboard.py

@@ -1,11 +1,68 @@
+import matplotlib
+matplotlib.use("Agg")
 
 from flask import Blueprint, render_template, session, redirect, url_for
+import matplotlib.pyplot as plt
+import io
+import base64
 
 dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
 
+# charts 
+def plot_to_base64():
+    img = io.BytesIO()
+    plt.savefig(img, format="png", bbox_inches="tight")
+    plt.close()
+    img.seek(0)
+    return base64.b64encode(img.getvalue()).decode()
+
+# bar chart
+def bar_chart():
+    categories = ["Trench", "Manhole", "Pipe Laying", "Restoration"]
+    values = [120, 80, 150, 60]
+
+    plt.figure()
+    plt.bar(categories, values)
+    plt.title("Work Category Report")
+    plt.xlabel("Category")
+    plt.ylabel("Count")
+
+
+    return plot_to_base64()
+
+# Pie chart
+def pie_chart():
+    labels = ["Completed", "In Progress", "Pending"]
+    sizes = [55, 20, 25]
+
+    plt.figure()
+    plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140)
+    plt.title("Project Status")
+
+    return plot_to_base64()
+
+# Histogram chart
+def histogram_chart():
+    daily_work = [5, 10, 15, 20, 20, 25, 30, 35, 40, 45, 50]
+
+    plt.figure()
+    plt.hist(daily_work, bins=5)
+    plt.title("Daily Work Distribution")
+    plt.xlabel("Work Units")
+    plt.ylabel("Frequency")
+
+    return plot_to_base64()
+
+# Dashboaed page
 @dashboard_bp.route("/")
 def dashboard():
     if not session.get("user_id"):
         return redirect(url_for("auth.login"))
 
-    return render_template("dashboard.html", title="Dashboard")
+    return render_template(
+        "dashboard.html",
+        title="Dashboard",
+        bar_chart=bar_chart(),
+        pie_chart=pie_chart(),
+        histogram=histogram_chart()
+    )

app/routes/file_report.py

@@ -9,66 +9,72 @@ from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 from app.utils.helpers import login_required
-
+from app.models.laying_model import Laying
+ 
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
-
+ 
 # --- DATA WRAPPERS ---
-
+ 
 class ClientBill:
     def __init__(self):
         self.df_tr = pd.DataFrame()
         self.df_mh = pd.DataFrame()
         self.df_dc = pd.DataFrame()
-
+ 
     def Fetch(self, RA_Bill_No):
         trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
         mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
         dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
-
+ 
         self.df_tr = pd.DataFrame([c.serialize() for c in trench])
         self.df_mh = pd.DataFrame([c.serialize() for c in mh])
         self.df_dc = pd.DataFrame([c.serialize() for c in dc])
-
+ 
         if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
             self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
-
+ 
         drop_cols = ["id", "created_at", "_sa_instance_state"]
         for df in [self.df_tr, self.df_mh, self.df_dc]:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
-
+ 
 class SubcontractorBill:
     def __init__(self):
         self.df_tr = pd.DataFrame()
         self.df_mh = pd.DataFrame()
         self.df_dc = pd.DataFrame()
-
+        self.df_lay = pd.DataFrame()
+ 
     def Fetch(self, RA_Bill_No=None, subcontractor_id=None):
         filters = {}
         if subcontractor_id:
             filters["subcontractor_id"] = subcontractor_id
         if RA_Bill_No:
             filters["RA_Bill_No"] = RA_Bill_No
-
+ 
         trench = TrenchExcavation.query.filter_by(**filters).all()
         mh = ManholeExcavation.query.filter_by(**filters).all()
         dc = ManholeDomesticChamber.query.filter_by(**filters).all()
+        lay= Laying.query.filter_by(**filters).all()
 
+        print("Laying datas :",lay)
+ 
         self.df_tr = pd.DataFrame([c.serialize() for c in trench])
         self.df_mh = pd.DataFrame([c.serialize() for c in mh])
         self.df_dc = pd.DataFrame([c.serialize() for c in dc])
-
+        self.df_lay = pd.DataFrame([c.serialize() for c in lay])
+ 
         if not self.df_dc.empty and "MH_NO" in self.df_dc.columns:
             self.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
-
+ 
         drop_cols = ["id", "created_at", "_sa_instance_state"]
-        for df in [self.df_tr, self.df_mh, self.df_dc]:
+        for df in [self.df_tr, self.df_mh, self.df_dc, self.df_lay]:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
-
+ 
 # --- ROUTES ---
-
+ 
 # @file_report_bp.route("/report", methods=["GET", "POST"])
 # @login_required
 # def report_file():
@@ -77,14 +83,14 @@ class SubcontractorBill:
 #         subcontractor_id = request.form.get("subcontractor_id")
 #         ra_bill_no = request.form.get("ra_bill_no")
 #         download_all = request.form.get("download_all") == "true"
-
+ 
 #         if not subcontractor_id:
 #             flash("Please select a subcontractor.", "danger")
 #             return render_template("report.html", subcontractors=subcontractors)
-
+ 
 #         subcontractor = Subcontractor.query.get(subcontractor_id)
 #         bill_gen = SubcontractorBill()
-
+ 
 #         if download_all:
 #             bill_gen.Fetch(subcontractor_id=subcontractor_id)
 #             file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
@@ -94,11 +100,11 @@ class SubcontractorBill:
 #                 return render_template("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)
-
+ 
 #         output = io.BytesIO()
 #         with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
 #             bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
@@ -106,7 +112,7 @@ class SubcontractorBill:
 #             bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
 #         output.seek(0)
 #         return send_file(output, download_name=file_name, as_attachment=True, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-
+ 
 #     return render_template("report.html", subcontractors=subcontractors)
 @file_report_bp.route("/report", methods=["GET", "POST"])
 @login_required
@@ -116,20 +122,20 @@ def report_file():
     selected_sc_id = None
     ra_bill_no = None
     download_all = False
-
+ 
     if request.method == "POST":
         subcontractor_id = request.form.get("subcontractor_id")
         ra_bill_no = request.form.get("ra_bill_no")
         download_all = request.form.get("download_all") == "true"
-        action = request.form.get("action") 
-
+        action = request.form.get("action")
+ 
         if not subcontractor_id:
             flash("Please select a subcontractor.", "danger")
             return render_template("report.html", subcontractors=subcontractors)
-
+ 
         subcontractor = Subcontractor.query.get(subcontractor_id)
         bill_gen = SubcontractorBill()
-
+ 
         if download_all:
             bill_gen.Fetch(subcontractor_id=subcontractor_id)
             file_name = f"{subcontractor.subcontractor_name}_ALL_BILLS.xlsx"
@@ -139,11 +145,11 @@ def report_file():
                 return render_template("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)
-
+ 
         # If download is clicked, return file immediately
         if action == "download":
             output = io.BytesIO()
@@ -151,57 +157,59 @@ def report_file():
                 bill_gen.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
                 bill_gen.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
                 bill_gen.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
+                bill_gen.df_lay.to_excel(writer, index=False, sheet_name="Laying")
             output.seek(0)
             return send_file(output, download_name=file_name, as_attachment=True)
-
+ 
         # PREVIEW LOGIC: Convert DataFrames to HTML for the 'tables' variable
         # We add bootstrap classes directly to the pandas output
         table_classes = "table table-hover table-bordered table-striped"
         tables = {
             "tr": bill_gen.df_tr.to_html(classes=table_classes, index=False),
             "mh": bill_gen.df_mh.to_html(classes=table_classes, index=False),
-            "dc": bill_gen.df_dc.to_html(classes=table_classes, index=False)
+            "dc": bill_gen.df_dc.to_html(classes=table_classes, index=False),
+            "lay": bill_gen.df_lay.to_html(classes=table_classes, index=False)
         }
         selected_sc_id = subcontractor_id
-
+ 
     return render_template(
-        "report.html", 
-        subcontractors=subcontractors, 
+        "report.html",
+        subcontractors=subcontractors,
         tables=tables,  # This now matches your HTML
         selected_sc_id=selected_sc_id,
         ra_bill_no=ra_bill_no,
         download_all=download_all
     )
-
+ 
 @file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
 @login_required
 def client_vs_all_subcontractor():
     tables = {"tr": None, "mh": None, "dc": None}
     ra_val = ""
-
+ 
     if request.method == "POST":
         RA_Bill_No = request.form.get("RA_Bill_No")
         ra_val = RA_Bill_No
-
+ 
         if not RA_Bill_No:
             flash("Please enter RA Bill No.", "danger")
             return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
-
+ 
         clientBill = ClientBill()
         clientBill.Fetch(RA_Bill_No=RA_Bill_No)
         contractorBill = SubcontractorBill()
         contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
-
+ 
         # --- SAFETY CHECK: Verify data exists before merging ---
         if clientBill.df_tr.empty and clientBill.df_mh.empty:
             flash(f"No Client records found for RA Bill {RA_Bill_No}", "warning")
             return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
-
+ 
         qty_cols = [...] # (Keep your existing list)
         mh_dc_qty_cols = [...] # (Keep your existing list)
-
+ 
         def aggregate_df(df, group_cols, sum_cols):
-            if df.empty: 
+            if df.empty:
                 # Create an empty DF with the correct columns to avoid Merge/Key Errors
                 return pd.DataFrame(columns=group_cols + sum_cols)
             existing_cols = [c for c in sum_cols if c in df.columns]
@@ -210,18 +218,18 @@ def client_vs_all_subcontractor():
                 if col not in df.columns:
                     df[col] = "N/A" # Fill missing join keys
             return df.groupby(group_cols, as_index=False)[existing_cols].sum()
-
+ 
         # Aggregate data
         df_sub_tr_grp = aggregate_df(contractorBill.df_tr, ["Location", "MH_NO"], qty_cols)
         df_sub_mh_grp = aggregate_df(contractorBill.df_mh, ["Location", "MH_NO"], qty_cols)
         df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "Node_No"], mh_dc_qty_cols)
-
+ 
         # --- FINAL MERGE LOGIC ---
         # We check if "Location" exists in the client data. If not, we add it to prevent the KeyError.
         for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc]:
             if not df_client.empty and "Location" not in df_client.columns:
                 df_client["Location"] = "Unknown"
-
+ 
         try:
             df_tr_cmp = clientBill.df_tr.merge(df_sub_tr_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
             df_mh_cmp = clientBill.df_mh.merge(df_sub_mh_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
@@ -229,12 +237,13 @@ def client_vs_all_subcontractor():
         except KeyError as e:
             flash(f"Merge Error: Missing column {str(e)}. Check if 'Location' is defined in your database models.", "danger")
             return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)
-
+ 
         # ... (Rest of your calculation and download logic) ...
-
+ 
         # Convert to HTML for preview
         tables["tr"] = df_tr_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
         tables["mh"] = df_mh_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
         tables["dc"] = df_dc_cmp.to_html(classes='table table-striped table-hover table-sm', index=False)
-
-    return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)  
+ 
+    return render_template("generate_comparison_client_vs_subcont.html", tables=tables, ra_val=ra_val)  
+ 

app/services/file_service.py

@@ -1,19 +1,22 @@
 import os
 import pandas as pd
 from werkzeug.utils import secure_filename
+from app.utils.file_utils import ensure_upload_folder
 
 from app.config import Config
 from app import db
 
+# Subcontractor models import
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
 
+# Client models import
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 
-from app.utils.file_utils import ensure_upload_folder
 
 
 class FileService:
@@ -60,10 +63,12 @@ class FileService:
             df_tr_ex = pd.read_excel(filepath, sheet_name="Tr.Ex.", header=12, dtype={"MH No": str})
             df_mh_ex = pd.read_excel(filepath, sheet_name="MH Ex.", header=12, dtype={"MH No": str})
             df_mh_dc = pd.read_excel(filepath, sheet_name="MH & DC", header=11, dtype={"MH No": str})
+            df_laying = pd.read_excel(filepath, sheet_name="Laying", header=11, dtype={"MH No": str})
 
             self.process_trench_excavation(df_tr_ex, subcontractor_id, RA_Bill_No)
             self.process_manhole_excavation(df_mh_ex, subcontractor_id, RA_Bill_No)
             self.process_manhole_domestic_chamber(df_mh_dc, subcontractor_id, RA_Bill_No)
+            self.process_laying(df_laying, subcontractor_id, RA_Bill_No)
 
             return True, "SUBCONTRACTOR File uploaded successfully."
 
@@ -96,18 +101,18 @@ class FileService:
             if not location or not mh_no:
                 continue
 
-            exists = TrenchExcavation.query.filter_by(
-                subcontractor_id=subcontractor_id,
-                RA_Bill_No=RA_Bill_No,
-                Location=location,
-                MH_NO=mh_no,
-            ).first()
+            # exists = TrenchExcavation.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()
 
-            if exists:
-                errors.append(
-                    f"Model-Tr.Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
-                )
-                continue
+            # if exists:
+            #     errors.append(
+            #         f"Model-Tr.Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue
 
             record_data = {}
             for col in df.columns:
@@ -154,18 +159,18 @@ class FileService:
             if not location or not mh_no:
                 continue
 
-            exists = ManholeExcavation.query.filter_by(
-                subcontractor_id=subcontractor_id,
-                RA_Bill_No=RA_Bill_No,
-                Location=location,
-                MH_NO=mh_no,
-            ).first()
+            # exists = ManholeExcavation.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()
 
-            if exists:
-                errors.append(
-                    f"Model-MH Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
-                )
-                continue
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH Ex. (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue
 
             record_data = {}
             for col in df.columns:
@@ -212,18 +217,18 @@ class FileService:
             if not location or not mh_no:
                 continue
 
-            exists = ManholeDomesticChamber.query.filter_by(
-                subcontractor_id=subcontractor_id,
-                RA_Bill_No=RA_Bill_No,
-                Location=location,
-                MH_NO=mh_no,
-            ).first()
+            # exists = ManholeDomesticChamber.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()
 
-            if exists:
-                errors.append(
-                    f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
-                )
-                continue
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue
 
             record_data = {}
             for col in df.columns:
@@ -245,6 +250,66 @@ class FileService:
 
         db.session.commit()
 
+    # ---------------- Laying (Subcontractor) ----------------
+    def process_laying(self, df, subcontractor_id, RA_Bill_No):
+
+        df.columns = (
+            df.columns.astype(str)
+            .str.strip()
+            .str.replace(r"[^\w]", "_", regex=True)
+            .str.replace("__+", "_", regex=True)
+            .str.strip("_")
+        )
+
+        df = df.dropna(how="all")
+
+        if "Location" in df.columns:
+            df["Location"] = df["Location"].ffill()
+
+        errors = []
+
+        for idx, row in df.iterrows():
+            location = self.normalize(row.get("Location"))
+            mh_no = self.normalize(row.get("MH_NO"))
+
+            if not location or not mh_no:
+                continue
+
+            # exists = ManholeDomesticChamber.query.filter_by(
+            #     subcontractor_id=subcontractor_id,
+            #     RA_Bill_No=RA_Bill_No,
+            #     Location=location,
+            #     MH_NO=mh_no,
+            # ).first()
+
+            # if exists:
+            #     errors.append(
+            #         f"Model-MH & DC (Row {idx+1}): Duplicate → Location={location}, MH_NO={mh_no}"
+            #     )
+            #     continue
+
+            record_data = {}
+            for col in df.columns:
+                if hasattr(Laying, col):
+                    val = row[col]
+                    if pd.isna(val) or str(val).strip() in ["", "-", "—", "nan"]:
+                        val = None
+                    record_data[col] = val
+
+            record = Laying(
+                subcontractor_id=subcontractor_id,
+                RA_Bill_No=RA_Bill_No,
+                **record_data,
+            )
+            db.session.add(record)
+
+        if errors:
+            raise Exception(" | ".join(errors))
+
+        db.session.commit()
+
+
+
     # ---------------- CLIENT FILE UPLOAD ----------------
     def handle_client_file_upload(self, file, RA_Bill_No):
 

app/templates/base.html

@@ -40,10 +40,10 @@
                         </a>
                     </li>
 
-                    <!-- Subcontractor -->
+                    <!-- Subcontractor Model -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-people-fill me-1"></i> Subcontractor
+                            <i class="bi bi-people-fill me-1"></i> Subcontractor Model
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
@@ -59,10 +59,10 @@
                         </ul>
                     </li>
 
-                    <!-- File System -->
+                    <!-- Subcontractor File System -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-folder-fill me-1"></i> File System
+                            <i class="bi bi-folder-fill me-1"></i>Subcontractor File System
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
@@ -81,7 +81,7 @@
                     <!-- Client System -->
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
-                            <i class="bi bi-building me-1"></i> Client System
+                            <i class="bi bi-building me-1"></i> Client File System
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
@@ -90,11 +90,6 @@
                                 </a>
                             </li>
 
-                            <li>
-                                <a class="dropdown-item" href="/report/comparison_report">
-                                    <i class="bi bi-arrow-left-right me-2"></i> client vs sub-cont. Comparison Report
-                                </a>
-                            </li>
                             <li>
                                 <a class="dropdown-item" href="/file/client_vs_subcont">
                                     <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
@@ -103,6 +98,27 @@
                         </ul>
                     </li>
 
+                    <!-- Reports -->
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
+                            <i class="bi bi-building me-1"></i> Reports
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-dark">
+
+                            <li>
+                                <a class="dropdown-item" href="/report/comparison_report">
+                                    <i class="bi bi-arrow-left-right me-2"></i> client vs sub-cont. Comparison Report
+                                </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>
+
+
                     <!-- Formats -->
                     <li class="nav-item">
                         <a class="nav-link" href="/file_format">

app/templates/dashboard.html

@@ -1,10 +1,87 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h2 class="mb-4">Dashboard</h2>
 
-<div class="card p-4 shadow-sm">
-    <h5>Welcome to Comparison Project</h5>
-    <p>This is dashboard panel.</p>
+<div class="container-fluid px-2 px-md-4">
+
+    <h4 class="mb-3 text-center text-md-start">Comparison Software Solapur(UGD) </h4>
+
+    <!-- Summary Cards -->
+    <div class="row g-3 mb-4">
+
+        <!-- Total Work -->
+        <div class="col-12 col-md-4">
+            <div class="card text-white bg-primary shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Total Work</h6>
+                    <h3 class="fw-bold">410</h3>
+                </div>
+            </div>
+        </div>
+
+        <!-- Completed -->
+        <div class="col-12 col-md-4">
+            <div class="card text-white bg-success shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Completed</h6>
+                    <h3 class="fw-bold">265</h3>
+                </div>
+            </div>
+        </div>
+
+        <!-- Pending -->
+        <div class="col-12 col-md-4">
+            <div class="card text-dark bg-warning shadow h-100">
+                <div class="card-body text-center text-md-start">
+                    <h6>Pending</h6>
+                    <h3 class="fw-bold">145</h3>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <!-- Charts -->
+    <div class="row g-3">
+
+        <!-- Bar Chart -->
+        <div class="col-12 col-md-6">
+            <div class="card shadow-sm h-100">
+                <div class="card-header bg-dark text-white text-center text-md-start">
+                    Work Category Bar Chart
+                </div>
+                <div class="card-body text-center">
+                    <img src="data:image/png;base64,{{ bar_chart }}" class="img-fluid" style="max-height:300px;">
+                </div>
+            </div>
+        </div>
+
+        <!-- Pie Chart -->
+        <div class="col-12 col-md-6">
+            <div class="card shadow-sm h-100">
+                <div class="card-header bg-dark text-white text-center text-md-start">
+                    Project Status Pie Chart
+                </div>
+                <div class="card-body text-center">
+                    <img src="data:image/png;base64,{{ pie_chart }}" class="img-fluid" style="max-height:300px;">
+                </div>
+            </div>
+        </div>
+
+        <!-- Histogram -->
+        <div class="col-12">
+            <div class="card shadow-sm">
+                <div class="card-header bg-dark text-white text-center text-md-start">
+                    Daily Work Histogram
+                </div>
+                <div class="card-body text-center">
+                    <img src="data:image/png;base64,{{ histogram }}" class="img-fluid" style="max-height:350px;">
+                </div>
+            </div>
+        </div>
+
+    </div>
+
 </div>
+
 {% endblock %}

app/templates/generate_comparison_client_vs_subcont.html

@@ -1,7 +1,8 @@
 {% extends "base.html" %}
 
 {% block content %}
-<div class="container-fluid mt-4"> <h2 class="mb-4">File Comparison</h2>
+<div class="container-fluid mt-4">
+    <h2 class="mb-4">File Comparison</h2>
 
     {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
@@ -21,10 +22,12 @@
 
             <div class="row">
                 <div class="col-md-6">
-                    <button type="submit" name="action" value="preview" class="btn btn-secondary w-100">Preview Data</button>
+                    <button type="submit" name="action" value="preview" class="btn btn-secondary w-100">Preview
+                        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>
@@ -33,16 +36,19 @@
     {% if tables.tr or tables.mh or tables.dc %}
     <div class="card shadow-sm p-3">
         <h4 class="mb-3">Comparison Preview</h4>
-        
+
         <ul class="nav nav-tabs" id="reportTabs" role="tablist">
             <li class="nav-item">
-                <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr" type="button">Tr.Ex Comparison</button>
+                <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
+                    type="button">Tr.Ex Comparison</button>
             </li>
             <li class="nav-item">
-                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex Comparison</button>
+                <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
+                    Comparison</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 Comparison</button>
+                <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
+                    Comparison</button>
             </li>
         </ul>
 

app/templates/login.html

@@ -31,7 +31,7 @@
                                 Laxmi Civil Engineering Services Pvt Ltd
                             </h4>
                             <p class="text-muted mb-0">
-                                Data Comparison System
+                                Data Comparison Software Solapur(UGD)
                             </p>
                         </div>
 

app/templates/report.html

@@ -5,14 +5,14 @@
     <h2 class="mb-4 text-center">Generate Subcontractor Report</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 %}
+    {% 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 mx-auto" style="max-width: 600px;">
@@ -22,7 +22,7 @@
                 <select name="subcontractor_id" class="form-select" required>
                     <option value="">-- Select Subcontractor --</option>
                     {% for sc in subcontractors %}
-                    <option value="{{ sc.id }}" {% if selected_sc_id == sc.id|string %}selected{% endif %}>
+                    <option value="{{ sc.id }}" {% if selected_sc_id==sc.id|string %}selected{% endif %}>
                         {{ sc.subcontractor_name }}
                     </option>
                     {% endfor %}
@@ -30,7 +30,8 @@
             </div>
 
             <div class="form-check form-switch mb-3">
-                <input class="form-check-input" type="checkbox" name="download_all" value="true" id="downloadAllSwitch" onchange="toggleRAInput(this)" {% if download_all %}checked{% endif %}>
+                <input class="form-check-input" type="checkbox" name="download_all" value="true" id="downloadAllSwitch"
+                    onchange="toggleRAInput(this)" {% if download_all %}checked{% endif %}>
                 <label class="form-check-label fw-bold text-primary" for="downloadAllSwitch">
                     Download All RA Bills for this Contractor
                 </label>
@@ -38,7 +39,8 @@
 
             <div class="mb-4" id="ra_bill_container">
                 <label class="form-label fw-semibold">RA Bill Number</label>
-                <input type="text" name="ra_bill_no" id="ra_bill_input" class="form-control" placeholder="e.g. 01" value="{{ ra_bill_no or '' }}">
+                <input type="text" name="ra_bill_no" id="ra_bill_input" class="form-control" placeholder="e.g. 01"
+                    value="{{ ra_bill_no or '' }}">
                 <small class="text-muted">Required if "Download All" is off.</small>
             </div>
 
@@ -61,18 +63,24 @@
     <div class="mt-5 mb-5">
         <hr>
         <h3 class="text-center mb-4">Report Preview</h3>
-        
+
         <div class="card shadow-sm">
             <div class="card-header bg-light">
                 <ul class="nav nav-tabs card-header-tabs" id="reportTabs" role="tablist">
                     <li class="nav-item">
-                        <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr" type="button">Transport (Tr.Ex.)</button>
+                        <button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
+                            type="button">Transport (Tr.Ex.)</button>
                     </li>
                     <li class="nav-item">
-                        <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Manpower (MH.Ex.)</button>
+                        <button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh"
+                            type="button">Manpower (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>
+                        <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="lay-tab" data-bs-toggle="tab" data-bs-target="#lay" type="button">Laying</button>
                     </li>
                 </ul>
             </div>
@@ -92,6 +100,10 @@
                         {{ tables.dc | safe }}
                     </div>
                 </div>
+                <div class="tab-pane fade" id="lay" role="tabpanel">
+                    <div class="table-responsive">
+                        {{ tables.lay | safe }}
+                    </div>
             </div>
         </div>
     </div>
@@ -104,28 +116,29 @@
         font-size: 0.9rem;
         white-space: nowrap;
     }
+
     .table-responsive thead {
         background-color: #f8f9fa;
     }
 </style>
 
 <script>
-function toggleRAInput(checkbox) {
-    const input = document.getElementById('ra_bill_input');
-    const container = document.getElementById('ra_bill_container');
-    if (checkbox.checked) {
-        input.value = "";
-        input.disabled = true;
-        container.style.opacity = "0.5";
-    } else {
-        input.disabled = false;
-        container.style.opacity = "1";
+    function toggleRAInput(checkbox) {
+        const input = document.getElementById('ra_bill_input');
+        const container = document.getElementById('ra_bill_container');
+        if (checkbox.checked) {
+            input.value = "";
+            input.disabled = true;
+            container.style.opacity = "0.5";
+        } else {
+            input.disabled = false;
+            container.style.opacity = "1";
+        }
     }
-}
 
-// Check status on load to handle form persistence
-document.addEventListener("DOMContentLoaded", function() {
-    toggleRAInput(document.getElementById('downloadAllSwitch'));
-});
+    // Check status on load to handle form persistence
+    document.addEventListener("DOMContentLoaded", function () {
+        toggleRAInput(document.getElementById('downloadAllSwitch'));
+    });
 </script>
 {% endblock %}

app/templates/subcontractor/list.html

@@ -5,13 +5,13 @@
 
     <!-- Header -->
     <div class="row mb-3 align-items-center">
-        <div class="col-12 col-md-6">
+        <div class="col-12 col-md-6 ">
             <h4 class="mb-2 mb-md-0 text-center text-md-start">
                 Subcontractor List
             </h4>
         </div>
 
-        <div class="col-12 col-md-6 text-center text-md-end">
+        <div class="col-12 col-md-3 text-center text-md-end">
             <a href="/subcontractor/add" class="btn btn-success w-100 w-md-auto">
                 ➕ Add Subcontractor
             </a>
@@ -65,8 +65,8 @@
                             </a>
                         </div>
                     </td>
-                    /tr>
-                    {% endfor %}
+                </tr>
+                {% endfor %}
             </tbody>
 
             <!-- TOTAL ROW -->