Reportt rewrite

This commit is contained in:
2024-12-10 01:24:26 +03:00
parent 557539b2b5
commit fd4d3ea051
2 changed files with 1 additions and 29 deletions

View File

@@ -22,21 +22,6 @@ def menu():
return render_template("report_menu.html") return render_template("report_menu.html")
# Рекомендации от ИС
# @report_bp.route('/test', methods=['GET'])
# def get_test():
# return render_template('report_basic.html',
# is_write=True,
# title='Создание отчетов',
# items=report_list,
# date_today=date.today())
# @report_bp.route('/test', methods=['POST'])
# def post_test():
# report_response = model(request, report_list)
# return view(report_response)
@report_bp.route("/create", methods=["GET", "POST"]) @report_bp.route("/create", methods=["GET", "POST"])
@check_auth @check_auth
def create(): def create():

View File

@@ -40,12 +40,6 @@ def view_report_model(request, report_list: dict) -> InfoRespronse:
view_script = report_list[id]["data"]["view"] view_script = report_list[id]["data"]["view"]
_sql = sql_provider.get(f"{view_script}.sql", data) _sql = sql_provider.get(f"{view_script}.sql", data)
result = select_list(db_config, _sql) result = select_list(db_config, _sql)
if result is None:
return InfoRespronse(
(),
error_message="Ошибка в подключении к базе данных. Свяжитесь с администратором",
status=False,
)
return InfoRespronse(result, error_message="", status=True) return InfoRespronse(result, error_message="", status=True)
else: else:
return InfoRespronse( return InfoRespronse(
@@ -70,14 +64,7 @@ def create_report_model(request, report_list: dict) -> InfoRespronse:
db_config = current_app.config["db_config"] db_config = current_app.config["db_config"]
proc_name = report_list[id]["data"]["procedure"] proc_name = report_list[id]["data"]["procedure"]
args = tuple(data.values()) args = tuple(data.values())
result = procedure(db_config, proc_name, args) procedure(db_config, proc_name, args)
if result is None:
return InfoRespronse(
(),
error_message="Ошибка в подключении к базе данных. Свяжитесь с администратором",
status=False,
)
return InfoRespronse((), error_message="", status=True) return InfoRespronse((), error_message="", status=True)
else: else:
return InfoRespronse( return InfoRespronse(