Дополнительные столбцы для заказов

В заказы для текущего дня добавлены дополнительные столбцы по
требованию заказчика
This commit is contained in:
2015-06-27 13:16:41 +05:00
parent 9771529f85
commit 02c97afe22
2 changed files with 7 additions and 8 deletions

View File

@@ -163,10 +163,11 @@ class VisitTable(tables.Table):
class DayOrdersTable(OrdersTable):
designer = tables.Column(verbose_name = 'Дизайнер')
summary = ['Итого:', 0, '', '', '',]
summary = ['Итого:', 0, 0, '', '', '', '', '']
def set_summary(self, price):
def set_summary(self, price, paid):
self.summary[1] = price
self.summary[2] = paid
def render_designer(self, value):
return ' '.join((value.first_name, value.last_name))
@@ -175,9 +176,6 @@ class DayOrdersTable(OrdersTable):
empty_text = 'Заказов для этого дня нет'
attrs = {'class': 'paleblue'}
exclude = ('date',
'delivery',
'lifting',
'paid',
'ostatok',
'approved',
'sketch',
@@ -185,7 +183,8 @@ class DayOrdersTable(OrdersTable):
'is_done',
)
sequence = ('product',
'price',
'price',
'paid',
'address',
'designer',
'deadline',

View File

@@ -94,10 +94,10 @@ def get_attendance_table(year, month, prefix):
def get_day_orders_table(date, prefix):
orders = Order.objects.filter(date = date)
orders_price = orders.aggregate(Sum('price'))
summaries = orders.aggregate(Sum('price'), Sum('paid'))
table = DayOrdersTable(orders, prefix = prefix)
table.verbose_name = 'Заказы на %s' % date.strftime('%d %B %Y г')
table.set_summary(orders_price['price__sum'] or 0)
table.set_summary(summaries['price__sum'] or 0, summaries['paid__sum'] or 0)
return table