Подводка к MVC + исправление кодировки (в основном приложении и запросах)

This commit is contained in:
2024-12-04 12:14:14 +03:00
parent 0b6af28ff3
commit 8caa72d2fd
4 changed files with 19 additions and 20 deletions

View File

@@ -4,7 +4,7 @@ from checker import check_auth
from .requests_model import sklad, materials_per_seller, sellers_names, materials_names
import json
with open(path.join(path.dirname(__file__), 'zapros_menu.json')) as f:
with open(path.join(path.dirname(__file__), 'zapros_menu.json'), encoding='utf-8') as f:
requests_list = json.load(f)
requests_bp = Blueprint('requests_bp', __name__, template_folder='templates')
@@ -19,11 +19,9 @@ def requests():
@check_auth
def sklad_zapros():
if request.method == 'GET':
materials = materials_names()
return render_template('zagotovki.html', materials=materials.result)
return render_template('zagotovki.html')
else:
material = dict(request.form)
zagotovki = sklad(material)
zagotovki = sklad(request)
if zagotovki.status:
header = f'Заготовки на складе из материала \"{material["material"]}\"'
return render_template('output.html', items=zagotovki.result, header=header)
@@ -34,11 +32,9 @@ def sklad_zapros():
@check_auth
def sellers_ship():
if request.method == 'GET':
sellers = sellers_names()
return render_template('sellers_ship.html', sellers=sellers.result)
return render_template('sellers_ship.html')
else:
seller = dict(request.form)
zagotovki = materials_per_seller(seller)
zagotovki = materials_per_seller(request)
if zagotovki.status:
header = f'Поставки от поставщика \"{seller["seller"]}\"'
return render_template('output.html', items=zagotovki.result, header=header, link=url_for('requests_bp.requests'))