diff --git a/App/Queries/requests.py b/App/Queries/requests.py
index 20c0eee..8d817b3 100644
--- a/App/Queries/requests.py
+++ b/App/Queries/requests.py
@@ -25,14 +25,14 @@ def sklad_zapros():
if request.method == 'GET':
zagotovki = route(session['db_config'], {}, sql_provider, 'zagotovki.sql')
if zagotovki.status:
- return render_template('sklad_zapros.html', materials=zagotovki.result, status=True)
+ return render_template('sklad_zapros.html', materials=zagotovki.result)
else:
return zagotovki.error_message
else:
material = dict(request.form)
zagotovki = route(session['db_config'], material, sql_provider, 'zapros1.sql')
if zagotovki.status:
- print(zagotovki.result)
- return render_template('sklad_zapros.html', items=zagotovki.result)
+ categories = ['Материал', 'Вес', 'Цена', 'Количество']
+ return render_template('output.html', items=zagotovki.result, categories = categories)
else:
return zagotovki.error_message
\ No newline at end of file
diff --git a/App/Queries/templates/output.html b/App/Queries/templates/output.html
new file mode 100644
index 0000000..26d67ce
--- /dev/null
+++ b/App/Queries/templates/output.html
@@ -0,0 +1,26 @@
+
+
+
+
+ Заготовки на складе
+
+
+
Заготовки на складе
+
+
+
+ {% for category in categories %}
+
{{ category }}
+ {% endfor %}
+
+ {% for item in items %}
+
+
{{ item['material'] }}
+
{{ item['weight'] }}
+
{{ item['price'] }}
+
{{ item['count'] }}
+
+ {% endfor %}
+
+
+
\ No newline at end of file
diff --git a/App/Queries/templates/sklad_zapros.html b/App/Queries/templates/sklad_zapros.html
index 6b40da3..1ecf592 100644
--- a/App/Queries/templates/sklad_zapros.html
+++ b/App/Queries/templates/sklad_zapros.html
@@ -6,7 +6,6 @@
- {% if status %}