ded/record
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Подкраска ячеек в таблице посещений

Browse Source 
Сделал подкраску ячеек в таблице посещений
Заодним немного облагородил общий вид страницы
This commit is contained in:
Denis V. Dedkov
2015-06-14 20:10:14 +05:00
parent c9e24fd874
commit 3c6111e735
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asuzr/common.py
View File

@@ -17,3 +17,7 @@ class custom_date(date):
@property @property
def date_dd_mm_yy(self): def date_dd_mm_yy(self):
return self.strftime("%d/%m/%Y") return self.strftime("%d/%m/%Y")
@property
def is_weekend(self):
return self.weekday() >= 5

4
asuzr/tables.py
View File

@@ -122,7 +122,8 @@ class VisitTable(tables.Table):
cost = tables.Column(verbose_name = 'Стоимость', accessor = 'order.price__sum') cost = tables.Column(verbose_name = 'Стоимость', accessor = 'order.price__sum')
designer = tables.Column(verbose_name = 'Дизайнеры') 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('<a href="%s?date=%s">%s</a>' % ( return mark_safe('<a href="%s?date=%s">%s</a>' % (
reverse('asuzr.views.visit_view'), reverse('asuzr.views.visit_view'),
record['date'].strftime('%d.%m.%Y'), record['date'].strftime('%d.%m.%Y'),
@@ -131,3 +132,4 @@ class VisitTable(tables.Table):
class Meta: class Meta:
attrs = {'class': 'paleblue'} attrs = {'class': 'paleblue'}
template = 'asuzr/table_templ.html'

18
templates/asuzr/base.html
View File

@@ -7,6 +7,7 @@
<script src="{{ STATIC_URL }}admin/js/jquery.min.js" type="text/javascript"></script> <script src="{{ STATIC_URL }}admin/js/jquery.min.js" type="text/javascript"></script>
{% inplace_static %} {% inplace_static %}
<link rel="stylesheet" href="{{ STATIC_URL }}django_tables2/themes/paleblue/css/screen.css" /> <link rel="stylesheet" href="{{ STATIC_URL }}django_tables2/themes/paleblue/css/screen.css" />
<link rel="stylesheet" href="{{ STATIC_URL }}admin/css/base.css" />
<style> <style>
#menu { #menu {
margin: 0; /* Обнуляем значение отступов */ margin: 0; /* Обнуляем значение отступов */
@@ -25,9 +26,13 @@
#menu, #user { #menu, #user {
display: inline; display: inline;
} }
table.paleblue tr.weekend {
background-color: #FFE4E1
}
</style> </style>
</head> </head>
<body> <body>
<div class="breadcrumbs">
{% block menu %} {% block menu %}
<ul id="menu" class="hr"> <ul id="menu" class="hr">
<li><a href={% url 'asuzr-main' 1 5 2015 %}>Таблица посещаемости</a></li> <li><a href={% url 'asuzr-main' 1 5 2015 %}>Таблица посещаемости</a></li>
@@ -37,17 +42,22 @@
{% if request.user.is_staff %}<li><a href={% url 'admin:index' %}>Администрирование</a></li>{% endif %} {% if request.user.is_staff %}<li><a href={% url 'admin:index' %}>Администрирование</a></li>{% endif %}
</ul> </ul>
<div id="user"> <div id="user">
{% if request.user.is_authenticated %} Добро пожаловать, {{ request.user.first_name }} {% if request.user.is_authenticated %}
{% else %}<a href="{% url 'django.contrib.auth.views.login' %}">Вход</a>{% endif %} Добро пожаловать, {{ request.user.first_name }}
<br><a href="{% url 'django.contrib.auth.views.logout' %}">Выход</a> (<a href="{% url 'django.contrib.auth.views.logout' %}">Выход</a>)
{% else %}
(<a href="{% url 'django.contrib.auth.views.login' %}">Вход</a>){% endif %}
</div>
</div> </div>
{% endblock %} {% endblock %}
<div id='content'>
<H1>{% block title %}{{ title }}{% endblock %}</H1> <H1>{% block title %}{{ title }}{% endblock %}</H1>
{% block page %} {% block page %}
Тело страницы Тело страницы
{% endblock %} {% endblock %}
</div>
{% block footer %} {% block footer %}
<hr> <hr>
{% endblock %} {% endblock %}