diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py index 6c6e471..9eb706a 100644 --- a/App/Requests/__init__.py +++ b/App/Requests/__init__.py @@ -24,7 +24,8 @@ def requests(): @check_auth def sklad_zapros(): if request.method == "GET": - return render_template("zagotovki.html") + materials = materials_names() + return render_template("zagotovki.html", materials=materials) else: zagotovki = sklad(request) if zagotovki.status: @@ -39,7 +40,8 @@ def sklad_zapros(): @check_auth def sellers_ship(): if request.method == "GET": - return render_template("sellers_ship.html") + sellers = sellers_names() + return render_template("sellers_ship.html", sellers=sellers) else: zagotovki = materials_per_seller(request) if zagotovki.status: diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py index 5f38c03..9ef9f07 100644 --- a/App/Requests/requests_model.py +++ b/App/Requests/requests_model.py @@ -15,31 +15,19 @@ class InfoRespronse: status: bool -def sellers_names() -> InfoRespronse: +def sellers_names() -> list: db_config = current_app.config["db_config"] _sql = sql_provider.get("sellers_names.sql", {}) result = select_list(db_config, _sql) - if result is None: - return InfoRespronse( - (), - error_message="Ошибка в подключении к базе данных. Свяжитесь с администратором", - status=False, - ) return InfoRespronse(result, error_message="", status=True) -def materials_names() -> InfoRespronse: +def materials_names() -> list: db_config = current_app.config["db_config"] _sql = sql_provider.get("materials_names.sql", {}) result = select_list(db_config, _sql) - if result is None: - return InfoRespronse( - (), - error_message="Ошибка в подключении к базе данных. Свяжитесь с администратором", - status=False, - ) return InfoRespronse(result, error_message="", status=True) @@ -49,12 +37,6 @@ def sklad(request) -> InfoRespronse: _sql = sql_provider.get("sklad_material.sql", material) result = select_list(db_config, _sql) - if result is None: - return InfoRespronse( - (), - error_message="Ошибка в подключении к базе данных. Свяжитесь с администратором", - status=False, - ) return InfoRespronse(result, error_message="", status=True) @@ -64,10 +46,4 @@ def materials_per_seller(request) -> InfoRespronse: seller = dict(request.form) _sql = sql_provider.get("ship_seller.sql", seller) result = select_list(db_config, _sql) - if result is None: - return InfoRespronse( - (), - error_message="Ошибка в подключении к базе данных. Свяжитесь с администратором", - status=False, - ) return InfoRespronse(result, error_message="", status=True) diff --git a/App/Requests/templates/sellers_ship.html b/App/Requests/templates/sellers_ship.html index 844a8f6..d28af81 100644 --- a/App/Requests/templates/sellers_ship.html +++ b/App/Requests/templates/sellers_ship.html @@ -33,11 +33,9 @@
diff --git a/App/Requests/templates/zagotovki.html b/App/Requests/templates/zagotovki.html index c36de7d..ccd1492 100644 --- a/App/Requests/templates/zagotovki.html +++ b/App/Requests/templates/zagotovki.html @@ -34,11 +34,9 @@