ParkSuMin/RIS
Archived
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Изменение запроса с поставщиком

Browse Source
This commit is contained in:
Anton Kamalov
2024-11-06 23:15:51 +03:00
parent b5cd97d38c
commit fa536c6f39
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
App/Requests/__init__.py
View File

@@ -20,13 +20,13 @@ def requests():
@check_auth @check_auth
def sklad_zapros(): def sklad_zapros():
if request.method == 'GET': if request.method == 'GET':
materials = ['Сталь', 'Золото', 'Дерево', 'Стекло', 'Медь', 'Цемент'] materials = ['Сталь', 'Алюминий', 'Медь', 'Пластик', 'Дерево']
return render_template('zagotovki.html', materials=materials, header='Количество заготовок на складе') return render_template('zagotovki.html', materials=materials, header='Количество заготовок на складе')
else: else:
material = dict(request.form) material = dict(request.form)
zagotovki = sklad(material) zagotovki = sklad(material)
if zagotovki.status: if zagotovki.status:
header = f'Заготовки на складе из материала \'{material["material"]}\'' header = f'Заготовки на складе из материала \"{material["material"]}\"'
return render_template('output.html', items=zagotovki.result, object=header) return render_template('output.html', items=zagotovki.result, object=header)
else: else:
return render_template('error.html', error_message=zagotovki.error_message) return render_template('error.html', error_message=zagotovki.error_message)
@@ -54,13 +54,13 @@ def zagotovki_ship():
@check_auth @check_auth
def sellers_ship(): def sellers_ship():
if request.method == 'GET': if request.method == 'GET':
sellers = ['Car and bikes', 'Doto', 'LPD', 'Neva', 'PGG', 'Robot', 'Rost'] sellers = ['Alpha Supplies', 'Beta Materials', 'Gamma Parts', 'Delta Components', 'Epsilon Goods']
return render_template('sellers_ship.html', sellers=sellers, year_from='2000', year_to=str(date.today().year)) return render_template('sellers_ship.html', sellers=sellers)
else: else:
seller = dict(request.form) seller = dict(request.form)
zagotovki = materials_per_seller(seller) zagotovki = materials_per_seller(seller)
if zagotovki.status: if zagotovki.status:
header = f'Поставки от поставщика \'{seller['seller']}\'' header = f'Поставки от поставщика \"{seller["seller"]}\"'
return render_template('output.html', items=zagotovki.result, object=header) return render_template('output.html', items=zagotovki.result, object=header)
else: else:
return render_template('error.html', error_message=zagotovki.error_message) return render_template('error.html', error_message=zagotovki.error_message)

1
App/Requests/sql/zapros3.sql
View File

@@ -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 (SELECT waybill_id, SUM(count) AS cnt FROM waybill_lines wl GROUP BY waybill_id)wl USING (waybill_id)
JOIN sellers USING(sel_id) JOIN sellers USING(sel_id)
WHERE sellers.name = '${seller}' WHERE sellers.name = '${seller}'
AND YEAR(date_of_delivery) = '${date}'
GROUP BY date_of_delivery GROUP BY date_of_delivery

6
App/Requests/templates/sellers_ship.html
View File

@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Поставки поставщиком за год</title> <title>Все поставки поставщиком</title>
<link href="/static/css/main.css" type="text/css" rel="stylesheet"> <link href="/static/css/main.css" type="text/css" rel="stylesheet">
</head> </head>
<body> <body>
@@ -10,7 +10,7 @@
<a href="{{ url_for('logout') }}"><button>Выход</button></a> <a href="{{ url_for('logout') }}"><button>Выход</button></a>
</div> </div>
<!-- Input --> <!-- Input -->
<h1>Поставки поставщиком за год</h1> <h1>Все поставки поставщиком</h1>
<div class="form"> <div class="form">
<p>Выберите поставщика</p> <p>Выберите поставщика</p>
<form action="" method="post"> <form action="" method="post">
@@ -19,8 +19,6 @@
<option value="{{ item }}">{{ item }}</option> <option value="{{ item }}">{{ item }}</option>
{% endfor %} {% endfor %}
</select> </select>
<p>Выберите год:</p>
<p><input type="number" name="date" required min={{ year_from }} max={{ year_to }} value="2024"></p>
<input type="submit" value="Отправить"> <input type="submit" value="Отправить">
</form> </form>
<div class="return"> <div class="return">