pjpatil12/Comparison_Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comaparison code optimization and cal sum/total mh dc and laying

Browse Source
This commit is contained in:
pjpatil12
2026-01-20 16:33:45 +05:30
parent 90c18383da
commit 68a694d2c7
15 changed files with 286 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/routes/dashboard.py
View File

@@ -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():
@@ -28,7 +32,7 @@ def bar_chart():
plt.ylabel("Count")
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("/")
@@ -68,15 +72,16 @@ def dashboard():
)
# subcontractor dashboard
@dashboard_bp.route("/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=bar_chart(),
pie_chart=pie_chart(),
histogram=histogram_chart()
)
bar_chart=tr_dash
)

2
app/routes/file_import.py
View File

@@ -43,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)

11
app/routes/file_report.py
View File

@@ -72,7 +72,12 @@ class SubcontractorBill:
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)
print(":::-- TR. EX --:::",self.df_tr,"\n")
print(":::--MH EX--:::",self.df_mh,"\n")
print(":::--MH DC--:::",self.df_dc,"\n")
print(":::--Laying--:::",self.df_laying,"\n")
# --- subcontractor report only ---
@file_report_bp.route("/Subcontractor_report", methods=["GET", "POST"])
@login_required
@@ -153,7 +158,7 @@ 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)
@@ -163,7 +168,7 @@ def client_vs_all_subcontractor():
# --- 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)

126
app/routes/generate_comparison_report.py
View File

@@ -14,10 +14,18 @@ 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:
@@ -81,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
@@ -129,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"})
@@ -147,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)
@@ -194,12 +203,14 @@ 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 --------
@@ -223,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