diff --git a/asuzr/tables.py b/asuzr/tables.py index e100799..68d64ef 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -65,3 +65,9 @@ class OrdersTable(tables.Table): 'sketch', 'executor', 'is_done',) + +class ArchiveOrdersTable(OrdersTable): + calls = EditableColumn('calls', verbose_name = 'Обзвон') + + class Meta: + attrs = {'class': 'paleblue'} diff --git a/asuzr/views.py b/asuzr/views.py index ae96457..1bb891c 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -103,24 +103,13 @@ def main(request, day, month, year): }) return HttpResponse(t.render(c)) -def order_list(request): - table = OrdersTable(Order.objects.filter(is_done=False)) - RequestConfig(request).configure(table) - return render(request, 'asuzr/table.html', {'table': table, 'title': 'Таблица выхода заказов'}) - def orders(request, archive): - if archive=='0': - return order_list(request) - else: - is_done_value=True - - o_list = Order.objects.filter(is_done=is_done_value).order_by('-id') - t=loader.get_template('asuzr/orders.html') - c=RequestContext(request, { - 'order_list': o_list, - 'archive': is_done_value, - }) - return HttpResponse(t.render(c)) + is_archive = (archive == '1') + Table = ArchiveOrdersTable if is_archive else OrdersTable + table = Table(Order.objects.filter(is_done = is_archive)) + title = 'Архивная таблица заказов' if is_archive else 'Таблица выхода заказов' + RequestConfig(request).configure(table) + return render(request, 'asuzr/table.html', {'table': table, 'title': title}) def desreport(request): start_date = request.GET.get('sdate', date.today().strftime('%d.%m.%y'))