From 7670a7188762e4b2b4197afdcb19da400e0b1d6d Mon Sep 17 00:00:00 2001 From: Anastasia Date: Thu, 16 Jul 2015 10:07:09 +0500 Subject: [PATCH 1/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=8D=D1=81=D0=BA=D0=B8=D0=B7=D0=BE=D0=B2,=20=D0=A4=D0=BE?= =?UTF-8?q?=D0=BD=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=20=D0=91?= =?UTF-8?q?=D0=B5=D0=BB=D1=8B=D0=B9=20=D0=B4=D1=8B=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asuzr/static/del.png | Bin 0 -> 1117 bytes asuzr/static/rubbish.png | Bin 0 -> 505 bytes record/urls.py | 5 +++-- templates/asuzr/base.html | 3 +++ templates/asuzr/sketches.html | 27 ++++++++++++++++++++++++++- 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 asuzr/static/del.png create mode 100644 asuzr/static/rubbish.png diff --git a/asuzr/static/del.png b/asuzr/static/del.png new file mode 100644 index 0000000000000000000000000000000000000000..4ac4b81e844aa6ba546bb7a33bd52315a6bcb80f GIT binary patch literal 1117 zcmV-j1fu(iP)2B-so&$DwLbh=|NjzZX$KG1{tfG1 zzp3qV+T4|Oa$QVKuOgQzCd(t9FuQj8ENycL1Bk)6iuh{fy6NuU9aU=kv!8z4cOx{i zeto`9^1<}9;@V`fusW5`HKo!5m7rD~82((Coo^WCH$%gNFam91QdwfxRHKW%M^w4; zR?Fc-7XSv=tX*X1bKBE%+g7ED(`Tj|H7lx(P;a;=eXssrx#}GeX6u$iESN!dEb5${lqw~D>nCjZ~@o;fcEMZEFkM;{x=g;CO=en;sFCJdi3) z$x$8!KLV*yGNkMW-w$i`>=LEUO?20qs2E@SeY<^gM}|xqlmZ=tj!6JH%UYg^#B;}? z@SmW8=D=y%n|+|`UMu0*^!0+#L^6zYtc@^+oSjTfv8^o*)}~2815TWBo=J8se%v@p zi0&&O1hG`qD&7~$ZG0O?F~S&%c2cwmd)HC8Ws(lQ-w3F|^toaB^H*}aTF*W-H1uIFlI#$)jXfHfj8}&XYKz01^GElb?A3KkE z*AM+c$F{_*RI)1v5B~|aO?MDx9<@;r0)#-z$Wuf9mqj=+(Il6n4)hYgFSRD)q>CMb zJN7~I7+CQojYc2750(G{W}tB{2!j0+VdJ@kdFPr8e#&Ax^(25)Uk>bK@bMuZx0s@PUJj| zR8$m9FBN}QQM?OuZfDmWgYIE!duQ3%AByR& zsrsktpX#Q=G3?-Mu#0$xrm&Z|RK)IJ+>(s~@g5%Ia`0{8N=}UUg-@6V-xoZ=+alIY zeC?@jsQtjL*nW!xyuohy#eq1)?{*WVI3>w2E;9yVhW%XNLdA!ua8J^86YS$@OIi}c zHg4ehhQzP&JUU9^BTR$8(aF{1=cwo1H0Q1)o}do<_c)1jx`{cDZ&KTPIj+vRD{%oY zbR)EjyZD@+xA778r32B%y|Os}whH1pw-xsj{LB7nUf0qT#JJe$5^<%_Y9Q(|uOu!t z9*W62;!=vCSo(P-aXkA&(MY;S&6kKtI?sCi>xdW7NBnm~;%UxVOI%shd9=b>%=(DS zlSlfyGpWT#xQf%bBei@+Iw;oyakaXk4iBVDd!7^Oygte{&%P>u{3jj`srZj1#Rw;Y v|9DuBb@z5}#eEuoz<0w&uF0|Q$`}6uNMVU$178Rf00000NkvXXu0mjf;XLLK literal 0 HcmV?d00001 diff --git a/record/urls.py b/record/urls.py index 390c34f..69cbab6 100644 --- a/record/urls.py +++ b/record/urls.py @@ -20,7 +20,7 @@ urlpatterns = patterns('', url(r'^desreport/$', 'asuzr.views.desreport'), url(r'^production_table/(?P\d+)/$', 'asuzr.views.production_table'), url(r'^sketches/(?P\d+)/$', 'asuzr.views.sketches'), - url(r'^sketches/delete/$', 'asuzr.views.delete_sketch'), + url(r'^sketches/delete/$', 'asuzr.views.delete_sketch', name = 'asuzr-del-sketch'), url(r'^prodplan/$', 'asuzr.views.prod_plan_view'), url(r'^admin/', include(admin.site.urls)), url(r'^inplaceeditform/', include('inplaceeditform.urls')), @@ -33,4 +33,5 @@ if settings.DEBUG: # static files (images, css, javascript, etc.) urlpatterns += patterns('', (r'^media/(?P.*)$', 'django.views.static.serve', { - 'document_root': settings.MEDIA_ROOT})) + 'document_root': settings.MEDIA_ROOT})) + diff --git a/templates/asuzr/base.html b/templates/asuzr/base.html index 5e3a587..d37d13d 100644 --- a/templates/asuzr/base.html +++ b/templates/asuzr/base.html @@ -37,6 +37,9 @@ .gray { color: lightgray; } + body { + background: #F5F5F5 + } diff --git a/templates/asuzr/sketches.html b/templates/asuzr/sketches.html index 0e30591..23978e9 100644 --- a/templates/asuzr/sketches.html +++ b/templates/asuzr/sketches.html @@ -1,15 +1,40 @@ {% extends "asuzr/base.html" %} {% load thumbnail %} +{% load staticfiles %} {% block page %} {% if sketch_list %}
    {% for sketch in sketch_list %} -
  • {% thumbnail sketch.sketch_file "200x200" crop="center" as im %} {% endthumbnail %}
    • +
  • {% thumbnail sketch.sketch_file "200x200" crop="center" as im %} {% endthumbnail %}
    • {% endfor %}
{% endif %} From d5ad6134f819c016d7d58809abe02d884f580e2c Mon Sep 17 00:00:00 2001 From: Anastasia Date: Fri, 17 Jul 2015 22:08:54 +0500 Subject: [PATCH 2/6] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=8D=D1=81=D0=BA?= =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asuzr/views.py | 1 - templates/asuzr/sketches.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/asuzr/views.py b/asuzr/views.py index 7c0f13a..85f4d3d 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -208,7 +208,6 @@ def sketches(request, order_id): return redirect(sketches, order_id = order_id) sketch_list = Sketch.objects.filter(order = curr_order) - #RequestConfig(request).configure(table) return render(request, 'asuzr/sketches.html', { 'order_id': order_id, 'sketch_list': sketch_list, diff --git a/templates/asuzr/sketches.html b/templates/asuzr/sketches.html index 23978e9..3e81d7e 100644 --- a/templates/asuzr/sketches.html +++ b/templates/asuzr/sketches.html @@ -38,7 +38,6 @@ {% endfor %} {% endif %} -{% endblock %} {% block additional %}
@@ -50,3 +49,4 @@
{% endblock %} +{% endblock %} \ No newline at end of file From 6b586a32ca1749ab9313d591b9ec87fc8bde7224 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Sat, 18 Jul 2015 14:59:29 +0500 Subject: [PATCH 3/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/asuzr/base.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/asuzr/base.html b/templates/asuzr/base.html index 58482c9..bb91b0f 100644 --- a/templates/asuzr/base.html +++ b/templates/asuzr/base.html @@ -37,6 +37,10 @@ .gray { color: lightgray; } + #dateform { + margin-left: 12px; + margin-top: 6px; + } body { background: #F5F5F5 } @@ -69,7 +73,7 @@ {% block controls %} {% if form %} -
+ {{ form }}
From a06f51f26ad0c100c63e88c8b2fc1ea71651bf1f Mon Sep 17 00:00:00 2001 From: Anastasia Date: Sun, 19 Jul 2015 11:32:19 +0500 Subject: [PATCH 4/6] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asuzr/forms.py | 8 ++++++++ asuzr/views.py | 16 +++++++++++++--- record/urls.py | 1 + templates/asuzr/base.html | 4 ++-- templates/asuzr/table2.html | 7 +++++++ 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/asuzr/forms.py b/asuzr/forms.py index f02adf5..4cfee75 100644 --- a/asuzr/forms.py +++ b/asuzr/forms.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- from django import forms +from django.forms import ModelForm from datetime import date from django.contrib.admin.widgets import AdminDateWidget +from asuzr.models import Order class DateForm (forms.Form): date = forms.DateField(widget = AdminDateWidget, label = u'Дата', initial = date.today) @@ -9,3 +11,9 @@ class DateForm (forms.Form): class DiapDateForm (forms.Form): sdate = forms.DateField(widget = AdminDateWidget, label = u'С', initial = date.today) edate = forms.DateField(widget = AdminDateWidget, label = u'по', initial = date.today) + +class OrderForm(ModelForm): + class Meta: + model = Order + fields = ['product', 'price', 'paid', 'address', 'deadline', 'delivery', 'lifting'] + \ No newline at end of file diff --git a/asuzr/views.py b/asuzr/views.py index 85f4d3d..e07a6e9 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -117,6 +117,8 @@ def visit_view(request): orders_table = get_day_orders_table(curr_date, 'orders-') RequestConfig(request).configure(orders_table) + + order_form = OrderForm() title = 'Таблица посещаемости на %s' % curr_date.strftime('%B %Y г') return render(request, 'asuzr/table2.html', { @@ -124,7 +126,9 @@ def visit_view(request): 'table2': orders_table, 'additional_info': add_info, 'title': title, - 'form': form}) + 'dateform': form, + 'order_form': order_form + }) @login_required def main(request, day, month, year): @@ -213,6 +217,12 @@ def sketches(request, order_id): 'sketch_list': sketch_list, 'title': 'Эскизы заказа: %s' % curr_order}) +def add_order(request): + new_order = Order(date=date.today(), designer = request.user) + form = OrderForm(request.POST, instance = new_order) + form.save() + return redirect(visit_view) + def delete_sketch(request): pk = request.GET.get('pk', -1) sketch = get_object_or_404(Sketch, pk = pk) @@ -241,7 +251,7 @@ def desreport(request): title = u'Отчет по дизайнерам за '+' - '.join((start_date, end_date)) form = DiapDateForm({'sdate': sdate, 'edate': edate}) RequestConfig(request).configure(table) - return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'form': form}) + return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'dateform': form}) @login_required def production_table(request, order_id): @@ -277,7 +287,7 @@ def prod_plan_view(request): title = u'Производственный план на %s - %s' % (sdate.strftime('%d.%m.%Y'), edate.strftime('%d.%m.%Y')) form = DateForm({'date':curr_date}) RequestConfig(request).configure(table) - return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'form': form}) + return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'dateform': form}) @login_required def log_view(request): diff --git a/record/urls.py b/record/urls.py index 71b0332..e7c5937 100644 --- a/record/urls.py +++ b/record/urls.py @@ -16,6 +16,7 @@ urlpatterns = patterns('', url(r'^product/(?P\d+)/$', 'asuzr.views.prod_detail'), url(r'^main/?(?P\d+)?/?(?P\d+)?/?(?P\d+)?/$', 'asuzr.views.main', name='asuzr-main'), url(r'^visits/$', 'asuzr.views.visit_view'), + url(r'^order/add/$', 'asuzr.views.add_order', name = 'add-order'), url(r'^orders/(?P\d+)/$', 'asuzr.views.orders',name='asuzr-orders'), url(r'^desreport/$', 'asuzr.views.desreport'), url(r'^production_table/(?P\d+)/$', 'asuzr.views.production_table'), diff --git a/templates/asuzr/base.html b/templates/asuzr/base.html index bb91b0f..1916e3c 100644 --- a/templates/asuzr/base.html +++ b/templates/asuzr/base.html @@ -72,9 +72,9 @@ {% block controls %} -{% if form %} +{% if dateform %}
- {{ form }} + {{ dateform }}
{% endif %} diff --git a/templates/asuzr/table2.html b/templates/asuzr/table2.html index d42a7f0..350cf40 100644 --- a/templates/asuzr/table2.html +++ b/templates/asuzr/table2.html @@ -5,6 +5,13 @@ {% block page %}

{{ table1.verbose_name }}

{% render_table table1 %}

{{ table2.verbose_name }}

{% render_table table2 %}
+ {% if order_form %} +
+ {% csrf_token %} + {{order_form}} + +
+ {% endif %} {% if additional_info %}
From e36b39983bae7f99810c8865a6138ae343c79fb1 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 20 Jul 2015 21:25:06 +0500 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D1=82=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asuzr/tables.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/asuzr/tables.py b/asuzr/tables.py index ae30324..9bb650f 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -7,6 +7,17 @@ from django.contrib.admin.models import LogEntry import django_tables2 as tables from models import * +class StaffLinkColumn(tables.TemplateColumn): + def __init__(self, view, *args, **kwargs): + template = ''' + {{% if request.user.is_staff %}} + {{{{ record.product }}}} + {{% else %}} + {{{{ record.product }}}} + {{% endif %}} + '''.format(view = view) + super(StaffLinkColumn, self).__init__(template, *args, **kwargs) + class EditableColumn(tables.TemplateColumn): def __init__(self, field_name, object_name = '', *args, **kwargs): template = ''' @@ -58,7 +69,8 @@ class ThumbnailColumn(tables.TemplateColumn): class OrdersTable(tables.Table): date = tables.DateColumn('d/m/Y', verbose_name = 'Дата') deadline = tables.DateColumn('d/m/Y', verbose_name = 'Срок сдачи') - product = tables.LinkColumn('asuzr.views.production_table', verbose_name = 'Наименование', args=[tables.utils.A('pk')]) + #product = tables.LinkColumn('asuzr.views.production_table', verbose_name = 'Наименование', args=[tables.utils.A('pk')]) + product = StaffLinkColumn(view = 'asuzr.views.production_table', verbose_name = 'Наименование') delivery = EditableColumn('delivery', verbose_name = 'Доставка') lifting = EditableColumn('lifting', verbose_name = 'Подъем') address = tables.Column(verbose_name = 'Адрес') From b20ff6cb46ab4655133d440d3d5e44d4006e119f Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 27 Jul 2015 14:57:33 +0500 Subject: [PATCH 6/6] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BF=D0=BE=D0=BB=D1=87=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8E=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=B0.=20=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asuzr/common.py | 7 ++--- asuzr/models.py | 7 +++++ asuzr/tables.py | 12 ++++---- asuzr/views.py | 2 +- record/settings.py | 1 + templates/asuzr/table2.html | 4 +-- templates/asuzr/table_with_form.html | 41 ++++++++++++++++++++++++++++ 7 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 templates/asuzr/table_with_form.html diff --git a/asuzr/common.py b/asuzr/common.py index d1d14ba..e581596 100644 --- a/asuzr/common.py +++ b/asuzr/common.py @@ -14,10 +14,9 @@ class custom_date(date): def weekday_color(self): return self.day_colors[self.weekday()] - @property - def date_dd_mm_yy(self): - return self.strftime('%d/%m/%Y') - @property def is_weekend(self): return self.weekday() >= 5 + + def __format__(self): + return self.strftime('%d.%m.%Y') diff --git a/asuzr/models.py b/asuzr/models.py index 032bad1..4c920fc 100644 --- a/asuzr/models.py +++ b/asuzr/models.py @@ -108,6 +108,13 @@ class Order(models.Model): return need_color + def save(self, *args, **kwargs): + super(Order, self).save(*args, **kwargs) + cost_items = CostItem.objects.filter(default_item = True) + for ci in cost_items: + new_order_cost = OrderCosts(order = self, cost_item = ci, value = 0, formula = '') + new_order_cost.save() + #Эскизы class Sketch(models.Model): def get_sketch_path(self, file_name): diff --git a/asuzr/tables.py b/asuzr/tables.py index 9bb650f..d26c376 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -67,8 +67,8 @@ class ThumbnailColumn(tables.TemplateColumn): super(ThumbnailColumn, self).__init__(template, *args, **kwargs) class OrdersTable(tables.Table): - date = tables.DateColumn('d/m/Y', verbose_name = 'Дата') - deadline = tables.DateColumn('d/m/Y', verbose_name = 'Срок сдачи') + date = tables.DateColumn('d.m.Y', verbose_name = 'Дата') + deadline = tables.DateColumn('d.m.Y', verbose_name = 'Срок сдачи') #product = tables.LinkColumn('asuzr.views.production_table', verbose_name = 'Наименование', args=[tables.utils.A('pk')]) product = StaffLinkColumn(view = 'asuzr.views.production_table', verbose_name = 'Наименование') delivery = EditableColumn('delivery', verbose_name = 'Доставка') @@ -159,6 +159,7 @@ class VisitTable(tables.Table): idx = indexes[s] self.summary[idx] = summaries[s] + def render_orders(self, value, record, column): value = 0 if value == None else value return mark_safe('%s' % ( @@ -201,7 +202,7 @@ class DayOrdersTable(OrdersTable): 'designer', 'deadline', ) - template = 'asuzr/totals_table.html' + template = 'asuzr/table_with_form.html' class ProdPlanTable(tables.Table): date = tables.Column(verbose_name = 'Дата') @@ -215,14 +216,11 @@ class ProdPlanTable(tables.Table): class ProductionTable(tables.Table): cost_item = tables.Column(verbose_name = 'Комплектующие') - value = tables.Column(verbose_name = 'Стоимость') + value = EditableColumn('value', verbose_name = 'Стоимость') summary = ['Итого затрат', 0] balance = ['Прибыль', 0] - def render_value(self, value): - return '%0.2f' % value - def set_summary(self, value): self.summary[1] = value diff --git a/asuzr/views.py b/asuzr/views.py index 7581255..82fe873 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -128,7 +128,7 @@ def visit_view(request): 'additional_info': add_info, 'title': title, 'dateform': form, - 'order_form': order_form + 'model_form': order_form }) @login_required diff --git a/record/settings.py b/record/settings.py index e13cd80..3ce6a50 100644 --- a/record/settings.py +++ b/record/settings.py @@ -107,3 +107,4 @@ from django.utils.safestring import mark_safe INPLACEEDIT_EDIT_EMPTY_VALUE = mark_safe(u'
Редактировать
') ADAPTOR_INPLACEEDIT_EDIT = 'inplaceeditform.perms.AdminDjangoPermEditInline' + diff --git a/templates/asuzr/table2.html b/templates/asuzr/table2.html index 350cf40..962483d 100644 --- a/templates/asuzr/table2.html +++ b/templates/asuzr/table2.html @@ -3,8 +3,8 @@ {% load render_table from django_tables2 %} {% block page %} -

{{ table1.verbose_name }}

{% render_table table1 %}
-

{{ table2.verbose_name }}

{% render_table table2 %}
+

{{ table1.verbose_name }}

{% render_table table1 %}
+

{{ table2.verbose_name }}

{% render_table table2 %}
{% if order_form %}
{% csrf_token %} diff --git a/templates/asuzr/table_with_form.html b/templates/asuzr/table_with_form.html new file mode 100644 index 0000000..f82f136 --- /dev/null +++ b/templates/asuzr/table_with_form.html @@ -0,0 +1,41 @@ +{% extends "asuzr/totals_table.html" %} +{% load django_tables2 %} +{% load i18n %} +{% block table.tbody %} + + {% for row in table.page.object_list|default:table.rows %} {# support pagination #} + {% block table.tbody.row %} + {# avoid cycle for Django 1.2-1.6 compatibility #} + {% for column, cell in row.items %} + {% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %} + {% endfor %} + + {% endblock table.tbody.row %} + {% empty %} + {% if table.empty_text %} + {% block table.tbody.empty_text %} + {{ table.empty_text }} + {% endblock table.tbody.empty_text %} + {% endif %} + {% endfor %} + {% if model_form %} + + {% csrf_token %} + + {{model_form.product}} + {{model_form.price}} + {{model_form.paid}} + {{model_form.address}} + + {{model_form.deadline}} + {{model_form.delivery}} + {{model_form.lifting}} + + + + + +
+ {% endif %} + +{% endblock table.tbody %} \ No newline at end of file