From 3c6111e7352ab233c82c6b03a0b9ccc2374c5727 Mon Sep 17 00:00:00 2001 From: "Denis V. Dedkov" Date: Sun, 14 Jun 2015 20:10:14 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=8F=D1=87=D0=B5=D0=B5=D0=BA=20=D0=B2=20=D1=82?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B5=20=D0=BF=D0=BE=D1=81=D0=B5?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Сделал подкраску ячеек в таблице посещений Заодним немного облагородил общий вид страницы --- asuzr/common.py | 6 +++++- asuzr/tables.py | 4 +++- templates/asuzr/base.html | 20 +++++++++++++++----- 3 files changed, 23 insertions(+), 7 deletions(-) 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 %} + - + +
{% block menu %}
-{% if request.user.is_authenticated %} Добро пожаловать, {{ request.user.first_name }} -{% else %}Вход{% endif %} -
Выход +{% if request.user.is_authenticated %} +Добро пожаловать, {{ request.user.first_name }} +(Выход) +{% else %} +(Вход){% endif %} +
{% endblock %} + +

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

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