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

change of comparison report of 4 model update

Browse Source
This commit is contained in:
Pankaj J Patil
2026-02-26 12:44:04 +05:30
parent cf7d1636f9
commit 568428b5d0
7 changed files with 114 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/routes/generate_comparison_report.py
View File

@@ -143,21 +143,29 @@ def build_comparison(client_rows, contractor_rows, key_field):
# EXCEL SHEET WRITER
def write_sheet(writer, df, sheet_name, subcontractor_name):
workbook = writer.book
# write dataframe (data already correct)
df.to_excel(writer, sheet_name=sheet_name, index=False, startrow=3)
ws = writer.sheets[sheet_name]
# formats
title_fmt = workbook.add_format({"bold": True, "font_size": 14})
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"})
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"})
default_header_fmt = workbook.add_format({
"bold": True,
"border": 1,
"bg_color": "#E7E6E6",
"align": "center",
"valign": "vcenter"
})
# titles
ws.merge_range(
0, 0, 0, len(df.columns) - 1,
"CLIENT vs SUBCONTRACTOR",
@@ -168,22 +176,22 @@ def write_sheet(writer, df, sheet_name, subcontractor_name):
f"Subcontractor Name - {subcontractor_name}",
title_fmt
)
# header formatting
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") or col_name.endswith("_total") :
elif 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)
else:
ws.write(3, col_num, col_name, default_header_fmt)
ws.set_column(col_num, col_num, 20)
# REPORT ROUTE
@generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
@@ -234,8 +242,8 @@ def comparison_report():
with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
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)
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(
@@ -348,4 +356,4 @@ def comparison_report():
# df = pd.DataFrame(output)
# df.columns = [format_header(col) for col in df.columns]
# return df
# return df