From c7b26ce9c0ac191b89eada49c0aad4de2679cc78 Mon Sep 17 00:00:00 2001
From: "Denis V. Dedkov" <denis.v.dedkov@gmail.com>
Date: Mon, 8 Jun 2015 16:22:59 +0500
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8C=D1=8E=D1=85=D0=B0=20=D1=81=20?=
 =?UTF-8?q?=D1=8D=D1=81=D0=BA=D0=B8=D0=B7=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавил вьюху с эскизами
Добавил переход на вьюху с эскизами со страницы заказов
---
 asuzr/models.py | 4 ++++
 asuzr/tables.py | 9 ++++++++-
 asuzr/views.py  | 9 ++++++++-
 record/urls.py  | 1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/asuzr/models.py b/asuzr/models.py
index f70c7bb..3648e00 100644
--- a/asuzr/models.py
+++ b/asuzr/models.py
@@ -88,6 +88,10 @@ class Order(models.Model):
   def approved_date(self):
     return self.approved.strftime("%d/%m/%Y")
   
+  @property
+  def sketch(self):
+    return len(Sketch.objects.filter(order = self))
+
   @property
   def ostatok(self):
     return self.price-self.paid
diff --git a/asuzr/tables.py b/asuzr/tables.py
index 68d64ef..c870ebd 100644
--- a/asuzr/tables.py
+++ b/asuzr/tables.py
@@ -33,7 +33,7 @@ class OrdersTable(tables.Table):
   paid = EditableColumn('paid', verbose_name = 'Оплачено')
   ostatok = tables.Column(verbose_name = 'Остаток')
   approved = EditableColumn('approved', verbose_name = 'Согласовано')
-  sketch = tables.LinkColumn('sketches', verbose_name = 'Эскиз')
+  sketch = tables.LinkColumn('asuzr.views.sketches', verbose_name = 'Эскизы', args=[tables.utils.A('pk')])
   executor = EditableColumn('executor', verbose_name = 'Исполнитель')
   is_done = EditableColumn('is_done', verbose_name = 'Сдан')
   id = tables.Column(visible = False)
@@ -71,3 +71,10 @@ class ArchiveOrdersTable(OrdersTable):
 
   class Meta:
     attrs = {'class': 'paleblue'}
+
+class SketchesTable(tables.Table):
+  sketch_file = tables.FileColumn(verbose_name = 'Имя файла')
+  sketch_image = tables.Column(verbose_name = 'Эскиз')
+
+  class Meta:
+    attrs = {'class': 'paleblue'}
diff --git a/asuzr/views.py b/asuzr/views.py
index d222342..6268cd0 100644
--- a/asuzr/views.py
+++ b/asuzr/views.py
@@ -105,6 +105,13 @@ def main(request, day, month, year):
     })
   return HttpResponse(t.render(c))
 
+@login_required
+def sketches(request, order_id):
+  curr_order = Order.objects.get(pk = order_id)
+  table = SketchesTable(Sketch.objects.filter(order = curr_order))
+  RequestConfig(request).configure(table)
+  return render(request, 'asuzr/table.html', {'table': table, 'title': 'Эскизы заказа %s' % curr_order})
+
 @login_required 
 def orders(request, archive):
   is_archive = (archive == '1')
@@ -140,4 +147,4 @@ def production_table(request, order_id):
     'sel_order' : sel_order,
     'cost_items' : cost_items,
     })
-  return HttpResponse(t.render(c))
\ No newline at end of file
+  return HttpResponse(t.render(c))
diff --git a/record/urls.py b/record/urls.py
index fab93ac..76af414 100644
--- a/record/urls.py
+++ b/record/urls.py
@@ -18,6 +18,7 @@ urlpatterns = patterns('',
     url(r'^orders/(?P<archive>\d+)/$', 'asuzr.views.orders',name='asuzr-orders'),
     url(r'^desreport/$', 'asuzr.views.desreport'),
     url(r'^production_table/(?P<order_id>\d+)/$', 'asuzr.views.production_table'),
+    url(r'^sketches/(?P<order_id>\d+)/$', 'asuzr.views.sketches'),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^inplaceeditform/', include('inplaceeditform.urls')),
     url(r'^accounts/login/$',  login),