diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py index 3bf9da7..bcc3027 100644 --- a/App/Requests/__init__.py +++ b/App/Requests/__init__.py @@ -4,8 +4,8 @@ from os import path from checker import check_auth from flask import Blueprint, render_template, request, url_for -from .requests_model import (materials_names, materials_per_seller, - sellers_names, sklad) +from .requests_model import (materials_per_seller, sellers_names, sklad, + workpiece_names) with open(path.join(path.dirname(__file__), "zapros_menu.json"), encoding="utf-8") as f: requests_list = json.load(f) @@ -24,8 +24,8 @@ def requests(): @check_auth def sklad_zapros(): if request.method == "GET": - materials = materials_names() - return render_template("zagotovki.html", materials=materials) + workpiece = workpiece_names() + return render_template("zagotovki.html", workpiece=workpiece) else: zagotovki = sklad(request) if zagotovki.status: diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py index ce7c71c..c70f707 100644 --- a/App/Requests/requests_model.py +++ b/App/Requests/requests_model.py @@ -23,10 +23,10 @@ def sellers_names() -> list: return result -def materials_names() -> list: +def workpiece_names() -> list: db_config = current_app.config["db_config"] - _sql = sql_provider.get("materials_names.sql", {}) + _sql = sql_provider.get("workpiece_names.sql", {}) result = select_list(db_config, _sql) return result @@ -35,7 +35,7 @@ def sklad(request) -> InfoRespronse: db_config = current_app.config["db_config"] workpiece = dict(request.form) - _sql = sql_provider.get("sklad_material.sql", workpiece) + _sql = sql_provider.get("sklad_workpiece.sql", workpiece) result = select_list(db_config, _sql) return InfoRespronse(result, error_message="", status=True) diff --git a/App/Requests/sql/sklad_material.sql b/App/Requests/sql/sklad_workpiece.sql similarity index 100% rename from App/Requests/sql/sklad_material.sql rename to App/Requests/sql/sklad_workpiece.sql diff --git a/App/Requests/sql/materials_names.sql b/App/Requests/sql/workpiece_names.sql similarity index 100% rename from App/Requests/sql/materials_names.sql rename to App/Requests/sql/workpiece_names.sql diff --git a/App/Requests/templates/zagotovki.html b/App/Requests/templates/zagotovki.html index 56f1c6f..4d0bdbe 100644 --- a/App/Requests/templates/zagotovki.html +++ b/App/Requests/templates/zagotovki.html @@ -34,7 +34,7 @@