From a0edb173cb6ac433432a5584ad70d44a51df1e9f Mon Sep 17 00:00:00 2001
From: pjpatil12 <pankajjpatil2001@gmail.com>
Date: Mon, 15 Dec 2025 00:15:34 +0530
Subject: [PATCH] genrate report of TrEx, MhEx, MhDc model commit

---
 ...ole_domestic_chamber_model.cpython-313.pyc | Bin 3486 -> 3502 bytes
 .../mh_dc_client_model.cpython-313.pyc        | Bin 2904 -> 2904 bytes
 app/models/manhole_domestic_chamber_model.py  |   2 +-
 ...generate_comparison_report.cpython-313.pyc | Bin 6450 -> 13843 bytes
 app/routes/generate_comparison_report.py      | 233 ++++++++++++------
 .../__pycache__/file_service.cpython-313.pyc  | Bin 15473 -> 15473 bytes
 6 files changed, 164 insertions(+), 71 deletions(-)

diff --git a/app/models/__pycache__/manhole_domestic_chamber_model.cpython-313.pyc b/app/models/__pycache__/manhole_domestic_chamber_model.cpython-313.pyc
index 81afb3c9f92a4c34445ef2edb5da5571aaec986e..9229432915cd52fe11e5fbed86644b5dcd7e6c0c 100644
GIT binary patch
delta 98
zcmbOyy-u3@GcPX}0}z~Mw%^EokZCgu^Bm^M4ootPs*~R`N;CRQUdSfQtR56F@uDz4
zuO(BFW-y-=Ly=Z6f06d)n`|!_8FeNf;<&<X5N~c4Uy>hh7;mt7BIiA3MwiJ2ym|m7
Cvm6ot

delta 76
zcmZ1{Jx`kZGcPX}0}%XMWw(+0Ak*e4Ojnp0y(TYY6J}Nm@|$>3n4i~@sYoN3Pl};P
gGnl_fYx7OE7mSSBlMiuR*}RPNCNrb+<OW_n0CfWwtpET3

diff --git a/app/models/__pycache__/mh_dc_client_model.cpython-313.pyc b/app/models/__pycache__/mh_dc_client_model.cpython-313.pyc
index 2c41e376828a3c55ecd02c5ef343c02297a3aac3..65591057b266a0207380036734b1ede2a15f1af7 100644
GIT binary patch
delta 19
Zcmca1c0-KoGcPX}0}#}%+sNg|4FEdN1w8-&

delta 19
Zcmca1c0-KoGcPX}0}%XOwUNt@8vs4K1-SqK

diff --git a/app/models/manhole_domestic_chamber_model.py b/app/models/manhole_domestic_chamber_model.py
index 319c54c..f5ce492 100644
--- a/app/models/manhole_domestic_chamber_model.py
+++ b/app/models/manhole_domestic_chamber_model.py
@@ -17,7 +17,7 @@ class ManholeDomesticChamber(db.Model):
  
     # Excavation categories 
     d_0_to_0_75 = db.Column(db.Float)
-    d_1_06_to_1_65 = db.Column(db.Float)
+    d_0_76_to_1_05 = db.Column(db.Float)
     d_1_06_to_1_65 = db.Column(db.Float)
     d_1_66_to_2_15 = db.Column(db.Float)
     d_2_16_to_2_65 = db.Column(db.Float)
diff --git a/app/routes/__pycache__/generate_comparison_report.cpython-313.pyc b/app/routes/__pycache__/generate_comparison_report.cpython-313.pyc
index fa5eaa900c5e9288fef1cb12f1eeb910dca0bee9..119bc41490fae33cf7987bd173ae18345317d244 100644
GIT binary patch
delta 3053
zcmai0eQXnD7=Q0>YrC%Pdh2()vUVTLrm*jBtB#Se$zZUlJsT6Yc$BtmBU`&%2a-iR
zg2sRd5l&?gfk})R@#7B{6XGBEr|~b=7;>bM_z{(u_(vBACK{s8z4vzAD#Tm%{GR9c
zd!Fas=e_IQebFvWo9-KpdIX2NeEZa`)^jE&wQ{a0Ee=}*iw|*#tJq^5wh1=u>-X3N
z2XOj5PQf`&)gi8O+{GC<W0(=#<L*ee(rDwsnYb#>+(L6~nC7b8C`4qTW<npZ{H{cS
z@?6D^>BGrcVJbD3s}ho_MDpCD3vKq1SZXpoog7ThBr|hU@qx+M%z>m3pmH^jSESR_
zVO_$5(0gbMN%M?XYNU5C##ns$5dDo#dYu_&s>b$#!1>KBD8-IJs(M7t(W(%w`W7_A
z?7Fo42Xm~9>XCe9f#nIEiKbZTi2fLLS$d#vGO{5`%}rI0jVt{a%h<~bZnZ*R+q%Bi
zsAWUn?-4o-=b4>|Y9jlgc|#dE2fztZ32YByJBjTfY^SkJVLOYhfbAT%N5DR%N$H~6
z$Wd^ipEfcNPJq!yUM2V%!Q%u^5PXB+n*>i1e2d`Q1kVzDhv0dF?-G2U-~z!*1V12%
z*C^f8)!VL+{ay#0efgnIq$nHg?+|rGx~UIQKPbB_+SYd2KDJn>h+HdpMXX!9t5S|A
z9r>uJ6g(5+936DZIrd_KiF{n}idcuD4$jHB!ZeLiE-`9~TrY|RFY4mloQJCkGd>ip
zeqx4~WZ0jWu}RH<pA-BQZW8F}h<t+2CEc!c+do@7t%IwLIyoQb50^Daw`iN>Hq@8Z
zjS3d2-;kl~(wBxdu=fo6%mG?(LD{@^G@VHLM$=Niaj$v4d}Olu*`xE?kzKyczQF<M
zj4@5UwEW2UIZe5wPtAKpp%RJ&gJO(|F@eeH6MQQ_m*(5}P|lE0K#AJ<RwV*ZBdoQn
zT8F9uC|ZYF2cSfqss^A&xUN&x#E>ciC}K!01W=+bRRd6?P>wA;6?pPk$mA-?T3h+<
zP|l<T-Cat08{dj!KoWP6xC_Vad>h1~GEW;J)P#0kP3XW02^dDzJ9t$G#QB{>2PCno
zcM?5BbU>_!NIf8qyA)l76@x<vwLuq2=q3#SvEEG@0OGiZ=zt_v>wAbECORP2!%98A
zJ^0adj-E>Av^%7K%-eKs!Kqw&yEMoyh~{`YH7CU4b7_H}ndFm4bB6fzR5CS3B1=3y
zb6_f!Oz=Ybl?)+uiG#!|DNn@LmqYa5av(`LcpB+0>o&MyIX-eof3x$IXMwQ7e`d_M
ze7t&pnW#ZETV+ps*3&L~db6J1JKn8%2GwlKBf3U^Pj5U`f4VVWjw)OabjaBvJ36zD
zPTA3yb@Zv3&h3!tT%T#n>rkzKMd$g&?Om8&+0rY!x1Ab3Ihfa=YP-z#WZ52>-FBn@
z4r`Oy<+SBFifWd=w%(PVvD!2YGJ5lymao}1Q{oVfJbe$Ir;*iuq4#|6im&54OXo=)
zETje&+nx1v%bxzMr=Ki&2ld!B!)n7>M_6_YWE}%!&4Wtn|1Da?tNxL-U8p@*E3=J@
z>Wb^KY@N(DEyh+EiVc7)vqh?$W&>o-BB^D7)ZyWaWJMW}`Vz9T97qEp#lm@v8emN&
zsa0Aa%_StO1G2h=v{V3TEg@}sAnllJ%Cb!|yJe|u)ltbd!^Jnc@;*>Rne}H`zszo4
zd;wpphAi74vw<Z_nLLOmFH$ghkW5}AVe%lEyhy_2K{9!fgvo<s@&YMRt1x+xOkQBA
zRhT?TCNGjOd5}zABw_L(nY>8C<Uuldk%Y;Ec_-eEHBwx48Gv<fWLG^#AZtoUuL;Oa
zC1h<CkjhTV>{`=RzZuB760)8JvY~|RX{-izGiHm|sL7&UBX7PLS$$bcJN&S8$m_p4
za&hF2r}k>^#a`(v+piVlAC51M<`LB)E!lmpC;pVApY4NfcMMk9;LRGm3kR1%H-=Ue
ze{dtY8<RW#)FM+jZ;-Y+p7zv&d)wIaS4Mf~J?QH^;%6TE^+#H?0k3qz@sk*c&CWK@
zz&mt0(>$Yoit-8aEy~B$k5L}$_=TDCuFs$36LG%qxKw(m?^6bHgeo{+PBR-zC1M$2
z1Og$gFgl)3#b%N`pR1lorjpWGr@c{m++9ca!6M-dPU?j-9-dD23Cg#W@)??$kiK<#
fHFwe8yJ)BMo3q=ND5Es@8AR`<R%yi-E<@VCNB&a-

delta 537
zcmbQ7v&o3>GcPX}0}yz(*<}VPP2`hc+%Zu-->*nGm?4<MTck)NhEa(jm@`H+m@Amu
zlDSAMMl47lqyZHK^91t-^XW4M^II|n3rI1TLZyo&(m6B*C;r(m`59vlhXv58sSME!
zlP_?~PA+G1VrEG^yLk`OaSq0)$qq6ilN)3>S@}bmf?_5MaEl6x88hVxM2EmE3W@`&
z5q0Db77v!NWMX2-6Aa}GN`%QG=up96$zZ8qX-j4W2B0T^(3A-xtH2P-ACx@VPgY(y
z6{bFvKUgMIAXqk7ZgPXHHH*Aok>KS0vc-%dla1vJfn=&&)a3JWK9jZO^BIjd&z4`u
z#3(-5OUY+)w~7mgP>~qWoFb9Q*Hvareyb|YA_U}47E!C>P60ANoZ`1En`f#eurTE@
zO}007VgJs|z-Re^ZSodlD``m}^D3{!uVNmc!pmGjA>7PYxVb_k*)=66bDBJqU`{M3
zDB=am-C`?9%u7iuF7gI)ihL)BnQA(LELh3#8Avh|B?F0D95%W6DWy57c11-%E+Y^Z
zg97IRGb1D8eFpcd4DL@EEbcPc-(_&P%ist^laHI4i+VCMvVCS|VDe=A$OK{+6$14D
E05ZFE!T<mO

diff --git a/app/routes/generate_comparison_report.py b/app/routes/generate_comparison_report.py
index 29c80cb..cc44e28 100644
--- a/app/routes/generate_comparison_report.py
+++ b/app/routes/generate_comparison_report.py
@@ -5,6 +5,8 @@ from app.models.trench_excavation_model import TrenchExcavation
 from app.models.tr_ex_client_model import TrenchExcavationClient
 from app.models.manhole_excavation_model import ManholeExcavation
 from app.models.mh_ex_client_model import ManholeExcavationClient
+from app.models.manhole_domestic_chamber_model import ManholeDomesticChamber
+from app.models.mh_dc_client_model import ManholeDomesticChamberClient
 
 from app import db
 
@@ -30,7 +32,7 @@ def comparison_report():
             )
 
         subcontractor = Subcontractor.query.get_or_404(subcontractor_id)
-
+        # --------------------------- Tr.Ex model -----------------------------
         contractor_tr_ex = TrenchExcavation.query.filter_by(
             subcontractor_id=subcontractor_id
         ).all()
@@ -111,91 +113,179 @@ def comparison_report():
                 f"Client={client_total} | Sub={contractor_total} | Diff={diff}"
             )
 
-        # -------- Tr.Ex model ----------
+       
         df_tr_ex = pd.DataFrame(combined_rows_tr_ex)
 
-        # manhole ex
-        # contractor_mh_ex = ManholeExcavation.query.filter_by(
-        #     subcontractor_id=subcontractor_id
-        # ).all()
+        # --------------------------- Mh.Ex model -----------------------------
+        contractor_mh_ex = ManholeExcavation.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()
 
-        # client_mh_ex = ManholeExcavationClient.query.filter_by(
-        #     subcontractor_id=subcontractor_id
-        # ).all()
+        client_mh_ex = ManholeExcavationClient.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()
 
-        # combined_rows_mh_ex = []
+        combined_rows_mh_ex = []
 
-        # for row1, row2 in zip(client_mh_ex, contractor_mh_ex):
-        #     # -------- Tr.Ex CLIENT TOTAL ----------
-        #     client_total = (
-        #         (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)
-        #     )
+        for row1, row2 in zip(client_mh_ex, contractor_mh_ex):
+            # -------- Tr.Ex CLIENT TOTAL ----------
+            client_total = (
+                (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) 
+                
+            )
 
-        #     # -------- SUBCONTRACTOR TOTAL ----------
-        #     contractor_total = (
-        #         (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)
-        #     )
+            # -------- SUBCONTRACTOR TOTAL ----------
+            contractor_total = (
+                (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_3_0_to_4_5_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 = client_total - contractor_total
+            diff = client_total - contractor_total
 
-        #     # -------- COMBINED ROW ----------
-        #     row_data = {
-        #         "Location": row1.Location,
-        #         "MH No": row1.MH_NO,
-        #     }
+            # -------- COMBINED ROW ----------
+            row_data = {
+                "Location": row1.Location,
+                "MH No": row1.MH_NO,
+            }
 
-        #     # Client columns
-        #     for col, val in row1.__dict__.items():
-        #         if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
-        #             continue
-        #         row_data[f"Client_{col}"] = val
+            # Client columns
+            for col, val in row1.__dict__.items():
+                if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
+                    continue
+                row_data[f"Client_{col}"] = val
 
-        #     row_data["Client_Total"] = round(client_total, 2)
+            row_data["Client_Total"] = round(client_total, 2)
 
-        #     # Subcontractor columns
-        #     for col, val in row2.__dict__.items():
-        #         if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
-        #             continue
-        #         row_data[f"Sub_{col}"] = val
+            # Subcontractor columns
+            for col, val in row2.__dict__.items():
+                if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
+                    continue
+                row_data[f"Sub_{col}"] = val
 
-        #     row_data["Sub_Total"] = round(contractor_total, 2)
-        #     row_data["Diff"] = round(diff, 2)
+            row_data["Sub_Total"] = round(contractor_total, 2)
+            row_data["Diff"] = round(diff, 2)
 
-        #     combined_rows_tr_ex.append(row_data)
+            combined_rows_mh_ex.append(row_data)
 
-        #     # Console log
-        #     print(
-        #         f"{row1.Location} | {row1.MH_NO} | "
-        #         f"Client={client_total} | Sub={contractor_total} | Diff={diff}"
-        #     )
+            # Console log
+            print(
+                f"{row1.Location} | {row1.MH_NO} | "
+                f"Client={client_total} | Sub={contractor_total} | Diff={diff}"
+            )
+
+        df_mh_ex = pd.DataFrame(combined_rows_mh_ex)
 
 
+        # ---------------------------- MH dC Model --------------------------
+        contractor_mh_dc = ManholeDomesticChamber.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()
+
+        client_mh_dc = ManholeDomesticChamberClient.query.filter_by(
+            subcontractor_id=subcontractor_id
+        ).all()
+
+        combined_rows_mh_dc = []
+
+        for row1, row2 in zip(client_mh_dc, contractor_mh_dc):
+            client_total = (
+                (row1.d_0_to_1_5 or 0) +	
+                (row1.d_1_5_to_2_0 or 0) +	
+                (row1.d_2_0_to_2_5 or 0) +	
+                (row1.d_2_5_to_3_0 or 0) +	
+                (row1.d_3_0_to_3_5 or 0) +	
+                (row1.d_3_5_to_4_0 or 0) +	
+                (row1.d_4_0_to_4_5 or 0) +	
+                (row1.d_4_5_to_5_0 or 0) +	
+                (row1.d_5_0_to_5_5 or 0) +	
+                (row1.d_5_5_to_6_0 or 0) +	
+                (row1.d_6_0_to_6_5 or 0) +	
+                (row1.Domestic_Chambers or 0)
+            )
+
+            contractor_total = (
+                (row2.d_0_to_0_75 or 0) + 	 
+                (row2.d_0_76_to_1_05 or 0) + 	 
+                (row2.d_1_06_to_1_65 or 0) + 	 
+                (row2.d_1_66_to_2_15 or 0) + 	 
+                (row2.d_2_16_to_2_65 or 0) + 	 
+                (row2.d_2_66_to_3_15 or 0) + 	 
+                (row2.d_3_16_to_3_65 or 0) + 	 
+                (row2.d_3_66_to_4_15 or 0) + 	 
+                (row2.d_4_16_to_4_65 or 0) + 	 
+                (row2.d_4_66_to_5_15 or 0) + 	 
+                (row2.d_5_16_to_5_65 or 0) + 	
+                (row2.d_5_66_to_6_15 or 0) +	
+                (row2.d_6_16_to_6_65 or 0) +	
+                (row2.d_6_66_to_7_15 or 0) +	
+                (row2.d_7_16_to_7_65 or 0) +	
+                (row2.d_7_66_to_8_15 or 0) +	
+                (row2.d_8_16_to_8_65 or 0) +	
+                (row2.d_8_66_to_9_15 or 0) +	
+                (row2.d_9_16_to_9_65 or 0) +	
+                (row2.Domestic_Chambers or 0)
+            )
+
+            diff = client_total - contractor_total
+
+            # -------- COMBINED ROW ----------
+            row_data = {
+                "Location": row1.Location,
+                "Node No": row1.Node_No,
+            }
+
+            # Client columns
+            for col, val in row1.__dict__.items():
+                if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
+                    continue
+                row_data[f"Client_{col}"] = val
+
+            row_data["Client_Total"] = round(client_total, 2)
+
+            # Subcontractor columns
+            for col, val in row2.__dict__.items():
+                if col.startswith("_") or col in ["id", "created_at", "subcontractor_id"]:
+                    continue
+                row_data[f"Sub_{col}"] = val
+
+            row_data["Sub_Total"] = round(contractor_total, 2)
+            row_data["Diff"] = round(diff, 2)
+
+            combined_rows_mh_dc.append(row_data)
+
+            # Console log
+            print(
+                f"{row1.Location} | {row1.Node_No} | "
+                f"Client={client_total} | Sub={contractor_total} | Diff={diff}"
+            )
+
+        df_mh_dc = pd.DataFrame(combined_rows_mh_dc)
 
 
 
@@ -204,6 +294,9 @@ def comparison_report():
 
         with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
             df_tr_ex.to_excel(writer, index=False, sheet_name="Tr.Ex")
+            df_mh_ex.to_excel(writer,index=False,sheet_name="Mh.Ex")
+            df_mh_dc.to_excel(writer,index=False,sheet_name="MH & DC")
+
 
         output.seek(0)
 
diff --git a/app/services/__pycache__/file_service.cpython-313.pyc b/app/services/__pycache__/file_service.cpython-313.pyc
index e46e567f373a363c2c258f7fdca42588d68264b0..a478f171190db35267217f4474a0d6c52b2ee392 100644
GIT binary patch
delta 19
ZcmexZ@v(yIGcPX}0}xcL+sKt}0{}~?26_Mh

delta 19
ZcmexZ@v(yIGcPX}0}$A*-N==00{}`j20Q=&