Изменение названий методов
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<form action="" method="post" style="display: inline-block;">
|
||||
<label>Выберите заготовку</label>
|
||||
<select class="form-select" name="workpiece">
|
||||
{% for item in materials %}
|
||||
{% for item in workpiece %}
|
||||
<option value="{{ item["work_id"] }}">{{ item["name"] }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[
|
||||
{"name": "Количество заготовок на складе", "url": "requests_bp.sklad_zapros"},
|
||||
{"name": "Поставки поставщиками", "url": "requests_bp.sellers_ship"}
|
||||
{"name": "Поставки заготовок", "url": "requests_bp.sklad_zapros"},
|
||||
{"name": "Работа поставщиков", "url": "requests_bp.sellers_ship"}
|
||||
]
|
||||
Reference in New Issue
Block a user