From f8b270547de72a715ed293922ddcc8775254ec4b Mon Sep 17 00:00:00 2001
From: "Denis V. Dedkov" <denis.v.dedkov@gmail.com>
Date: Sun, 7 Jun 2015 15:33:31 +0500
Subject: [PATCH] =?UTF-8?q?=D0=90=D1=80=D1=85=D0=B8=D0=B2=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0=20=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0=20=D0=B2=D1=8B=D1=85?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавлен класс архивной таблицы
Исправлена вьюха для архивной таблицы и таблицы выхода заказов
---
 asuzr/tables.py |  6 ++++++
 asuzr/views.py  | 23 ++++++-----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

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'))