diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py index ae32219..2203627 100644 --- a/App/Requests/__init__.py +++ b/App/Requests/__init__.py @@ -1,7 +1,7 @@ from flask import request, Blueprint, render_template from os import path from checker import check_auth -from .requests_model import sklad, get_goods, get_sellers, materials_per_seller +from .requests_model import sklad, materials_per_seller from datetime import date import json @@ -20,11 +20,8 @@ def requests(): @check_auth def sklad_zapros(): if request.method == 'GET': - zagotovki = get_goods() - if zagotovki.status: - return render_template('zagotovki.html', materials=zagotovki.result, header='Количество заготовок на складе') - else: - return render_template('error.html', error_message=zagotovki.error_message) + materials = ['Сталь', 'Золото', 'Дерево', 'Стекло', 'Медь', 'Цемент'] + return render_template('zagotovki.html', materials=materials, header='Количество заготовок на складе') else: material = dict(request.form) zagotovki = sklad(material) @@ -57,11 +54,8 @@ def zagotovki_ship(): @check_auth def sellers_ship(): if request.method == 'GET': - zagotovki = get_sellers() - if zagotovki.status: - return render_template('sellers_ship.html', sellers=zagotovki.result, year_from='2000', year_to=str(date.today().year)) - else: - return render_template('error.html', error_message=zagotovki.error_message) + sellers = ['Car and bikes', 'Doto', 'LPD', 'Neva', 'PGG', 'Robot', 'Rost'] + return render_template('sellers_ship.html', sellers=sellers, year_from='2000', year_to=str(date.today().year)) else: seller = dict(request.form) zagotovki = materials_per_seller(seller) diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py index d0070b6..33378a9 100644 --- a/App/Requests/requests_model.py +++ b/App/Requests/requests_model.py @@ -11,24 +11,6 @@ class InfoRespronse: error_message: str status: bool -def get_goods() -> InfoRespronse: - _sql = sql_provider.get('zagotovki.sql', {}) - goods_list = select_list(current_app.config['db_config'], _sql) - if goods_list is None: - return InfoRespronse((), - error_message = 'Ошибка в подключении к базе данных. Свяжитесь с администратором', - status=False) - return InfoRespronse(goods_list, error_message='', status=True) - -def get_sellers() -> InfoRespronse: - _sql = sql_provider.get('sellers.sql', {}) - sellers_list = select_list(current_app.config['db_config'], _sql) - if sellers_list is None: - return InfoRespronse((), - error_message = 'Ошибка в подключении к базе данных. Свяжитесь с администратором', - status=False) - return InfoRespronse(sellers_list, error_message='', status=True) - def sklad(input_data) -> InfoRespronse: _sql = sql_provider.get('zapros1.sql', input_data) print("sql = ", _sql) diff --git a/App/Requests/sql/sellers.sql b/App/Requests/sql/sellers.sql deleted file mode 100644 index 9303472..0000000 --- a/App/Requests/sql/sellers.sql +++ /dev/null @@ -1,3 +0,0 @@ -SELECT name FROM sellers -ORDER BY name -LIMIT 100; \ No newline at end of file diff --git a/App/Requests/sql/zagotovki.sql b/App/Requests/sql/zagotovki.sql deleted file mode 100644 index 2781f37..0000000 --- a/App/Requests/sql/zagotovki.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT DISTINCT material FROM workpiece \ No newline at end of file diff --git a/App/Requests/templates/sellers_ship.html b/App/Requests/templates/sellers_ship.html index ae25ec4..8a14679 100644 --- a/App/Requests/templates/sellers_ship.html +++ b/App/Requests/templates/sellers_ship.html @@ -16,7 +16,7 @@