From 42de5a02e465bdfb2a4a1bbc5f9297e6fe16461c Mon Sep 17 00:00:00 2001
From: Anton Kamalov <kamalovap@paksurion.ru>
Date: Thu, 12 Dec 2024 10:18:28 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Requests/__init__.py                                  | 8 ++++----
 App/Requests/requests_model.py                            | 6 +++---
 .../sql/{sklad_material.sql => sklad_workpiece.sql}       | 0
 .../sql/{materials_names.sql => workpiece_names.sql}      | 0
 App/Requests/templates/zagotovki.html                     | 2 +-
 App/Requests/zapros_menu.json                             | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename App/Requests/sql/{sklad_material.sql => sklad_workpiece.sql} (100%)
 rename App/Requests/sql/{materials_names.sql => workpiece_names.sql} (100%)

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 @@
             <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>
diff --git a/App/Requests/zapros_menu.json b/App/Requests/zapros_menu.json
index 45c1b4b..ed56bd7 100644
--- a/App/Requests/zapros_menu.json
+++ b/App/Requests/zapros_menu.json
@@ -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"}
 ]
\ No newline at end of file