added new changes

Reviewed-on: #9

.env

@@ -0,0 +1,26 @@
+# -----------------------------
+# Flask App Configuration
+# -----------------------------
+FLASK_ENV=development
+FLASK_DEBUG=True
+FLASK_HOST=0.0.0.0
+FLASK_PORT=5001
+
+# -----------------------------
+# 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
+

app/__init__.py

@@ -32,7 +32,7 @@ def register_blueprints(app):
     from app.routes.generate_comparison_report import generate_report_bp
     from app.routes.file_format import file_format_bp 
 
-    app.register_blueprint(auth_bp)
+    app.register_blueprint(auth_bp) 
     app.register_blueprint(user_bp)
     app.register_blueprint(dashboard_bp)
     app.register_blueprint(subcontractor_bp)

app/models/laying_client_model.py

@@ -5,16 +5,19 @@ class LayingClient(db.Model):
     __tablename__ = "laying_client"
 
     id = db.Column(db.Integer, primary_key=True)
-    #  Foreign Key to Subcontractor tables
-    # 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)
+    # Bedding Qty.
+    Outer_dia_of_MH_m = db.Column(db.Float)
+    Bedding_Length = db.Column(db.Float)
+    Width = db.Column(db.Float)
+    Depth = db.Column(db.Float)
+    Qty = db.Column(db.Float)
  
+    #  PIPE LAYING Qty. 
     Pipe_Dia_mm = db.Column(db.Float)
     ID_of_MH_m = db.Column(db.Float)
     Laying_Length = db.Column(db.Float)
@@ -32,7 +35,6 @@ class LayingClient(db.Model):
     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))
@@ -45,3 +47,12 @@ class LayingClient(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+    
+    def sum_laying_fields():
+        return [
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
+        ]

app/models/laying_model.py

@@ -10,11 +10,10 @@ class Laying(db.Model):
     # Relationship for easy access (subcontractor.subcontractor_name)
     subcontractor = db.relationship("Subcontractor", backref="laying_records")
 
-    # Basic Fields
+    # Pipe Laying 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)
@@ -32,7 +31,6 @@ class Laying(db.Model):
     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))
@@ -45,3 +43,12 @@ class Laying(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+
+    def sum_laying_fields():
+        return [
+            "pipe_150_mm", "pipe_200_mm", "pipe_250_mm",
+            "pipe_300_mm", "pipe_350_mm", "pipe_400_mm",
+            "pipe_450_mm", "pipe_500_mm", "pipe_600_mm",
+            "pipe_700_mm", "pipe_900_mm", "pipe_1200_mm"
+        ]

app/models/manhole_domestic_chamber_model.py

@@ -49,4 +49,15 @@ class ManholeDomesticChamber(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    
+    def sum_mh_dc_fields():
+        return [
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
+            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
+            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
+            "d_9_16_to_9_65"]
 

app/models/mh_dc_client_model.py

@@ -44,3 +44,14 @@ class ManholeDomesticChamberClient(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+
+    
+    def sum_mh_dc_fields():
+        return [
+            "d_0_to_0_75", "d_0_76_to_1_05", "d_1_06_to_1_65",
+            "d_1_66_to_2_15", "d_2_16_to_2_65", "d_2_66_to_3_15",
+            "d_3_16_to_3_65", "d_3_66_to_4_15", "d_4_16_to_4_65",
+            "d_4_66_to_5_15", "d_5_16_to_5_65", "d_5_66_to_6_15",
+            "d_6_16_to_6_65", "d_6_66_to_7_15", "d_7_16_to_7_65",
+            "d_7_66_to_8_15", "d_8_16_to_8_65", "d_8_66_to_9_15",
+            "d_9_16_to_9_65" ]

app/models/trench_excavation_model.py

@@ -77,3 +77,34 @@ class TrenchExcavation(db.Model):
 
     def serialize(self):
         return {c.name: getattr(self, c.name) for c in self.__table__.columns}
+    
+    def excavation_category_sums(self):
+
+        def safe(val):
+            return val or 0
+
+        return {
+            "Soft_Murum_Total": (
+                safe(self.Soft_Murum_0_to_1_5)
+                + safe(self.Soft_Murum_1_5_to_3_0)
+                + safe(self.Soft_Murum_3_0_to_4_5)
+            ),
+
+            "Hard_Murum_Total": (
+                safe(self.Hard_Murum_0_to_1_5)
+                + safe(self.Hard_Murum_1_5_to_3_0)
+            ),
+
+            "Soft_Rock_Total": (
+                safe(self.Soft_Rock_0_to_1_5)
+                + safe(self.Soft_Rock_1_5_to_3_0)
+            ),
+
+            "Hard_Rock_Total": (
+                safe(self.Hard_Rock_0_to_1_5)
+                + safe(self.Hard_Rock_1_5_to_3_0)
+                + safe(self.Hard_Rock_3_0_to_4_5)
+                + safe(self.Hard_Rock_4_5_to_6_0)
+                + safe(self.Hard_Rock_6_0_to_7_5)
+            ),
+        }

app/routes/dashboard.py

@@ -5,16 +5,20 @@ from flask import Blueprint, render_template, session, redirect, url_for
 import matplotlib.pyplot as plt
 import io
 import base64
+from app.utils.plot_utils import plot_to_base64
+from app.services.dashboard_service import DashboardService
 
 dashboard_bp = Blueprint("dashboard", __name__, url_prefix="/dashboard")
 
+# dashboard_bp = Blueprint("dashboard", __name__)
+
 # 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()
+# 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():
@@ -24,11 +28,11 @@ 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()
+    return plot_to_base64(plt)
 
 # Pie chart
 def pie_chart():
@@ -39,7 +43,7 @@ def pie_chart():
     plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140)
     plt.title("Project Status")
 
-    return plot_to_base64()
+    return plot_to_base64(plt)
 
 # Histogram chart
 def histogram_chart():
@@ -51,7 +55,7 @@ def histogram_chart():
     plt.xlabel("Work Units")
     plt.ylabel("Frequency")
 
-    return plot_to_base64()
+    return plot_to_base64(plt)
 
 # Dashboaed page
 @dashboard_bp.route("/")
@@ -66,3 +70,18 @@ def dashboard():
         pie_chart=pie_chart(),
         histogram=histogram_chart()
     )
+
+# subcontractor dashboard
+@dashboard_bp.route("/subcontractor_dashboard", methods=["GET", "POST"])
+def subcontractor_dashboard():
+    if not session.get("user_id"):
+        return redirect(url_for("auth.login"))
+
+    tr_dash = DashboardService().bar_chart_of_tr_ex
+    
+    
+    return render_template(
+        "subcontractor_dashboard.html",
+        title="Dashboard",
+        bar_chart=tr_dash
+    )

app/routes/file_import.py

@@ -5,7 +5,8 @@ from app.utils.helpers import login_required
 
 file_import_bp = Blueprint("file_import", __name__, url_prefix="/file")
 
-@file_import_bp.route("/import", methods=["GET", "POST"])
+# this is contractractor immport routes
+@file_import_bp.route("/import_Subcontractor", methods=["GET", "POST"])
 @login_required
 def import_file():
     subcontractors = Subcontractor.query.all()
@@ -21,13 +22,13 @@ def import_file():
         flash(msg, "success" if success else "danger")
 
     return render_template(
-        "file_import.html",
+        "file_import_subcontractor.html",
         title="Sub-cont. File Import",
         subcontractors=subcontractors
     )
 
 
-# this route import client files
+# this is client import routes
 @file_import_bp.route("/import_client", methods=["GET", "POST"])
 @login_required
 def client_import_file():
@@ -42,4 +43,4 @@ def client_import_file():
 
         flash(msg, "success" if success else "danger")
 
-    return render_template("file_import_client.html", title="Client File Import", subcontractors=subcontractors)
+    return render_template("file_import_client.html", title="Client File Import", subcontractors=subcontractors)

app/routes/file_report.py

@@ -1,83 +1,49 @@
 import pandas as pd
 import io
 from flask import Blueprint, render_template, request, send_file, flash
+from app.utils.helpers import login_required
+
 from app.models.subcontractor_model import Subcontractor
+
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.trench_excavation_model import TrenchExcavation
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
+
 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
-<<<<<<< HEAD
+from app.models.laying_client_model import LayingClient
 
-import pandas as pd
-import io
-from enum import Enum
-
-# --- 1. DEFINE BLUEPRINT FIRST (Prevents NameError) ---
-file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
-
-class BillType(Enum):
-    Client = 1
-    Subcontractor = 2
-
-# --- 2. DEFINE CLASSES ---
-class SubcontractorBill:
-    def __init__(self):
-        # Initialize as empty DataFrames so .to_excel() always exists
-        self.df_tr = pd.DataFrame()
-        self.df_mh = pd.DataFrame()
-        self.df_dc = pd.DataFrame()
-
-    def Fetch(self, RA_Bill_No, subcontractor_id):
-        # Query data filtered by both Bill No and Subcontractor ID
-        trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all()
-        mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all()
-        dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No, subcontractor_id=subcontractor_id).all()
-
-        # Convert SQL objects to DataFrames
-        self.df_tr = pd.DataFrame([c.__dict__ for c in trench])
-        self.df_mh = pd.DataFrame([c.__dict__ for c in mh])
-        self.df_dc = pd.DataFrame([c.__dict__ for c in dc])
-
-        # Clean Columns (remove SQLAlchemy internal state)
-        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)
-
-# --- 3. DEFINE ROUTES ---
-=======
  
 # --- BLUEPRINT DEFINITION ---
 file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
  
-# --- DATA WRAPPERS ---
+# --- Client class ---
 class ClientBill:
     def __init__(self):
         self.df_tr = pd.DataFrame()
         self.df_mh = pd.DataFrame()
         self.df_dc = pd.DataFrame()
+        self.df_laying = 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()
+        lay = LayingClient.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)
- 
+        self.df_laying = pd.DataFrame([c.serialize() for c in lay])
+  
         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_laying]:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
  
+# --- Subcontractor class ---
 class SubcontractorBill:
     def __init__(self):
         self.df_tr = pd.DataFrame()
@@ -95,120 +61,25 @@ class SubcontractorBill:
         trench = TrenchExcavation.query.filter_by(**filters).all()
         mh = ManholeExcavation.query.filter_by(**filters).all()
         dc = ManholeDomesticChamber.query.filter_by(**filters).all()
-        lay = ManholeDomesticChamber.query.filter_by(**filters).all()
+        lay = Laying.query.filter_by(**filters).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])
         self.df_laying = 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, self.df_laying]:
             if not df.empty:
                 df.drop(columns=drop_cols, errors="ignore", inplace=True)
- 
-<<<<<<< HEAD
-# --- ROUTES ---
- 
-# @file_report_bp.route("/report", methods=["GET", "POST"])
-# @login_required
-# def report_file():
-#     subcontractors = Subcontractor.query.all()
-#     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"
- 
-#         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"
-#         else:
-#             if not ra_bill_no:
-#                 flash("Please enter an RA Bill Number.", "danger")
-#                 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.")
-#             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")
-#         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)
->>>>>>> pankaj-dev
-=======
 
->>>>>>> pankaj-dev
-@file_report_bp.route("/report", methods=["GET", "POST"])
+
+# --- subcontractor report only  ---
+@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
 @login_required
 def report_file():
     subcontractors = Subcontractor.query.all()
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-    if request.method == "POST":
-        subcontractor_id = request.form.get("subcontractor_id")
-        ra_bill_no = request.form.get("ra_bill_no") # Collected from the updated HTML
-
-        if not subcontractor_id or not ra_bill_no:
-            flash("Please select a subcontractor and enter an RA Bill Number.", "danger")
-            return render_template("report.html", subcontractors=subcontractors)
-
-        subcontractor = Subcontractor.query.get(subcontractor_id)
-        
-        # Instantiate and Fetch Data
-        bill_gen = SubcontractorBill()
-        bill_gen.Fetch(RA_Bill_No=ra_bill_no, subcontractor_id=subcontractor_id)
-
-        # Check if any data was found
-        if bill_gen.df_tr.empty and bill_gen.df_mh.empty and bill_gen.df_dc.empty:
-            flash(f"No data found for {subcontractor.subcontractor_name} in RA Bill {ra_bill_no}", "warning")
-            return render_template("report.html", subcontractors=subcontractors)
-
-        # WRITE EXCEL FILE
-        output = io.BytesIO()
-        file_name = f"{subcontractor.subcontractor_name}_RA_{ra_bill_no}_Report.xlsx"
-
-        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            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")
-
-        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)
-
-# (ClientBill class and client_vs_all_subcontractor route would follow here...)
-
-
-=======
-    tables = None  # Match the variable name used in HTML
-=======
     tables = None 
->>>>>>> pankaj-dev
     selected_sc_id = None
     ra_bill_no = None
     download_all = False
@@ -221,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()
@@ -232,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":
@@ -252,7 +123,7 @@ def report_file():
             return send_file(output, download_name=file_name, as_attachment=True)
  
         # We add bootstrap classes directly to the pandas output
-        table_classes = "table table-hover table-bordered table-striped"
+        table_classes = "table table-bordered table-striped table-hover table-sm mb-0"
         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),
@@ -262,7 +133,7 @@ def report_file():
         selected_sc_id = subcontractor_id
  
     return render_template(
-        "report.html",
+        "subcontractor_report.html",
         subcontractors=subcontractors,
         tables=tables,
         selected_sc_id=selected_sc_id,
@@ -270,8 +141,8 @@ def report_file():
         download_all=download_all
     )
  
->>>>>>> pankaj-dev
-@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
+# --- client report only --- 
+@file_report_bp.route("/client_report", methods=["GET", "POST"])
 @login_required
 def client_vs_all_subcontractor():
     tables = {"tr": None, "mh": None, "dc": None}
@@ -283,136 +154,22 @@ def client_vs_all_subcontractor():
  
         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)
+            return render_template("client_report.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)
-<<<<<<< HEAD
-      
-        # GROUP SUBCONTRACTOR DATA
-        qty_cols = [
-            "Soft_Murum_0_to_1_5_total",
-            "Soft_Murum_1_5_to_3_0_total",
-            "Soft_Murum_3_0_to_4_5_total",
-            "Hard_Murum_0_to_1_5_total",
-            "Hard_Murum_1_5_and_above_total",
-            "Soft_Rock_0_to_1_5_total",
-            "Soft_Rock_1_5_and_above_total",
-            "Hard_Rock_0_to_1_5_total",
-            "Hard_Rock_1_5_to_3_0_total",
-            "Hard_Rock_3_0_to_4_5_total",
-            "Hard_Rock_4_5_to_6_0_total",
-            "Hard_Rock_6_0_to_7_5_total"
-        ]
-
-        mh_dc_qty_cols = [
-            "d_0_to_0_75",
-            "d_0_76_to_1_05",
-            "d_1_06_to_1_65",
-            "d_1_66_to_2_15",
-            "d_2_16_to_2_65",
-            "d_2_66_to_3_15",
-            "d_3_16_to_3_65",
-            "d_3_66_to_4_15",
-            "d_4_16_to_4_65",
-            "d_4_66_to_5_15",
-            "d_5_16_to_5_65",
-            "d_5_66_to_6_15",
-            "d_6_16_to_6_65",
-            "d_6_66_to_7_15",
-            "d_7_16_to_7_65",
-            "d_7_66_to_8_15",
-            "d_8_16_to_8_65",
-            "d_8_66_to_9_15",
-            "d_9_16_to_9_65",
-            "Domestic_Chambers"
-        ]
-
-        df_sub_tr_grp = (contractorBill.df_tr.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
-
-        df_sub_mh_grp = (contractorBill.df_mh.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
-
-        df_sub_dc_grp = (contractorBill.df_dc.groupby(["Location", "Node_No"], as_index=False)[mh_dc_qty_cols].sum())
-
-        # MERGE CLIENT VS SUBCONTRACTOR
-        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")
-        )
-
-        if "MH_NO" in clientBill.df_dc.columns:
-            clientBill.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
-
-        df_dc_cmp = clientBill.df_dc.merge(
-            df_sub_dc_grp,
-            on=["Location", "Node_No"],
-            how="left",
-            suffixes=("_Client", "_Sub")
-        )
-       
-        # CALCULATE DIFFERENCE
-        for col in qty_cols:
-            if f"{col}_Client" in df_tr_cmp.columns:
-                df_tr_cmp[f"{col}_Diff"] = (
-                    df_tr_cmp[f"{col}_Client"].fillna(0)
-                    - df_tr_cmp[f"{col}_Sub"].fillna(0)
-                )
-
-                print("Sum of df_tr_cmp::",df_tr_cmp)
-
-                df_mh_cmp[f"{col}_Diff"] = (
-                    df_mh_cmp[f"{col}_Client"].fillna(0)
-                    - df_mh_cmp[f"{col}_Sub"].fillna(0)
-                )
-                print("Sum of df_mh_cmp::",df_mh_cmp)
-
-
-        df_dc_cmp["Domestic_Chambers_Diff"] = (
-            df_dc_cmp["Domestic_Chambers_Client"].fillna(0)
-            - df_dc_cmp["Domestic_Chambers_Sub"].fillna(0)
-        )
-
-       
-        # EXPORT EXCEL
-        output = io.BytesIO()
-        file_name = f"Client_vs_All_Subcontractor_RA_{RA_Bill_No}.xlsx"
-
-        with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-            df_tr_cmp.to_excel(writer, sheet_name="Tr.Ex", index=False)
-            df_mh_cmp.to_excel(writer, sheet_name="Mh.Ex", index=False)
-            df_dc_cmp.to_excel(writer, sheet_name="MH & DC", index=False)
-
-        output.seek(0)
-
-        return send_file(
-            output,
-            download_name=file_name,
-            as_attachment=True,
-            mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-        )
-
-    return render_template("generate_comparison_client_vs_subcont.html")
-=======
  
         # --- 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)
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
  
         qty_cols = [...] # (Keep your existing list)
         mh_dc_qty_cols = [...] # (Keep your existing list)
- 
+        mh_lay_qty_cols =[...]
+
         def aggregate_df(df, group_cols, sum_cols):
             if df.empty:
                 # Create an empty DF with the correct columns to avoid Merge/Key Errors
@@ -427,29 +184,31 @@ def client_vs_all_subcontractor():
         # 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)
+        df_sub_dc_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_dc_qty_cols)
+        df_sub_lay_grp = aggregate_df(contractorBill.df_dc, ["Location", "MH_NO"], mh_lay_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]:
+        for df_client in [clientBill.df_tr, clientBill.df_mh, clientBill.df_dc, clientBill.df_laying ]:
             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"))
-            df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "Node_No"], how="left", suffixes=("_Client", "_Sub"))
+            df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
+            df_lay_cmp = clientBill.df_laying.merge(df_sub_lay_grp, on=["Location", "MH_NO"], how="left", suffixes=("_Client", "_Sub"))
         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) ...
+            return render_template("client_report.html", tables=tables, ra_val=ra_val)
  
+       
         # 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)
+        tables["laying"] = df_lay_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)  
- 
->>>>>>> pankaj-dev
+   
+    return render_template("client_report.html", tables=tables, ra_val=ra_val)   
+ 

app/routes/generate_comparison_report.py

@@ -4,16 +4,28 @@ import io
 
 from app.models.subcontractor_model import Subcontractor
 from app.models.trench_excavation_model import TrenchExcavation
-from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.manhole_excavation_model import ManholeExcavation
-from app.models.mh_ex_client_model import ManholeExcavationClient
 from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.laying_model import Laying
+
+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.models.laying_client_model import LayingClient
+
 from app.utils.helpers import login_required
+import re
+
 
 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
 
 
+# sum field  of pipe laying (pipe_150_mm)
+PIPE_MM_PATTERN = re.compile(r"^pipe_\d+_mm$")
+# sum fields of MH dc (d_0_to_0_75)
+D_RANGE_PATTERN = re.compile( r"^d_\d+(?:_\d+)?_to_\d+(?:_\d+)?$")
+
+
 # NORMALIZER
 def normalize_key(value):
     if value is None:
@@ -77,13 +89,13 @@ def build_comparison(client_rows, contractor_rows, key_field):
         client_total = sum(
             float(v or 0)
             for k, v in c.items()
-            if k.endswith("_total")
+            if k.endswith("_total") or D_RANGE_PATTERN.match(k) or PIPE_MM_PATTERN.match(k)
         )
 
         sub_total = sum(
             float(v or 0)
             for k, v in s.items()
-            if k.endswith("_total")
+            if k.endswith("_total") or D_RANGE_PATTERN.match(k) or PIPE_MM_PATTERN.match(k)
         )
 
         diff = client_total - sub_total
@@ -125,10 +137,10 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
     ws = writer.sheets[sheet_name]
 
     title_fmt = workbook.add_format({"bold": True, "font_size": 14})
-    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#D9EDF7"})
-    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7E1D9"})
-    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#FFF2CC"})
-    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#E2EFDA"})
+    client_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#B6DAED"})
+    sub_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F3A081"})
+    total_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#F7D261"})
+    diff_fmt = workbook.add_format({"bold": True, "border": 1, "bg_color": "#82DD49"})
     default_header_fmt = workbook.add_format({"bold": True,"border": 1,"bg_color": "#E7E6E6","align": "center","valign": "vcenter"})
 
 
@@ -143,12 +155,13 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
         title_fmt
     )
 
+
     for col_num, col_name in enumerate(df.columns):
         if col_name.startswith("Client-"):
             ws.write(3, col_num, col_name, client_fmt)
         elif col_name.startswith("Subcontractor-"):
             ws.write(3, col_num, col_name, sub_fmt)
-        elif col_name.endswith("Total"):
+        elif col_name.endswith("_total") or col_name.endswith("_total") :
             ws.write(3, col_num, col_name, total_fmt)
         elif col_name == "Diff":
             ws.write(3, col_num, col_name, diff_fmt)
@@ -190,6 +203,15 @@ def comparison_report():
             subcontractor_id=subcontractor_id
         ).all()]
         df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
+        # df_dc = build_comparison_mh_dc(dc_client, dc_sub, "MH_NO")
+
+        lay_client = [r.serialize() for r in LayingClient.query.all()]
+        lay_sub = [r.serialize() for r in Laying.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()]
+        df_lay = build_comparison(lay_client, lay_sub, "MH_NO")
+        # df_lay = build_comparison_laying(lay_client, lay_sub, "MH_NO")
+
 
         # -------- EXCEL --------
         output = io.BytesIO()
@@ -199,6 +221,7 @@ def comparison_report():
             write_sheet(writer, df_tr, "Tr.Ex", subcontractor.subcontractor_name)
             write_sheet(writer, df_mh, "Mh.Ex", subcontractor.subcontractor_name)
             write_sheet(writer, df_dc, "MH & DC", subcontractor.subcontractor_name)
+            write_sheet(writer, df_lay, "Laying", subcontractor.subcontractor_name)
 
         output.seek(0)
         return send_file(
@@ -211,3 +234,104 @@ def comparison_report():
     return render_template("generate_comparison_report.html",subcontractors=subcontractors)
 
 
+# def build_comparison_mh_dc(client_rows, contractor_rows, key_field):
+#     contractor_lookup = make_lookup(contractor_rows, key_field)
+#     mh_dc_fields = ManholeDomesticChamberClient.sum_mh_dc_fields()
+
+#     output = []
+
+#     for c in client_rows:
+#         loc = normalize_key(c.get("Location"))
+#         key = normalize_key(c.get(key_field))
+#         if not loc or not key:
+#             continue
+
+#         s = contractor_lookup.get((loc, key))
+#         if not s:
+#             continue
+
+#         client_total = sum(float(c.get(f, 0) or 0) for f in mh_dc_fields)
+#         sub_total = sum(float(s.get(f, 0) or 0) for f in mh_dc_fields)
+
+#         row = {
+#             "Location": loc,
+#             key_field.replace("_", " "): key
+#         }
+
+#         # CLIENT – ALL FIELDS
+#         for k, v in c.items():
+#             if k in ["id", "created_at"]:
+#                 continue
+#             row[f"Client-{k}"] = v
+
+#         row["Client-Total"] = round(client_total, 2)
+#         row[" "] = ""
+
+#         # SUBCONTRACTOR – ALL FIELDS
+#         for k, v in s.items():
+#             if k in ["id", "created_at", "subcontractor_id"]:
+#                 continue
+#             row[f"Subcontractor-{k}"] = v
+
+#         row["Subcontractor-Total"] = round(sub_total, 2)
+#         row["Diff"] = round(client_total - sub_total, 2)
+
+#         output.append(row)
+
+#     df = pd.DataFrame(output)
+#     df.columns = [format_header(col) for col in df.columns]
+#     return df
+
+
+# def build_comparison_laying(client_rows, contractor_rows, key_field):
+#     contractor_lookup = make_lookup(contractor_rows, key_field)
+#     laying_fields = Laying.sum_laying_fields()
+
+#     output = []
+
+#     for c in client_rows:
+#         loc = normalize_key(c.get("Location"))
+#         key = normalize_key(c.get(key_field))
+#         if not loc or not key:
+#             continue
+
+#         s = contractor_lookup.get((loc, key))
+#         if not s:
+#             continue
+
+#         client_total = sum(float(c.get(f, 0) or 0) for f in laying_fields)
+#         sub_total = sum(float(s.get(f, 0) or 0) for f in laying_fields)
+
+#         print("--------------",key,"----------")
+#         print("sum -client_total ",client_total)
+#         print("sum -sub_total ",sub_total)
+#         print("Diff ---- ",client_total - sub_total)
+#         print("------------------------")
+#         row = {
+#             "Location": loc,
+#             key_field.replace("_", " "): key
+#         }
+
+#         # CLIENT – ALL FIELDS
+#         for k, v in c.items():
+#             if k in ["id", "created_at"]:
+#                 continue
+#             row[f"Client-{k}"] = v
+
+#         row["Client-Total"] = round(client_total, 2)
+#         row[" "] = ""
+
+#         # SUBCONTRACTOR – ALL FIELDS
+#         for k, v in s.items():
+#             if k in ["id", "created_at", "subcontractor_id"]:
+#                 continue
+#             row[f"Subcontractor-{k}"] = v
+
+#         row["Subcontractor-Total"] = round(sub_total, 2)
+#         row["Diff"] = round(client_total - sub_total, 2)
+
+#         output.append(row)
+
+#     df = pd.DataFrame(output)
+#     df.columns = [format_header(col) for col in df.columns]
+#     return df

app/routes/subcontractor_routes.py

@@ -2,9 +2,108 @@ from flask import Blueprint, render_template, request, redirect, flash
 from app import db
 from app.models.subcontractor_model import Subcontractor
 from app.utils.helpers import login_required
-
+ 
 subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
-
+ 
+# ---------------- ADD -----------------
+@subcontractor_bp.route("/add")
+@login_required
+def add_subcontractor():
+    return render_template("subcontractor/add.html")
+@subcontractor_bp.route("/save", methods=["POST"])
+@login_required
+def save_subcontractor():
+    # 1. Get and clean the name from the form
+    name = request.form.get("subcontractor_name", "").strip()
+ 
+    # 2. Basic validation: Ensure the name isn't empty
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+ 
+    # 3. Check if a subcontractor with this name already exists
+    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
+ 
+    if existing_sub:
+        flash(f"Subcontractor with name '{name}' already exists!", "danger")
+        return redirect("/subcontractor/add")
+ 
+    # 4. If no duplicate is found, proceed to save
+    try:
+        subcontractor = Subcontractor(
+            subcontractor_name=name,
+            contact_person=request.form.get("contact_person"),
+            mobile_no=request.form.get("mobile_no"),
+            email_id=request.form.get("email_id"),
+            gst_no=request.form.get("gst_no")
+        )
+       
+        db.session.add(subcontractor)
+        db.session.commit()
+        flash("Subcontractor added successfully!", "success")
+       
+    except Exception as e:
+        db.session.rollback()
+        flash("An error occurred while saving. Please try again.", "danger")
+ 
+    return redirect("/subcontractor/list")
+ 
+# ---------------- LIST -----------------
+@subcontractor_bp.route("/list")
+@login_required
+def subcontractor_list():
+    subcontractors = Subcontractor.query.all()
+    return render_template("subcontractor/list.html", subcontractors=subcontractors)
+ 
+# ---------------- EDIT -----------------
+@subcontractor_bp.route("/edit/<int:id>")
+@login_required
+def edit_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+    return render_template("subcontractor/edit.html", subcontractor=subcontractor)
+ 
+# ---------------- UPDATE -----------------
+@subcontractor_bp.route("/update/<int:id>", methods=["POST"])
+@login_required
+def update_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+    new_name = request.form.get("subcontractor_name")
+ 
+    # Check if the new name is taken by someone ELSE (not this current ID)
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
+ 
+    if duplicate:
+        flash("Another subcontractor already uses this name.", "danger")
+        return redirect(f"/subcontractor/edit/{id}")
+ 
+    subcontractor.subcontractor_name = new_name
+   
+    db.session.commit()
+   
+    flash("Subcontractor updated successfully!", "success")
+    return redirect("/subcontractor/list")
+ 
+# ---------------- DELETE -----------------
+@subcontractor_bp.route("/delete/<int:id>")
+@login_required
+def delete_subcontractor(id):
+    subcontractor = Subcontractor.query.get_or_404(id)
+ 
+    db.session.delete(subcontractor)
+    db.session.commit()
+ 
+    flash("Subcontractor deleted successfully!", "success")
+    return redirect("/subcontractor/list")
+from flask import Blueprint, render_template, request, redirect, flash
+from app import db
+from app.models.subcontractor_model import Subcontractor
+from app.utils.helpers import login_required
+ 
+subcontractor_bp = Blueprint("subcontractor", __name__, url_prefix="/subcontractor")
+ 
 # ---------------- ADD -----------------
 @subcontractor_bp.route("/add")
 @login_required
@@ -14,50 +113,71 @@ def add_subcontractor():
 @subcontractor_bp.route("/save", methods=["POST"])
 @login_required
 def save_subcontractor():
-    subcontractor = Subcontractor(
-        subcontractor_name=request.form.get("subcontractor_name"),
-        contact_person=request.form.get("contact_person"),
-        mobile_no=request.form.get("mobile_no"),
-        email_id=request.form.get("email_id"),
-        gst_no=request.form.get("gst_no")
-    )
-    db.session.add(subcontractor)
-    db.session.commit()
-
-    flash("Subcontractor added successfully!", "success")
+    name = request.form.get("subcontractor_name", "").strip()
+    if not name:
+        flash("Subcontractor name cannot be empty.", "danger")
+        return redirect("/subcontractor/add")
+    existing_sub = Subcontractor.query.filter_by(subcontractor_name=name).first()
+ 
+    if existing_sub:
+        flash(f"Subcontractor with name '{name}' already exists!", "danger")
+        return redirect("/subcontractor/add")
+    try:
+        subcontractor = Subcontractor(
+            subcontractor_name=name,
+            contact_person=request.form.get("contact_person"),
+            mobile_no=request.form.get("mobile_no"),
+            email_id=request.form.get("email_id"),
+            gst_no=request.form.get("gst_no")
+        )
+       
+        db.session.add(subcontractor)
+        db.session.commit()
+        flash("Subcontractor added successfully!", "success")
+       
+    except Exception as e:
+        db.session.rollback()
+        flash("An error occurred while saving. Please try again.", "danger")
+ 
     return redirect("/subcontractor/list")
-
+ 
 # ---------------- LIST -----------------
 @subcontractor_bp.route("/list")
 @login_required
 def subcontractor_list():
     subcontractors = Subcontractor.query.all()
     return render_template("subcontractor/list.html", subcontractors=subcontractors)
-
+ 
 # ---------------- EDIT -----------------
 @subcontractor_bp.route("/edit/<int:id>")
 @login_required
 def edit_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
     return render_template("subcontractor/edit.html", subcontractor=subcontractor)
-
+ 
 # ---------------- UPDATE -----------------
 @subcontractor_bp.route("/update/<int:id>", methods=["POST"])
 @login_required
 def update_subcontractor(id):
     subcontractor = Subcontractor.query.get_or_404(id)
-
-    subcontractor.subcontractor_name = request.form.get("subcontractor_name")
-    subcontractor.contact_person = request.form.get("contact_person")
-    subcontractor.mobile_no = request.form.get("mobile_no")
-    subcontractor.email_id = request.form.get("email_id")
-    subcontractor.gst_no = request.form.get("gst_no")
-
+    new_name = request.form.get("subcontractor_name")
+ 
+    # Check if the new name is taken by someone ELSE (not this current ID)
+    duplicate = Subcontractor.query.filter(
+        Subcontractor.subcontractor_name == new_name,
+        Subcontractor.id != id
+    ).first()
+ 
+    if duplicate:
+        flash("Another subcontractor already uses this name.", "danger")
+        return redirect(f"/subcontractor/edit/{id}")
+ 
+    subcontractor.subcontractor_name = new_name
     db.session.commit()
-
+   
     flash("Subcontractor updated successfully!", "success")
     return redirect("/subcontractor/list")
-
+ 
 # ---------------- DELETE -----------------
 @subcontractor_bp.route("/delete/<int:id>")
 @login_required
@@ -68,4 +188,4 @@ def delete_subcontractor(id):
     db.session.commit()
 
     flash("Subcontractor deleted successfully!", "success")
-    return redirect("/subcontractor/list")
+    return redirect("/subcontractor/list")

app/services/dashboard_service.py

@@ -0,0 +1,49 @@
+from app.config import Config
+from app import db
+import matplotlib
+matplotlib.use("Agg")
+from app.routes.dashboard import plot_to_base64
+import matplotlib.pyplot as plt
+import io
+import base64
+
+from app.utils.plot_utils import plot_to_base64
+
+# Subcontractor models import
+from app.models.trench_excavation_model import TrenchExcavation
+
+# Client models import
+# from app.models.tr_ex_client_model import TrenchExcavationClient
+
+
+class DashboardService:
+
+
+    # bar chart
+    def bar_chart_of_tr_ex():
+        categories = ["Soft Murum", "Hard Murum", "Soft Rock", "Hard Rock"]
+        values = [120, 80, 150, 60]
+
+        tr = TrenchExcavation()
+
+        record = TrenchExcavation.query.first()
+        print(" RA_Bill_No::",record["RA_Bill_No"])
+
+        totals = tr.excavation_category_sums()
+
+        # print(totals["Soft_Murum_Total"])
+        # print(totals["Hard_Rock_Total"])
+
+
+        plt.figure()
+        plt.bar(categories, values)
+        plt.title("Trench Excavation Work Category Report")
+        plt.xlabel("Excavation category")
+        plt.ylabel("Quantity")
+
+        return plot_to_base64(plt)
+
+
+    def subcontractor_dash():
+            return True
+        

app/static/css/subcontractor.css

@@ -1,35 +0,0 @@
-body {
-    background: #f5f7fa;
-    font-family: Arial;
-    padding: 40px;
-}
-
-form {
-    width: 420px;
-    padding: 20px;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-}
-
-label {
-    margin-top: 10px;
-    display: block;
-    font-weight: bold;
-}
-
-input,
-textarea {
-    width: 100%;
-    padding: 8px;
-    margin-top: 4px;
-}
-
-button {
-    margin-top: 20px;
-    padding: 10px 20px;
-    background: #0055ff;
-    color: #fff;
-    border: 0;
-    cursor: pointer;
-}

app/templates/base.html

@@ -16,7 +16,9 @@
 <body class="bg-light">
 
     <!-- NAVBAR -->
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm">
+    <!-- <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm"> -->
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark shadow-sm fixed-top">
+
         <div class="container-fluid">
 
             <!-- Brand -->
@@ -66,15 +68,22 @@
                         </a>
                         <ul class="dropdown-menu dropdown-menu-dark">
                             <li>
-                                <a class="dropdown-item" href="/file/import">
+                                <a class="dropdown-item" href="/file/import_Subcontractor">
                                     <i class="bi bi-upload me-2"></i> Import File
                                 </a>
                             </li>
                             <li>
-                                <a class="dropdown-item" href="/file/report">
-                                    <i class="bi bi-download me-2"></i> Download Reports
+                                <a class="dropdown-item" href="/file/Subcontractor_report">
+                                    <i class="bi bi-download me-2"></i> Show Reports
                                 </a>
                             </li>
+
+                            <li>
+                                <a class="dropdown-item" href="/dashboard/subcontractor_dashboard">
+                                    <i class="bi bi-speedometer2 me-2"></i> Subcontractor Dashboard
+                                </a>
+                            </li>
+
                         </ul>
                     </li>
 
@@ -91,8 +100,8 @@
                             </li>
 
                             <li>
-                                <a class="dropdown-item" href="/file/client_vs_subcont">
-                                    <i class="bi bi-arrow-left-right me-2"></i> Comparison Report
+                                <a class="dropdown-item" href="/file/client_report">
+                                    <i class="bi bi-arrow-left-right me-2"></i> Show Report
                                 </a>
                             </li>
                         </ul>
@@ -170,25 +179,32 @@
         </div>
     </nav>
 
-    <!-- FLASH MESSAGES -->
-    <div class="container mt-3">
-        {% with messages = get_flashed_messages(with_categories=true) %}
-        {% if messages %}
-        {% for category, message in messages %}
-        <div class="alert alert-{{ category }} alert-dismissible fade show">
-            {{ message }}
-            <button class="btn-close" data-bs-dismiss="alert"></button>
-        </div>
-        {% endfor %}
-        {% endif %}
-        {% endwith %}
-    </div>
 
     <!-- PAGE CONTENT -->
-    <div class="container mt-4">
-        {% block content %}{% endblock %}
+    <div class="container-fluid vh-100 pt-5 overflow-hidden">
+        <!-- FLASH MESSAGES -->
+        <div class="container mt-3">
+            {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %}
+            {% for category, message in messages %}
+            <div class="alert alert-{{ category }} alert-dismissible fade show">
+                {{ message }}
+                <button class="btn-close" data-bs-dismiss="alert"></button>
+            </div>
+            {% endfor %}
+            {% endif %}
+            {% endwith %}
+        </div>
+
+
+        <div class="overflow-auto h-100">
+            <div class="container mt-4">
+                {% block content %}{% endblock %}
+            </div>
+        </div>
     </div>
 
+
     <!-- Bootstrap JS -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
 

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>
@@ -33,7 +22,7 @@
         </form>
     </div>
 
-    {% if tables.tr or tables.mh or tables.dc %}
+    {% 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>
 
@@ -50,6 +39,10 @@
                 <button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
                     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
+                    & Bedding Comparison</button>
         </ul>
 
         <div class="tab-content mt-3" id="reportTabsContent">
@@ -68,9 +61,14 @@
                     {{ tables.dc|safe }}
                 </div>
             </div>
-        </div>
-    </div>
-    {% endif %}
+            <div class="tab-pane fade" id="laying" role="tabpanel">
+                <div class="table-responsive" style="max-height: 500px;">
+                    {{ tables.laying|safe }}
+                </div>
 
-</div>
-{% endblock %}
+            </div>
+        </div>
+        {% endif %}
+
+    </div>
+    {% endblock %}

app/templates/dashboard.html

@@ -13,8 +13,8 @@
         <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>
+                    <h6>Test Total Work</h6>
+                    <h3 class="fw-bold">30%</h3>
                 </div>
             </div>
         </div>
@@ -23,8 +23,8 @@
         <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>
+                    <h6>test Completed</h6>
+                    <h3 class="fw-bold">35%</h3>
                 </div>
             </div>
         </div>
@@ -34,7 +34,7 @@
             <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>
+                    <h3 class="fw-bold">35%</h3>
                 </div>
             </div>
         </div>

app/templates/report.html

@@ -1,173 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="container mt-4">
-<<<<<<< HEAD
-    <h2 class="mb-4">Generate Subcontractor Report</h2>
-=======
-    <h2 class="mb-4 text-center">Generate Subcontractor Report</h2>
->>>>>>> pankaj-dev
-
-    {% 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 %}
-
-<<<<<<< HEAD
-    <div class="card p-4 shadow-sm">
-        <form method="POST">
-=======
-    <div class="card p-4 shadow-sm mx-auto" style="max-width: 600px;">
-        <form method="POST" id="reportForm">
->>>>>>> pankaj-dev
-            <div class="mb-3">
-                <label class="form-label fw-semibold">Select Subcontractor</label>
-                <select name="subcontractor_id" class="form-select" required>
-                    <option value="">-- Select Subcontractor --</option>
-                    {% for sc in subcontractors %}
-<<<<<<< HEAD
-                    <option value="{{ sc.id }}">{{ sc.subcontractor_name }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-
-            <div class="mb-3">
-                <label class="form-label fw-semibold">RA Bill Number</label>
-                <input type="text" name="ra_bill_no" class="form-control" placeholder="e.g. 01" required>
-            </div>
-
-            <button type="submit" class="btn btn-primary w-100">Generate Excel Report</button>
-=======
-                    <option value="{{ sc.id }}" {% if selected_sc_id==sc.id|string %}selected{% endif %}>
-                        {{ sc.subcontractor_name }}
-                    </option>
-                    {% endfor %}
-                </select>
-            </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 %}>
-                <label class="form-check-label fw-bold text-primary" for="downloadAllSwitch">
-                    Download All RA Bills for this Contractor
-                </label>
-            </div>
-
-            <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 '' }}">
-                <small class="text-muted">Required if "Download All" is off.</small>
-            </div>
-
-            <div class="row g-2">
-                <div class="col-md-6">
-                    <button type="submit" name="action" value="preview" class="btn btn-outline-primary w-100 py-2">
-                        <i class="fas fa-eye me-2"></i>Preview Data
-                    </button>
-                </div>
-                <div class="col-md-6">
-                    <button type="submit" name="action" value="download" class="btn btn-primary w-100 py-2">
-                        <i class="fas fa-download me-2"></i>Download Excel
-                    </button>
-                </div>
-            </div>
->>>>>>> pankaj-dev
-        </form>
-    </div>
-
-    {% if tables %}
-    <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">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">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="dc-tab" data-bs-toggle="tab" data-bs-target="#dc"
-                            type="button">Laying</button>
-                    </li>
-
-                </ul>
-            </div>
-            <div class="card-body tab-content" id="reportTabsContent">
-                <div class="tab-pane fade show active" id="tr" role="tabpanel">
-                    <div class="table-responsive">
-                        {{ tables.tr | safe }}
-                    </div>
-                </div>
-                <div class="tab-pane fade" id="mh" role="tabpanel">
-                    <div class="table-responsive">
-                        {{ tables.mh | safe }}
-                    </div>
-                </div>
-                <div class="tab-pane fade" id="dc" role="tabpanel">
-                    <div class="table-responsive">
-                        {{ tables.dc | safe }}
-                    </div>
-                </div>
-
-                <div class="tab-pane fade" id="laying" role="tabpanel">
-                    <div class="table-responsive">
-                        {{ tables.laying | safe }}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% endif %}
-</div>
-
-<style>
-    /* Styling specifically for pandas output */
-    .table-responsive .table {
-        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";
-        }
-    }
-
-    // Check status on load to handle form persistence
-    document.addEventListener("DOMContentLoaded", function () {
-        toggleRAInput(document.getElementById('downloadAllSwitch'));
-    });
-</script>
-{% endblock %}

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>
 

app/templates/subcontractor_dashboard.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<div class="container-fluid px-2 px-md-4">
+
+    <h4 class="mb-3 text-center text-md-start">Subcontractor Dashboard </h4>
+
+    <!-- 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>
+
+
+    </div>
+
+</div>
+
+{% endblock %}

app/templates/subcontractor_report.html

@@ -0,0 +1,142 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container my-4">
+
+    <h2 class="text-center mb-4">Generate Subcontractor Report</h2>
+
+    <!-- FORM -->
+    <div class="card shadow-sm p-3 p-md-4 mx-auto" style="max-width:600px;">
+        <form method="POST">
+
+            <div class="mb-3">
+                <label class="form-label fw-semibold">Select Subcontractor</label>
+                <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 %}>
+                        {{ sc.subcontractor_name }}
+                    </option>
+                    {% endfor %}
+                </select>
+            </div>
+
+            <div class="form-check form-switch mb-3">
+                <input class="form-check-input" type="checkbox" id="downloadAllSwitch" name="download_all" value="true"
+                    {% if download_all %}checked{% endif %}>
+                <label class="form-check-label fw-bold text-primary">
+                    Download All RA Bills
+                </label>
+            </div>
+
+            <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"
+                    value="{{ ra_bill_no or '' }}">
+            </div>
+
+            <div class="row g-2">
+                <div class="col-12 col-md-6">
+                    <button class="btn btn-outline-primary w-100" name="action" value="preview">
+                        Preview Data
+                    </button>
+                </div>
+                <div class="col-12 col-md-6">
+                    <button class="btn btn-primary w-100" name="action" value="download">
+                        Download Excel
+                    </button>
+                </div>
+            </div>
+
+        </form>
+    </div>
+
+    {% if tables %}
+    <!-- REPORT PREVIEW -->
+    <div class="mt-5">
+
+        <h3 class="text-center mb-3">Report Preview</h3>
+
+        <div class="card shadow-sm">
+
+            <!-- MOBILE SCROLLABLE TABS -->
+            <div class="card-header p-0">
+                <ul class="nav nav-tabs flex-nowrap overflow-auto">
+                    <li class="nav-item">
+                        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#tr">
+                            Trench Excavation
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#mh">
+                            Manhole Excavation
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#dc">
+                            Manhole & Domestic Chambers
+                        </button>
+                    </li>
+                    <li class="nav-item">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#laying">
+                            Pipe Laying
+                        </button>
+                    </li>
+                </ul>
+            </div>
+
+            <!-- TAB CONTENT -->
+            <div class="card-body tab-content">
+
+                <div class="tab-pane fade show active" id="tr">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.tr | safe }}
+                    </div>
+                </div>
+
+                <div class="tab-pane fade" id="mh">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.mh | safe }}
+                    </div>
+                </div>
+
+                <div class="tab-pane fade" id="dc">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.dc | safe }}
+                    </div>
+                </div>
+
+                <div class="tab-pane fade" id="laying">
+                    <div class="table-responsive overflow-auto">
+                        {{ tables.laying | safe }}
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+    {% endif %}
+
+</div>
+
+<!-- BOOTSTRAP-ONLY JS -->
+<script>
+    function toggleRAInput() {
+        const checkbox = document.getElementById("downloadAllSwitch");
+        const input = document.getElementById("ra_bill_input");
+        const container = document.getElementById("ra_bill_container");
+
+        if (checkbox.checked) {
+            input.value = "";
+            input.disabled = true;
+            container.classList.add("opacity-50");
+        } else {
+            input.disabled = false;
+            container.classList.remove("opacity-50");
+        }
+    }
+
+    document.addEventListener("DOMContentLoaded", toggleRAInput);
+    document.getElementById("downloadAllSwitch").addEventListener("change", toggleRAInput);
+</script>
+{% endblock %}

app/utils/plot_utils.py

@@ -0,0 +1,10 @@
+import base64
+from io import BytesIO
+import matplotlib
+matplotlib.use("Agg")
+
+def plot_to_base64(plt):
+    img = BytesIO()
+    plt.savefig(img, format="png", bbox_inches="tight")
+    img.seek(0)
+    return base64.b64encode(img.read()).decode("utf-8")

requirements.txt

@@ -7,3 +7,5 @@ python-dotenv
 cryptography
 xlsxwriter
 matplotlib 
+flask_sqlalchemy
+flask_migrate