From 59ff7b42d9f4c478b683966b8c8b4bf2f45705c8 Mon Sep 17 00:00:00 2001
From: Anton Kamalov <kamalovap@paksurion.ru>
Date: Tue, 5 Nov 2024 22:19:09 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20sql-=D0=B7=D0=B0=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Requests/__init__.py                 | 16 +++++-----------
 App/Requests/requests_model.py           | 18 ------------------
 App/Requests/sql/sellers.sql             |  3 ---
 App/Requests/sql/zagotovki.sql           |  1 -
 App/Requests/templates/sellers_ship.html |  2 +-
 App/Requests/templates/zagotovki.html    |  2 +-
 6 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 App/Requests/sql/sellers.sql
 delete mode 100644 App/Requests/sql/zagotovki.sql

diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py
index ae32219..2203627 100644
--- a/App/Requests/__init__.py
+++ b/App/Requests/__init__.py
@@ -1,7 +1,7 @@
 from flask import request, Blueprint, render_template
 from os import path
 from checker import check_auth
-from .requests_model import sklad, get_goods, get_sellers, materials_per_seller
+from .requests_model import sklad, materials_per_seller
 from datetime import date
 import json
 
@@ -20,11 +20,8 @@ def requests():
 @check_auth
 def sklad_zapros():
     if request.method == 'GET':
-        zagotovki = get_goods()
-        if zagotovki.status:
-            return render_template('zagotovki.html', materials=zagotovki.result, header='Количество заготовок на складе')
-        else:
-            return render_template('error.html', error_message=zagotovki.error_message)
+        materials = ['Сталь', 'Золото', 'Дерево', 'Стекло', 'Медь', 'Цемент']
+        return render_template('zagotovki.html', materials=materials, header='Количество заготовок на складе')
     else:
         material = dict(request.form)
         zagotovki = sklad(material)
@@ -57,11 +54,8 @@ def zagotovki_ship():
 @check_auth
 def sellers_ship():
     if request.method == 'GET':
-        zagotovki = get_sellers()
-        if zagotovki.status:
-            return render_template('sellers_ship.html', sellers=zagotovki.result, year_from='2000', year_to=str(date.today().year))
-        else:
-            return render_template('error.html', error_message=zagotovki.error_message)
+        sellers = ['Car and bikes', 'Doto', 'LPD', 'Neva', 'PGG', 'Robot', 'Rost']
+        return render_template('sellers_ship.html', sellers=sellers, year_from='2000', year_to=str(date.today().year))
     else:
         seller = dict(request.form)
         zagotovki = materials_per_seller(seller)
diff --git a/App/Requests/requests_model.py b/App/Requests/requests_model.py
index d0070b6..33378a9 100644
--- a/App/Requests/requests_model.py
+++ b/App/Requests/requests_model.py
@@ -11,24 +11,6 @@ class InfoRespronse:
     error_message: str
     status: bool
 
-def get_goods() -> InfoRespronse:
-    _sql = sql_provider.get('zagotovki.sql', {})
-    goods_list = select_list(current_app.config['db_config'], _sql)
-    if goods_list is None:
-        return InfoRespronse((), 
-                             error_message = 'Ошибка в подключении к базе данных. Свяжитесь с администратором', 
-                             status=False)
-    return InfoRespronse(goods_list, error_message='', status=True)
-
-def get_sellers() -> InfoRespronse:
-    _sql = sql_provider.get('sellers.sql', {})
-    sellers_list = select_list(current_app.config['db_config'], _sql)
-    if sellers_list is None:
-        return InfoRespronse((), 
-                             error_message = 'Ошибка в подключении к базе данных. Свяжитесь с администратором', 
-                             status=False)
-    return InfoRespronse(sellers_list, error_message='', status=True)
-
 def sklad(input_data) -> InfoRespronse:
     _sql = sql_provider.get('zapros1.sql', input_data)
     print("sql = ", _sql)
diff --git a/App/Requests/sql/sellers.sql b/App/Requests/sql/sellers.sql
deleted file mode 100644
index 9303472..0000000
--- a/App/Requests/sql/sellers.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT name FROM sellers
-ORDER BY name
-LIMIT 100;
\ No newline at end of file
diff --git a/App/Requests/sql/zagotovki.sql b/App/Requests/sql/zagotovki.sql
deleted file mode 100644
index 2781f37..0000000
--- a/App/Requests/sql/zagotovki.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT DISTINCT material FROM workpiece
\ No newline at end of file
diff --git a/App/Requests/templates/sellers_ship.html b/App/Requests/templates/sellers_ship.html
index ae25ec4..8a14679 100644
--- a/App/Requests/templates/sellers_ship.html
+++ b/App/Requests/templates/sellers_ship.html
@@ -16,7 +16,7 @@
         <form action="" method="post">
             <select name="seller">
                 {% for item in sellers %}
-                    <option value="{{ item['name'] }}">{{ item['name'] }}</option>
+                    <option value="{{ item }}">{{ item }}</option>
                 {% endfor %}
             </select>
             <p>Выберите год:</p>
diff --git a/App/Requests/templates/zagotovki.html b/App/Requests/templates/zagotovki.html
index c511f67..eef759a 100644
--- a/App/Requests/templates/zagotovki.html
+++ b/App/Requests/templates/zagotovki.html
@@ -16,7 +16,7 @@
             <p>Выберите материал<p></p>
             <select name="material">
                 {% for item in materials %}
-                    <option value="{{ item['material'] }}">{{ item['material'] }}</option>
+                    <option value="{{ item }}">{{ item }}</option>
                 {% endfor %}
             </select>
             <input type="submit" value="Отправить">