From 1d476c48516a78be890b560c4991d385b465eaaa Mon Sep 17 00:00:00 2001
From: pjpatil12 <pankajjpatil2001@gmail.com>
Date: Sun, 14 Dec 2025 11:49:45 +0530
Subject: [PATCH] Download client vs sub cont report with show diff. commit

---
 ...generate_comparison_report.cpython-313.pyc | Bin 5163 -> 6729 bytes
 app/routes/generate_comparison_report.py      | 219 ++++++------------
 2 files changed, 67 insertions(+), 152 deletions(-)

diff --git a/app/routes/__pycache__/generate_comparison_report.cpython-313.pyc b/app/routes/__pycache__/generate_comparison_report.cpython-313.pyc
index 0d06938058e56098f827fd32d10962e1d8327a80..0458d9298e9259902f7bcdf3881a6511d13bd412 100644
GIT binary patch
literal 6729
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
DZMo!9

delta 2446
zcma)7ZEO=|9DnY*Uf<ult?gQR8|qeGx{a+HlOe)3vdLbg#}UH7+O;=r-0termcR_D
zAJoi*Xz=;q`~)$+OfiPU#1J%*L_c8Mhc%1YybxmifZ+oPFe1Td;`6k<UN;7KP4E8C
z|Nr~{{x8q}x%;{ELW_0PVle`Iotxa9Iukr=^-%L?n_us31)T991zpFS(GW4Oy*LwR
z<}9r=XYHXmn-4_FW?1_Q6SALO`08-T9Ma^RSj|b3S#~4`bJJ|wA8(@ea76YJU96~!
zwZ*bhtUVUNk8FGjTCoRqbgy;9PS~|0+=l+O1z2d?5QNPb)ESN-pFMCG+Djmk!eAUG
z*QY>q8>iqXI?lMOy!K8=Cj=H}fnIeqBF^sj;2a6ASX@*}yr$HK&e(l^NYW2!W?ZUS
zWtera=yQ96!cdH|hT*#1*97a!463=pAP0yNz31?u2lfUYXX3(O6<Fzm>?6t;A&+&G
z8r@lGw67Roohxo0ZebVhbDP5-gbf>EuoYvvaW94)el7H43_3}5oAg-F;Q#7d47yAS
z8ajUSn<hF*b&Zoy#Vbm{>#ioiYh2*4Hbb|94DAAgcmgCox(R)42=3KJs1jUcp2$-3
zD3-j+qQg_IKS+sso{2WDO9U@@J!jyIoT*2{0$%q-1QXr-Fh^CMPnE3bDr4SHj!O?6
zZGPB+v#LenppT_QR~UExe^KE|MZ<WD5)SwE6995}f6^C3^Y~UpkNaRzWcA6Ls;bzg
z>WdPY%%;kLkI*G^v=v>ad@pl0MIl<MqUbh^Vt!1N#{|h&1+l6@j@;Ug-(yua8*hlV
zm$IwA^G4pnTX`F257#K2XTiv40GI#^s#4l`SPhZ9GL!c49SU)@Q<2oC+9c7z)6p)~
zqDWT2IXY<3Srv4rVpE^^gg7`S=jx$pAi8)aAKj%I6^VCoZmyQAE06A@5cOq*{gE7=
z5`qKdr)(xZ4vy&Va;(bm;I%ruxOICf$v8M8@8rCk54~d!nzWPnWV84$YSBgW(=`pF
za1;8?oH3Il7}CmgDhV6W4NG@k)+MB=+_adH8395GW@KGTOi#rVg3Kf&0VaeH1-D=?
zNXG6axrJ(GYy&3~@e}cEN)p*ar_us`@8%{Fl9+|@L{@_AA@XIJG51ZS1TkA)ZSGG^
zP6|*E69U^(wrsbtYaByppEco@oqf`DIu27ANsMv1>FGE;g}$_k6pOqz9^G_2+v@Ba
z8+mbWbch=pjrENU^CP32tc6leOv(%=z?6`YHJRMB%*4}aK}@11XTRPJ$w|j`i_Uhm
z;0zowB%zd!;remW7)-**+Nt=2FeU3rF~lSr6U8Ema!E^g6)ll#lDIJ0n4FB2Nzgw|
zzm|NESmbxTVM=0&Y*c1}MjyMrrSCClsJ@rJ%b>aXT>iEmxN2v0e{S7fFgMQ*%pJW}
z@1Hxq90(Tz;rWx_JAd$A_I}r}6c|_z3>5-HOMwGd4=&Y@%?@7kZkjuF?(|2e=Z{uU
z!GY!AP$4+96eK9`*z60}T%I{!!5h9vExC5g_Wy2ny+8Wy=*s4nmFCtJcFRg*_pUnz
zt>5|=&{}MFOkmq{_dKA^^Wm`%j-78_s@*bcL>A9W4Ry=rV8I+b&&&&p&mUSO3;w<i
zSbJ_8(c7M`jsyjsIY2#-8~5Gsr?C20%g(<u9$fT~J+;Hl`kz9z!`t+~)N~HFYZls#
z!+Uh0I&{nPDMR`K51=`3;|{nV%f(I13Xt^d3$Tjs049iD-#aZOb5p`|FpZbweUM3_
z8{W3wyG&ahy$GDQCn!L>mnm<7@-F(qmujytmu!nzrUviO`zY!-wW<O15LI442~+$B
DZy5%O

diff --git a/app/routes/generate_comparison_report.py b/app/routes/generate_comparison_report.py
index d363e2d..254f83f 100644
--- a/app/routes/generate_comparison_report.py
+++ b/app/routes/generate_comparison_report.py
@@ -11,55 +11,7 @@ import io
 generate_report_bp = Blueprint("generate_report", __name__, url_prefix="/report")
 
 
-COMPARISON_COLUMNS = [
-    ("Soft Murum 0–1.5",
-     "Soft_Murum_0_to_1_5_total",
-     "Soft_Murum_0_to_1_5_total"),
 
-    ("Soft Murum 1.5–3.0",
-     "Soft_Murum_1_5_to_3_0_total",
-     "Soft_Murum_1_5_to_3_0_total"),
-
-    ("Soft Murum 3.0–4.5",
-     "Soft_Murum_3_0_to_4_5_total",
-     "Soft_Murum_3_0_to_4_5_total"),
-
-    ("Hard Murum 0–1.5",
-     "Hard_Murum_0_to_1_5_total",
-     "Hard_Murum_0_to_1_5_total"),
-
-    ("Hard Murum Above 1.5",
-     "Hard_Murum_1_5_and_above_total",
-     "Hard_Murum_1_5_to_3_0_total"),
-
-    ("Soft Rock 0–1.5",
-     "Soft_Rock_0_to_1_5_total",
-     "Soft_Rock_0_to_1_5_total"),
-
-    ("Soft Rock Above 1.5",
-     "Soft_Rock_1_5_and_above_total",
-     "Soft_Rock_1_5_to_3_0_total"),
-
-    ("Hard Rock 0–1.5",
-     "Hard_Rock_0_to_1_5_total",
-     "Hard_Rock_0_to_1_5_total"),
-
-    ("Hard Rock Above 1.5",
-     "Hard_Rock_1_5_and_above_total",
-     "Hard_Rock_1_5_to_3_0_total"),
-
-    ("Hard Rock 3.0–4.5",
-     "Hard_Rock_3_0_to_4_5_total",
-     "Hard_Rock_3_0_to_4_5_total"),
-
-    ("Hard Rock 4.5–6.0",
-     "Hard_Rock_4_5_to_6_0_total",
-     "Hard_Rock_4_5_to_6_0_total"),
-
-    ("Hard Rock 6.0–7.5",
-     "Hard_Rock_6_0_to_7_5_total",
-     "Hard_Rock_6_0_to_7_5_total"),
-]
 @generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
 def comparison_report():
     subcontractors = Subcontractor.query.all()
@@ -77,9 +29,73 @@ def comparison_report():
         contractor_rows = TrenchExcavation.query.filter_by(subcontractor_id=subcontractor_id).all()
         client_rows = TrenchExcavationClient.query.filter_by(subcontractor_id=subcontractor_id).all()
 
+       
+
+        diff_rows = []
+
+        for row1, row2 in zip(client_rows, contractor_rows):
+
+            total1 = (
+                (row1.Marshi_Muddy_Slushy_0_to_1_5_total or 0) +
+                (row1.Marshi_Muddy_Slushy_1_5_to_3_0_total or 0) +
+                (row1.Marshi_Muddy_Slushy_3_0_to_4_5_total or 0) +
+                (row1.Soft_Murum_0_to_1_5_total or 0) +
+                (row1.Soft_Murum_1_5_to_3_0_total or 0) +
+                (row1.Soft_Murum_3_0_to_4_5_total or 0) +
+                (row1.Hard_Murum_0_to_1_5_total or 0) +
+                (row1.Hard_Murum_1_5_to_3_0_total or 0) +
+                (row1.Hard_Murum_3_0_to_4_5_total or 0) +
+                (row1.Soft_Rock_0_to_1_5_total or 0) +
+                (row1.Soft_Rock_1_5_to_3_0_total or 0) +
+                (row1.Soft_Rock_3_0_to_4_5_total or 0) +
+                (row1.Hard_Rock_0_to_1_5_total or 0) +
+                (row1.Hard_Rock_1_5_to_3_0_total or 0) +
+                (row1.Hard_Rock_3_0_to_4_5_total or 0) +
+                (row1.Hard_Rock_4_5_to_6_0_total or 0) +
+                (row1.Hard_Rock_6_0_to_7_5_total or 0)
+            )
+
+            total2 = (
+                (row2.Soft_Murum_0_to_1_5_total or 0) +
+                (row2.Soft_Murum_1_5_to_3_0_total or 0) +
+                (row2.Soft_Murum_3_0_to_4_5_total or 0) +
+                (row2.Hard_Murum_0_to_1_5_total or 0) +
+                (row2.Hard_Murum_1_5_and_above_total or 0) +
+                (row2.Soft_Rock_0_to_1_5_total or 0) +
+                (row2.Soft_Rock_1_5_and_above_total or 0) +
+                (row2.Hard_Rock_0_to_1_5_total or 0) +
+                (row2.Hard_Rock_1_5_and_above_total or 0) +
+                (row2.Hard_Rock_4_5_to_6_0_total or 0) +
+                (row2.Hard_Rock_6_0_to_7_5_total or 0)
+            )
+
+            diff = total1 - total2
+
+            # ---- store for excel ----
+            diff_rows.append({
+                "Location": row1.Location,
+                "Node No": row1.MH_NO,
+                "Client Sum": round(total1, 2),
+                "Subcontractor Sum": round(total2, 2),
+                "Diff": round(diff, 2)
+            })
+
+            # optional console print
+            print(
+                f"Location : {row1.Location} | "
+                f"MH_NO : {row1.MH_NO} | "
+                f"Client : {total1} | "
+                f"Sub : {total2} | "
+                f"Diff : {diff}"
+            )
+
+
+
         # Convert to DataFrame
         df_contractor = pd.DataFrame([r.__dict__ for r in contractor_rows])
         df_client = pd.DataFrame([r.__dict__ for r in client_rows])
+        df_diff = pd.DataFrame(diff_rows, columns=["Location", "Node No", "Client Sum", "Subcontractor Sum", "Diff"])
+
 
         # Drop unwanted columns
         drop_cols = ["id", "subcontractor_id", "created_at", "_sa_instance_state", "Remarks"]
@@ -90,24 +106,6 @@ def comparison_report():
         df_contractor = df_contractor.apply(pd.to_numeric, errors="coerce").fillna(0)
         df_client = df_client.apply(pd.to_numeric, errors="coerce").fillna(0)
 
-        # CREATE SUMMARY
-     
-        summary = []
-
-        for label, cont_col, client_col in COMPARISON_COLUMNS:
-            cont_sum = round(df_contractor.get(cont_col, pd.Series()).sum(), 2)
-            client_sum = round(df_client.get(client_col, pd.Series()).sum(), 2)
-            diff = round(client_sum - cont_sum, 2)
-
-            summary.append({
-                "Excavation Type": label,
-                "Subcontractor Total": cont_sum,
-                "Client Total": client_sum,
-                "Difference (Client - Subcontractor)": diff
-            })
-
-        df_summary = pd.DataFrame(summary)
-
         
         # EXPORT EXCEL
         output = io.BytesIO()
@@ -116,7 +114,9 @@ def comparison_report():
         with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
             df_contractor.to_excel(writer, index=False, sheet_name="Contractor_Data")
             df_client.to_excel(writer, index=False, sheet_name="Client_Data")
-            df_summary.to_excel(writer, index=False, sheet_name="Comparison_Summary")
+            df_diff.to_excel(writer, index=False, sheet_name="Diff")
+            
+           
 
         output.seek(0)
 
@@ -131,88 +131,3 @@ def comparison_report():
 
 
 
-
-# @generate_report_bp.route("/comparison_report", methods=["GET", "POST"])
-# def report_subcont_client():
-#     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)
-        
-#         trench_excavation1 = TrenchExcavation.query.filter_by(subcontractor_id=subcontractor_id).all()
-#         trench_excavation2 = TrenchExcavationClient.query.filter_by(subcontractor_id=subcontractor_id).all()
-        
-
-
-#         # Convert to DataFrame
-#         df_tr_ex1 = pd.DataFrame([m.__dict__ for m in trench_excavation1])
-#         df_tr_ex2 = pd.DataFrame([t.__dict__ for t in trench_excavation2])
-        
-
-#         # Drop unnecessary SQLAlchemy fields
-#         drop_cols = ["id", "subcontractor_id", "created_at", "_sa_instance_state","Remarks"]
-
-#         df_tr_ex1.drop(columns=drop_cols, errors="ignore", inplace=True)
-#         df_tr_ex2.drop(columns=drop_cols, errors="ignore", inplace=True)
-    
-
-#         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"
-#         ]
-
-       
-#         # Reorder columns serial wise 
-#         df_tr_ex1 = df_tr_ex1.reindex(columns=trench_columns, fill_value="")
-#         df_tr_ex2 = df_tr_ex2.reindex(columns=trench_columns, fill_value="")
-      
-
-#         #  WRITE EXCEL FILE
-#         output = io.BytesIO()
-#         file_name = f"{subcontractor.subcontractor_name}_Report.xlsx"
-
-#         with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
-#             df_tr_ex1.to_excel(writer, index=False, sheet_name="Tr.Ex-contractor.")
-#             df_tr_ex2.to_excel(writer, index=False, sheet_name="Tr.Ex-client.")
-
-
-#         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_report.html", subcontractors=subcontractors)
-