diff --git a/App/Requests/__init__.py b/App/Requests/__init__.py
index 2203627..c2a07e6 100644
--- a/App/Requests/__init__.py
+++ b/App/Requests/__init__.py
@@ -20,13 +20,13 @@ def requests():
@check_auth
def sklad_zapros():
if request.method == 'GET':
- materials = ['Сталь', 'Золото', 'Дерево', 'Стекло', 'Медь', 'Цемент']
+ materials = ['Сталь', 'Алюминий', 'Медь', 'Пластик', 'Дерево']
return render_template('zagotovki.html', materials=materials, header='Количество заготовок на складе')
else:
material = dict(request.form)
zagotovki = sklad(material)
if zagotovki.status:
- header = f'Заготовки на складе из материала \'{material["material"]}\''
+ header = f'Заготовки на складе из материала \"{material["material"]}\"'
return render_template('output.html', items=zagotovki.result, object=header)
else:
return render_template('error.html', error_message=zagotovki.error_message)
@@ -54,13 +54,13 @@ def zagotovki_ship():
@check_auth
def sellers_ship():
if request.method == 'GET':
- 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))
+ sellers = ['Alpha Supplies', 'Beta Materials', 'Gamma Parts', 'Delta Components', 'Epsilon Goods']
+ return render_template('sellers_ship.html', sellers=sellers)
else:
seller = dict(request.form)
zagotovki = materials_per_seller(seller)
if zagotovki.status:
- header = f'Поставки от поставщика \'{seller['seller']}\''
+ header = f'Поставки от поставщика \"{seller["seller"]}\"'
return render_template('output.html', items=zagotovki.result, object=header)
else:
return render_template('error.html', error_message=zagotovki.error_message)
\ No newline at end of file
diff --git a/App/Requests/sql/zapros3.sql b/App/Requests/sql/zapros3.sql
index 7336117..582b34f 100644
--- a/App/Requests/sql/zapros3.sql
+++ b/App/Requests/sql/zapros3.sql
@@ -5,5 +5,4 @@ FROM waybill w
JOIN (SELECT waybill_id, SUM(count) AS cnt FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id)
JOIN sellers USING(sel_id)
WHERE sellers.name = '${seller}'
-AND YEAR(date_of_delivery) = '${date}'
GROUP BY date_of_delivery
\ No newline at end of file
diff --git a/App/Requests/templates/sellers_ship.html b/App/Requests/templates/sellers_ship.html
index 8a14679..afc6eea 100644
--- a/App/Requests/templates/sellers_ship.html
+++ b/App/Requests/templates/sellers_ship.html
@@ -2,7 +2,7 @@
- Поставки поставщиком за год
+ Все поставки поставщиком
@@ -10,7 +10,7 @@
- Поставки поставщиком за год
+ Все поставки поставщиком