optimize and add new service of get report and download report.

This commit is contained in:
2026-04-03 12:10:47 +05:30
parent 0b72adef7d
commit 73cd97f3c8
27 changed files with 1416 additions and 1292 deletions

View File

@@ -1,41 +1,40 @@
from flask import Blueprint, render_template, send_from_directory
from flask_login import login_required
# from flask import Blueprint, render_template, send_from_directory
# from flask_login import login_required
# from model.PmcReport import PmcReport
from model.PmcReport import PmcReport
# pmc_report_bp = Blueprint("pmc_report", __name__)
pmc_report_bp = Blueprint("pmc_report", __name__)
# # ---------------- Contractor Report by pmc no ----------------
# @pmc_report_bp.route("/pmc_report/<pmc_no>")
# @login_required
# def pmc_report(pmc_no):
# data = PmcReport.get_pmc_report(pmc_no)
# if not data:
# return "No PMC found with this number", 404
# ---------------- Contractor Report by pmc no ----------------
@pmc_report_bp.route("/pmc_report/<pmc_no>")
@login_required
def pmc_report(pmc_no):
data = PmcReport.get_pmc_report(pmc_no)
if not data:
return "No PMC found with this number", 404
# return render_template(
# "pmc_report.html",
# info=data["info"],
# invoices=data["invoices"],
# hold_types=data["hold_types"],
# gst_rel=data["gst_rel"],
# payments=data["payments"],
# credit_note=data["credit_note"],
# hold_release=data["hold_release"],
# total=data["total"]
# )
return render_template(
"pmc_report.html",
info=data["info"],
invoices=data["invoices"],
hold_types=data["hold_types"],
gst_rel=data["gst_rel"],
payments=data["payments"],
credit_note=data["credit_note"],
hold_release=data["hold_release"],
total=data["total"]
)
# # ---------------- Contractor Download Report by pmc no ----------------
# @pmc_report_bp.route("/download_pmc_report/<pmc_no>")
# @login_required
# def download_pmc_report(pmc_no):
# ---------------- Contractor Download Report by pmc no ----------------
@pmc_report_bp.route("/download_pmc_report/<pmc_no>")
@login_required
def download_pmc_report(pmc_no):
# result = PmcReport.download_pmc_report(pmc_no)
result = PmcReport.download_pmc_report(pmc_no)
# if not result:
# return "No contractor found for this PMC No", 404
if not result:
return "No contractor found for this PMC No", 404
# output_folder, file_name = result
output_folder, file_name = result
return send_from_directory(output_folder, file_name, as_attachment=True)
# return send_from_directory(output_folder, file_name, as_attachment=True)