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

changes of genrate report

Browse Source
This commit is contained in:
pjpatil12
2025-12-24 16:37:07 +05:30
parent 7cb01bd9fb
commit bdd7312a5e
3 changed files with 146 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
app/routes/file_report.py
View File

@@ -11,41 +11,36 @@ from app import db
import pandas as pd
import io
from enum import Enum
file_report_bp = Blueprint("file_report", __name__, url_prefix="/file")
# get report by contractor id and dowanload
@file_report_bp.route("/report", methods=["GET", "POST"])
def report_file():
subcontractors = Subcontractor.query.all()
class BillType(Enum):
Client = 1
Subcontractor = 2
if request.method == "POST":
subcontractor_id = request.form.get("subcontractor_id")
class SubcontractorBill:
df_tr = []
df_mh = []
df_dc =[]
if not subcontractor_id:
flash("Please select a subcontractor.", "danger")
return render_template("report.html", subcontractors=subcontractors)
def Fetch(self, RA_Bill_No):
# CLIENT DATA (RA BILL WISE)
# Fetch subcontractor for file name
subcontractor = Subcontractor.query.get(subcontractor_id)
manhole_excavation = ManholeExcavation.query.filter_by(subcontractor_id=subcontractor_id).all()
trench_excavation = TrenchExcavation.query.filter_by(subcontractor_id=subcontractor_id).all()
domestic_chamber = ManholeDomesticChamber.query.filter_by(subcontractor_id=subcontractor_id).all()
trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No).all()
self.df_tr = pd.DataFrame([c.__dict__ for c in trench])
self.df_mh = pd.DataFrame([c.__dict__ for c in mh])
self.df_dc = pd.DataFrame([c.__dict__ for c in dc])
# Convert to DataFrame
df_mh_exc = pd.DataFrame([m.__dict__ for m in manhole_excavation])
df_trench = pd.DataFrame([t.__dict__ for t in trench_excavation])
df_domestic = pd.DataFrame([d.__dict__ for d in domestic_chamber])
# CLEAN COLUMNS
drop_cols = ["id","created_at","Remarks","_sa_instance_state"]
# Drop unnecessary SQLAlchemy fields
drop_cols = ["id", "subcontractor_id", "created_at", "_sa_instance_state","Remarks"]
df_mh_exc.drop(columns=drop_cols, errors="ignore", inplace=True)
df_trench.drop(columns=drop_cols, errors="ignore", inplace=True)
df_domestic.drop(columns=drop_cols, errors="ignore", inplace=True)
for df in [self.df_tr, self.df_mh, self.df_dc]:
if not df.empty:
df.drop(columns=drop_cols, errors="ignore", inplace=True)
mh_exc_columns = [
"Location", "MH_NO", "Upto_IL_Depth", "Cutting_Depth", "ID_of_MH_m",
@@ -106,19 +101,40 @@ def report_file():
"Domestic_Chambers"
]
# Reorder columns serial wise
df_mh_exc = df_mh_exc.reindex(columns=mh_exc_columns, fill_value="")
df_trench = df_trench.reindex(columns=trench_columns, fill_value="")
df_domestic = df_domestic.reindex(columns=domestic_columns, fill_value="")
# Reorder columns serial wise
df_mh_exc = self.df_mh.reindex(columns=mh_exc_columns, fill_value="")
df_trench = self.df_tr.reindex(columns=trench_columns, fill_value="")
df_domestic = self.df_dc.reindex(columns=domestic_columns, fill_value="")
# get report by contractor id and dowanload
@file_report_bp.route("/report", methods=["GET", "POST"])
def report_file():
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)
subcontractorBill = SubcontractorBill()
# WRITE EXCEL FILE
output = io.BytesIO()
file_name = f"{subcontractor.subcontractor_name}_Report.xlsx"
with pd.ExcelWriter(output, engine="xlsxwriter") as writer:
df_trench.to_excel(writer, index=False, sheet_name="Tr.Ex.")
df_mh_exc.to_excel(writer, index=False, sheet_name="MH.Ex.")
df_domestic.to_excel(writer, index=False, sheet_name="MH & DC")
subcontractorBill.df_tr.to_excel(writer, index=False, sheet_name="Tr.Ex.")
subcontractorBill.df_mh.to_excel(writer, index=False, sheet_name="MH.Ex.")
subcontractorBill.df_dc.to_excel(writer, index=False, sheet_name="MH & DC")
output.seek(0)
@@ -132,9 +148,30 @@ def report_file():
return render_template("report.html", subcontractors=subcontractors)
class ClientBill:
df_tr = []
df_mh = []
df_dc =[]
def Fetch(self, RA_Bill_No):
# CLIENT DATA (RA BILL WISE)
trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
self.df_tr = pd.DataFrame([c.__dict__ for c in trench])
self.df_mh = pd.DataFrame([c.__dict__ for c in mh])
self.df_dc = pd.DataFrame([c.__dict__ for c in dc])
# CLEAN COLUMNS
drop_cols = ["id","created_at","Remarks","_sa_instance_state"]
for df in [self.df_tr, self.df_mh, self.df_dc]:
if not df.empty:
df.drop(columns=drop_cols, errors="ignore", inplace=True)
@file_report_bp.route("/client_vs_subcont", methods=["GET", "POST"])
def client_vs_all_subcontractor():
@@ -147,31 +184,13 @@ def client_vs_all_subcontractor():
flash("Please select RA Bill No.", "danger")
return render_template("generate_comparison_client_vs_subcont.html")
clientBill = ClientBill()
clientBill.Fetch(RA_Bill_No=RA_Bill_No)
contractorBill = SubcontractorBill()
contractorBill.Fetch(RA_Bill_No=RA_Bill_No)
# CLIENT DATA (RA BILL WISE)
client_trench = TrenchExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
client_mh = ManholeExcavationClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
client_dc = ManholeDomesticChamberClient.query.filter_by(RA_Bill_No=RA_Bill_No).all()
df_client_tr = pd.DataFrame([c.__dict__ for c in client_trench])
df_client_mh = pd.DataFrame([c.__dict__ for c in client_mh])
df_client_dc = pd.DataFrame([c.__dict__ for c in client_dc])
# ALL SUBCONTRACTOR DATA
sub_trench = TrenchExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
sub_mh = ManholeExcavation.query.filter_by(RA_Bill_No=RA_Bill_No).all()
sub_dc = ManholeDomesticChamber.query.filter_by(RA_Bill_No=RA_Bill_No).all()
df_sub_tr = pd.DataFrame([s.__dict__ for s in sub_trench])
df_sub_mh = pd.DataFrame([s.__dict__ for s in sub_mh])
df_sub_dc = pd.DataFrame([s.__dict__ for s in sub_dc])
# CLEAN COLUMNS
drop_cols = ["id","created_at","Remarks","_sa_instance_state"]
for df in [df_client_tr, df_client_mh, df_client_dc,df_sub_tr, df_sub_mh, df_sub_dc]:
if not df.empty:
df.drop(columns=drop_cols, errors="ignore", inplace=True)
# GROUP SUBCONTRACTOR DATA
@@ -213,31 +232,31 @@ def client_vs_all_subcontractor():
"Domestic_Chambers"
]
df_sub_tr_grp = (df_sub_tr.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
df_sub_tr_grp = (contractorBill.df_tr.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
df_sub_mh_grp = (df_sub_mh.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
df_sub_mh_grp = (contractorBill.df_mh.groupby(["Location", "MH_NO"], as_index=False)[qty_cols].sum())
df_sub_dc_grp = (df_sub_dc.groupby(["Location", "Node_No"], as_index=False)[mh_dc_qty_cols].sum())
df_sub_dc_grp = (contractorBill.df_dc.groupby(["Location", "Node_No"], as_index=False)[mh_dc_qty_cols].sum())
# MERGE CLIENT VS SUBCONTRACTOR
df_tr_cmp = df_client_tr.merge(
df_tr_cmp = clientBill.df_tr.merge(
df_sub_tr_grp,
on=["Location", "MH_NO"],
how="left",
suffixes=("_Client", "_Sub")
)
df_mh_cmp = df_client_mh.merge(
df_mh_cmp = clientBill.df_mh.merge(
df_sub_mh_grp,
on=["Location", "MH_NO"],
how="left",
suffixes=("_Client", "_Sub")
)
if "MH_NO" in df_client_dc.columns:
df_client_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
if "MH_NO" in clientBill.df_dc.columns:
clientBill.df_dc.rename(columns={"MH_NO": "Node_No"}, inplace=True)
df_dc_cmp = df_client_dc.merge(
df_dc_cmp = clientBill.df_dc.merge(
df_sub_dc_grp,
on=["Location", "Node_No"],
how="left",