Таблица заказов

Доделал таблицу заказов
This commit is contained in:
2015-06-16 23:33:47 +05:00
parent 6f054bef1f
commit 8cea3edb6b
4 changed files with 45 additions and 65 deletions

View File

@@ -119,10 +119,9 @@ class VisitTable(tables.Table):
designer = tables.Column(verbose_name = 'Дизайнеры')
summary = ['Всего','',0,0,0,0,'']
def set_summaries(self, summaries):
indexes = {'calls': 2, 'visits': 3, 'orders': 4, 'cost': 5}
for s in summaries:
indexes = {'calls': 2, 'visits': 3, 'orders': 4, 'cost': 5}
for s in summaries:
idx = indexes[s]
self.summary[idx] = summaries[s]
@@ -141,6 +140,12 @@ class VisitTable(tables.Table):
class DayOrdersTable(OrdersTable):
designer = tables.Column(verbose_name = 'Дизайнер')
summary = ['Всего', 0, '', '', '',]
def set_summary(self, price):
self.summary[1] = price
class Meta:
attrs = {'class': 'paleblue'}
exclude = ('date',
@@ -159,3 +164,4 @@ class DayOrdersTable(OrdersTable):
'designer',
'deadline',
)
template = 'asuzr/totals_table.html'

View File

@@ -82,17 +82,25 @@ def get_attendance_table(year, month, prefix):
return table
def get_day_orders_table(date, prefix):
orders = Order.objects.filter(date = date)
orders_price = orders.aggregate(Sum('price'))
table = DayOrdersTable(orders, prefix = prefix)
table.verbose_name = 'Заказы на %s' % date.strftime('%d %B %Y г')
table.set_summary(orders_price['price__sum'])
return table
@login_required
def visit_view(request):
curr_date = datetime.strptime(request.GET.get('date', date.today().strftime('%d.%m.%Y')), '%d.%m.%Y')
attendance_table = get_attendance_table(curr_date.year, curr_date.month, 'attendance-')
RequestConfig(request, paginate={'per_page': 32}).configure(attendance_table)
orders_table = DayOrdersTable(Order.objects.filter(date = curr_date))
orders_table.verbose_name = 'Заказы на %s г' % curr_date.strftime('%d %B %Y')
orders_table = get_day_orders_table(curr_date, 'orders-')
RequestConfig(request).configure(orders_table)
title = 'Таблица посещаемости на %s г.' % curr_date.strftime('%B %Y')
title = 'Таблица посещаемости на %s' % curr_date.strftime('%B %Y г')
return render(request, 'asuzr/table3.html', {
'table1': attendance_table,
'table2': orders_table,