Вьюха с эскизами

Добавил вьюху с эскизами
Добавил переход на вьюху с эскизами со страницы заказов
This commit is contained in:
2015-06-08 16:22:59 +05:00
parent 13cca24979
commit c7b26ce9c0
4 changed files with 21 additions and 2 deletions

View File

@@ -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

View File

@@ -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'}

View File

@@ -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))
return HttpResponse(t.render(c))