update code upto v1
This commit is contained in:
Binary file not shown.
@@ -95,6 +95,7 @@ def comparison_report():
|
|||||||
row_data[f"Client_{col}"] = val
|
row_data[f"Client_{col}"] = val
|
||||||
|
|
||||||
row_data["Client_Total"] = round(client_total, 2)
|
row_data["Client_Total"] = round(client_total, 2)
|
||||||
|
row_data[" - "] = " "
|
||||||
|
|
||||||
# Subcontractor columns
|
# Subcontractor columns
|
||||||
for col, val in row2.__dict__.items():
|
for col, val in row2.__dict__.items():
|
||||||
@@ -103,8 +104,10 @@ def comparison_report():
|
|||||||
row_data[f"Sub_{col}"] = val
|
row_data[f"Sub_{col}"] = val
|
||||||
|
|
||||||
row_data["Sub_Total"] = round(contractor_total, 2)
|
row_data["Sub_Total"] = round(contractor_total, 2)
|
||||||
|
row_data["--"] = " "
|
||||||
row_data["Diff"] = round(diff, 2)
|
row_data["Diff"] = round(diff, 2)
|
||||||
|
|
||||||
|
|
||||||
combined_rows_tr_ex.append(row_data)
|
combined_rows_tr_ex.append(row_data)
|
||||||
|
|
||||||
# Console log
|
# Console log
|
||||||
@@ -181,6 +184,7 @@ def comparison_report():
|
|||||||
row_data[f"Client_{col}"] = val
|
row_data[f"Client_{col}"] = val
|
||||||
|
|
||||||
row_data["Client_Total"] = round(client_total, 2)
|
row_data["Client_Total"] = round(client_total, 2)
|
||||||
|
row_data[" - "] = " "
|
||||||
|
|
||||||
# Subcontractor columns
|
# Subcontractor columns
|
||||||
for col, val in row2.__dict__.items():
|
for col, val in row2.__dict__.items():
|
||||||
@@ -189,6 +193,7 @@ def comparison_report():
|
|||||||
row_data[f"Sub_{col}"] = val
|
row_data[f"Sub_{col}"] = val
|
||||||
|
|
||||||
row_data["Sub_Total"] = round(contractor_total, 2)
|
row_data["Sub_Total"] = round(contractor_total, 2)
|
||||||
|
row_data["--"] = " "
|
||||||
row_data["Diff"] = round(diff, 2)
|
row_data["Diff"] = round(diff, 2)
|
||||||
|
|
||||||
combined_rows_mh_ex.append(row_data)
|
combined_rows_mh_ex.append(row_data)
|
||||||
@@ -267,7 +272,8 @@ def comparison_report():
|
|||||||
row_data[f"Client_{col}"] = val
|
row_data[f"Client_{col}"] = val
|
||||||
|
|
||||||
row_data["Client_Total"] = round(client_total, 2)
|
row_data["Client_Total"] = round(client_total, 2)
|
||||||
|
row_data[" - "] = " "
|
||||||
|
|
||||||
# Subcontractor columns
|
# Subcontractor columns
|
||||||
for col, val in row2.__dict__.items():
|
for col, val in row2.__dict__.items():
|
||||||
if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
|
if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
|
||||||
@@ -275,6 +281,7 @@ def comparison_report():
|
|||||||
row_data[f"Sub_{col}"] = val
|
row_data[f"Sub_{col}"] = val
|
||||||
|
|
||||||
row_data["Sub_Total"] = round(contractor_total, 2)
|
row_data["Sub_Total"] = round(contractor_total, 2)
|
||||||
|
row_data["--"] = " "
|
||||||
row_data["Diff"] = round(diff, 2)
|
row_data["Diff"] = round(diff, 2)
|
||||||
|
|
||||||
combined_rows_mh_dc.append(row_data)
|
combined_rows_mh_dc.append(row_data)
|
||||||
@@ -311,3 +318,5 @@ def comparison_report():
|
|||||||
"generate_comparison_report.html",
|
"generate_comparison_report.html",
|
||||||
subcontractors=subcontractors
|
subcontractors=subcontractors
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user