From e0541ff80c3faf3016c04e820eecdca38febaa47 Mon Sep 17 00:00:00 2001 From: pjpatil12 Date: Wed, 14 Jan 2026 11:12:40 +0530 Subject: [PATCH 1/3] comment on html page --- app/routes/dashboard.py | 3 ++- app/templates/dashboard.html | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/routes/dashboard.py b/app/routes/dashboard.py index a7e92ec..3aebc4c 100644 --- a/app/routes/dashboard.py +++ b/app/routes/dashboard.py @@ -27,12 +27,13 @@ def bar_chart(): plt.xlabel("Category") plt.ylabel("Count") + return plot_to_base64() # Pie chart def pie_chart(): labels = ["Completed", "In Progress", "Pending"] - sizes = [65, 20, 15] + sizes = [55, 20, 25] plt.figure() plt.pie(sizes, labels=labels, autopct="%1.1f%%", startangle=140) diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html index f9ab350..cdfa26e 100644 --- a/app/templates/dashboard.html +++ b/app/templates/dashboard.html @@ -4,11 +4,12 @@
-

Dashboard

+

Comparison Software Solapur(UGD)

+
@@ -18,6 +19,7 @@
+
@@ -27,6 +29,7 @@
+
From aad9b2b9670a2ba4549fec4c8818a50859726e1b Mon Sep 17 00:00:00 2001 From: pjpatil12 Date: Thu, 15 Jan 2026 12:27:29 +0530 Subject: [PATCH 2/3] import modify subcontractor sheet Laying model import added --- app/models/laying_model.py | 47 +++++++++++++++++++++++++ app/services/file_service.py | 67 +++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 app/models/laying_model.py diff --git a/app/models/laying_model.py b/app/models/laying_model.py new file mode 100644 index 0000000..e43a1f1 --- /dev/null +++ b/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"" + + def serialize(self): + return {c.name: getattr(self, c.name) for c in self.__table__.columns} diff --git a/app/services/file_service.py b/app/services/file_service.py index 82d3819..cbb07f3 100644 --- a/app/services/file_service.py +++ b/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." @@ -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): From 0bb670b15263787afc474bbe1047f2e7e100058b Mon Sep 17 00:00:00 2001 From: pjpatil12 Date: Thu, 15 Jan 2026 14:21:36 +0530 Subject: [PATCH 3/3] suncontractor and client download ui changes -a --- app/routes/file_report.py | 490 ++++++++---------- ...generate_comparison_client_vs_subcont.html | 77 ++- app/templates/report.html | 130 ++++- 3 files changed, 383 insertions(+), 314 deletions(-) diff --git a/app/routes/file_report.py b/app/routes/file_report.py index 83f5b11..6c47deb 100644 --- a/app/routes/file_report.py +++ b/app/routes/file_report.py @@ -1,3 +1,5 @@ +import pandas as pd +import io from flask import Blueprint, render_template, request, send_file, flash from app.models.subcontractor_model import Subcontractor from app.models.manhole_excavation_model import ManholeExcavation @@ -7,297 +9,233 @@ 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 - -import pandas as pd -import io -from enum import Enum - -file_report_bp = Blueprint("file_report", __name__, url_prefix="/file") - -class BillType(Enum): - Client = 1 - Subcontractor = 2 - -class SubcontractorBill: - df_tr = [] - df_mh = [] - df_dc =[] - - def Fetch(self, RA_Bill_No): - # CLIENT DATA (RA BILL WISE) - - trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all() - mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all() - dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No).all() - - 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 - drop_cols = ["id","created_at","Remarks","_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) - - mh_exc_columns = [ - "Location", "MH_NO", "Upto_IL_Depth", "Cutting_Depth", "ID_of_MH_m", - "Ex_Dia_of_Manhole", "Area_of_Manhole", - - "Soft_Murum_0_to_1_5", "Soft_Murum_1_5_to_3_0", "Soft_Murum_3_0_to_4_5", - "Hard_Murum_0_to_1_5", "Hard_Murum_1_5_to_3_0", - "Soft_Rock_0_to_1_5", "Soft_Rock_1_5_to_3_0", - "Hard_Rock_0_to_1_5", "Hard_Rock_1_5_to_3_0", - "Hard_Rock_3_0_to_4_5", "Hard_Rock_4_5_to_6_0", "Hard_Rock_6_0_to_7_5", - - "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_and_above_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", - - "Remarks", "Total" - ] - - trench_columns = [ - "Location", "MH_NO", "CC_length", "Invert_Level", "MH_Top_Level", - "Ground_Level", "ID_of_MH_m", "Actual_Trench_Length", "Pipe_Dia_mm", - - "Width_0_to_2_5", "Width_2_5_to_3_0", "Width_3_0_to_4_5", "Width_4_5_to_6_0", - - "Upto_IL_Depth", "Cutting_Depth", "Avg_Depth", - - "Soft_Murum_0_to_1_5", "Soft_Murum_1_5_to_3_0", "Soft_Murum_3_0_to_4_5", - "Hard_Murum_0_to_1_5", "Hard_Murum_1_5_to_3_0", - "Soft_Rock_0_to_1_5", "Soft_Rock_1_5_to_3_0", - "Hard_Rock_0_to_1_5", "Hard_Rock_1_5_to_3_0", - "Hard_Rock_3_0_to_4_5", "Hard_Rock_4_5_to_6_0", "Hard_Rock_6_0_to_7_5", - - "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_and_above_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", - - "Remarks", "Total" - ] - - domestic_columns = [ - "Location", "Node_No", "Depth_of_MH", - "d_0_to_0_75", "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" - ] - - - - # Reorder columns serial wise - df_mh_exc = self.df_mh.reindex(columns=mh_exc_columns, fill_value="") - df_trench = self.df_tr.reindex(columns=trench_columns, fill_value="") - df_domestic = self.df_dc.reindex(columns=domestic_columns, fill_value="") - - - -# get report by contractor id and dowanload -@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") - - if not subcontractor_id: - flash("Please select a subcontractor.", "danger") - return render_template("report.html", subcontractors=subcontractors) - - # Fetch subcontractor for file name - subcontractor = Subcontractor.query.get(subcontractor_id) - subcontractorBill = SubcontractorBill() - - - # WRITE EXCEL FILE - output = io.BytesIO() - file_name = f"{subcontractor.subcontractor_name}_Report.xlsx" - - with pd.ExcelWriter(output, engine="xlsxwriter") as writer: - subcontractorBill.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.") - subcontractorBill.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.") - subcontractorBill.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) - - -class ClientBill: - df_tr = [] - df_mh = [] - df_dc =[] - - def Fetch(self, RA_Bill_No): - # CLIENT DATA (RA BILL WISE) +# --- 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.__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 - drop_cols = ["id","created_at","Remarks","_sa_instance_state"] - + 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() + + 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() + + 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) + +# --- 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) +@file_report_bp.route("/report", methods=["GET", "POST"]) +@login_required +def report_file(): + subcontractors = Subcontractor.query.all() + tables = None # Match the variable name used in HTML + 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") + + 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) + + # If download is clicked, return file immediately + if action == "download": + 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) + + # 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) + } + selected_sc_id = subcontractor_id + + return render_template( + "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 select RA Bill No.", "danger") - return render_template("generate_comparison_client_vs_subcont.html") - + 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) - - # 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) + + 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: + # 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] + # Ensure group_cols exist in the DF + for col in group_cols: + 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")) + df_dc_cmp = clientBill.df_dc.merge(df_sub_dc_grp, on=["Location", "Node_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) ... + + # 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) + \ No newline at end of file diff --git a/app/templates/generate_comparison_client_vs_subcont.html b/app/templates/generate_comparison_client_vs_subcont.html index 9a3e62b..56b7eef 100644 --- a/app/templates/generate_comparison_client_vs_subcont.html +++ b/app/templates/generate_comparison_client_vs_subcont.html @@ -1,11 +1,9 @@ {% extends "base.html" %} {% block content %} -
+
+

File Comparison

-

File Comparison

- - {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} {% for category, message in messages %} @@ -17,27 +15,62 @@ {% endif %} {% endwith %} -
- +
+ + - - - - - - - - +
+
+ +
+
+ +
+
-
+ + {% if tables.tr or tables.mh or tables.dc %} +
+

Comparison Preview

+ + + +
+
+
+ {{ tables.tr|safe }} +
+
+
+
+ {{ tables.mh|safe }} +
+
+
+
+ {{ tables.dc|safe }} +
+
+
+
+ {% endif %} +
{% endblock %} \ No newline at end of file diff --git a/app/templates/report.html b/app/templates/report.html index e6dd6c4..8027075 100644 --- a/app/templates/report.html +++ b/app/templates/report.html @@ -2,10 +2,8 @@ {% block content %}
+

Generate Subcontractor Report

-

File Report

- - {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} {% for category, message in messages %} @@ -17,23 +15,123 @@ {% endif %} {% endwith %} -
+
+
+
+ + +
- +
+ + +
- - - + Required if "Download All" is off. +
- {% for sc in subcontractors %} - - {% endfor %} - - - +
+
+ +
+
+ +
+
-
+ + {% if tables %} +
+
+

Report Preview

+ +
+
+ +
+
+
+
+ {{ tables.tr | safe }} +
+
+
+
+ {{ tables.mh | safe }} +
+
+
+
+ {{ tables.dc | safe }} +
+
+
+
+
+ {% endif %}
+ + + + {% endblock %} \ No newline at end of file