From fe2b1fd014554605943934fae6358d7b2956f097 Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Tue, 10 Dec 2024 18:19:30 +0300 Subject: [PATCH] Fixed requests --- App/Requests/__init__.py | 3 +-- App/Requests/requests_model.py | 8 ++++---- App/Requests/templates/zagotovki.html | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py index 9eb706a..3bf9da7 100644 --- a/App/Requests/__init__.py +++ b/App/Requests/__init__.py @@ -29,8 +29,7 @@ def sklad_zapros(): else: zagotovki = sklad(request) if zagotovki.status: - material = dict(request.form) - header = f'Заготовки на складе из материала "{material["material"]}"' + header = "Поставки выбранной заготовки" return render_template("output.html", items=zagotovki.result, header=header) else: return render_template("error.html", error_message=zagotovki.error_message) diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py index 9ef9f07..bccd958 100644 --- a/App/Requests/requests_model.py +++ b/App/Requests/requests_model.py @@ -20,7 +20,7 @@ def sellers_names() -> list: _sql = sql_provider.get("sellers_names.sql", {}) result = select_list(db_config, _sql) - return InfoRespronse(result, error_message="", status=True) + return result def materials_names() -> list: @@ -28,14 +28,14 @@ def materials_names() -> list: _sql = sql_provider.get("materials_names.sql", {}) result = select_list(db_config, _sql) - return InfoRespronse(result, error_message="", status=True) + return result def sklad(request) -> InfoRespronse: db_config = current_app.config["db_config"] - material = dict(request.form) + id = dict(request.form) - _sql = sql_provider.get("sklad_material.sql", material) + _sql = sql_provider.get("sklad_material.sql", id) result = select_list(db_config, _sql) return InfoRespronse(result, error_message="", status=True) diff --git a/App/Requests/templates/zagotovki.html b/App/Requests/templates/zagotovki.html index ccd1492..f99600c 100644 --- a/App/Requests/templates/zagotovki.html +++ b/App/Requests/templates/zagotovki.html @@ -33,9 +33,9 @@
- {% for item in materials %} - + {% endfor %}