Рекомендации от ИС
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
from flask import request, Blueprint, render_template, session, url_for
|
||||
from flask import request, Blueprint, render_template, url_for
|
||||
from checker import check_auth
|
||||
from os import path
|
||||
from datetime import date
|
||||
from .report_model import view_report, make_report
|
||||
from .report_model import view_report_model, create_report_model
|
||||
import json
|
||||
|
||||
with open(path.join(path.dirname(__file__), 'reports.json')) as f:
|
||||
@@ -16,6 +16,20 @@ def menu():
|
||||
if request.method == 'GET':
|
||||
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'])
|
||||
@check_auth
|
||||
def create():
|
||||
@@ -26,20 +40,11 @@ def create():
|
||||
items=report_list,
|
||||
date_today=date.today())
|
||||
else:
|
||||
id = request.form.get('category')
|
||||
month = request.form.get('month')
|
||||
year = request.form.get('year')
|
||||
data = dict(id=id, month=month, year=year)
|
||||
|
||||
if session['role'] in report_list[id]['data']['write']:
|
||||
proc_name = report_list[id]['data']['procedure']
|
||||
ready_report = make_report(data, proc_name)
|
||||
if ready_report.status:
|
||||
return render_template("OK.html")
|
||||
else:
|
||||
return render_template("error.html", error_message=ready_report.error_message)
|
||||
result = create_report_model(request, report_list)
|
||||
if result.status:
|
||||
return render_template("OK.html")
|
||||
else:
|
||||
return render_template("error.html", error_message='Недостаточно прав для создания данного отчета!')
|
||||
return render_template("error.html", error_message=result.error_message)
|
||||
|
||||
@report_bp.route('/view', methods=['GET', 'POST'])
|
||||
@check_auth
|
||||
@@ -51,19 +56,10 @@ def view():
|
||||
items=report_list,
|
||||
date_today=date.today())
|
||||
else:
|
||||
id = request.form.get('category')
|
||||
month = request.form.get('month')
|
||||
year = request.form.get('year')
|
||||
data = dict(id=id, month=month, year=year)
|
||||
|
||||
if session['role'] in report_list[id]['data']['read']:
|
||||
ready_report = view_report(data, report_list[id]['data']['view'])
|
||||
if ready_report.status:
|
||||
title= f'{report_list[id]['data']['title']} за {data["month"]}-{data["year"]}'
|
||||
return render_template("output.html", items=ready_report.result,
|
||||
header=title,
|
||||
link = url_for('report_bp.menu'))
|
||||
else:
|
||||
return render_template("error.html", error_message=ready_report.error_message)
|
||||
result = view_report_model(request, report_list)
|
||||
if result.status:
|
||||
return render_template("output.html", items=result.result,
|
||||
header='Результаты отчёта',
|
||||
link = url_for('report_bp.menu'))
|
||||
else:
|
||||
return render_template("error.html", error_message='Недосточно прав для чтения данного отчета!')
|
||||
return render_template("error.html", error_message=result.error_message)
|
||||
Reference in New Issue
Block a user