Убраны лишние sql-запросы
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user