diff --git a/asuzr/common.py b/asuzr/common.py index 9dcd28f..c63dcb1 100644 --- a/asuzr/common.py +++ b/asuzr/common.py @@ -16,4 +16,8 @@ class custom_date(date): @property def date_dd_mm_yy(self): - return self.strftime("%d/%m/%Y") \ No newline at end of file + return self.strftime("%d/%m/%Y") + + @property + def is_weekend(self): + return self.weekday() >= 5 diff --git a/asuzr/tables.py b/asuzr/tables.py index 0e09ad8..9525ffc 100644 --- a/asuzr/tables.py +++ b/asuzr/tables.py @@ -122,7 +122,8 @@ class VisitTable(tables.Table): cost = tables.Column(verbose_name = 'Стоимость', accessor = 'order.price__sum') designer = tables.Column(verbose_name = 'Дизайнеры') - def render_orders(self, value, record): + def render_orders(self, value, record, column): + value = 0 if value == None else value return mark_safe('%s' % ( reverse('asuzr.views.visit_view'), record['date'].strftime('%d.%m.%Y'), @@ -131,3 +132,4 @@ class VisitTable(tables.Table): class Meta: attrs = {'class': 'paleblue'} + template = 'asuzr/table_templ.html' diff --git a/templates/asuzr/base.html b/templates/asuzr/base.html index 5911fbd..3652da5 100644 --- a/templates/asuzr/base.html +++ b/templates/asuzr/base.html @@ -7,6 +7,7 @@ {% inplace_static %} + - + + {% endblock %} + +

{% block title %}{{ title }}{% endblock %}

{% block page %} Тело страницы {% endblock %} - +
{% block footer %}
{% endblock %}