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

Something

Browse Source
This commit is contained in:
Anastasia
2015-05-09 21:34:56 +05:00
parent c6ae0b5f73
commit 4980326de3
15 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
*swp
*.pyc
db*

BIN
asuzr/.views.py.kate-swp
View File

Binary file not shown.

BIN
asuzr/__init__.pyc
View File

Binary file not shown.

BIN
asuzr/admin.pyc
View File

Binary file not shown.

8
asuzr/models.py
View File

@@ -3,6 +3,7 @@
from django.db import models
from django.contrib.auth.models import User
from datetime import date, timedelta
# Create your models here.
#Соответствие названий и номеров дней недели
@@ -87,6 +88,13 @@ class Order(models.Model):
def ostatok(self):
return self.price-self.paid
@property
def calls_color(self):
need_color=False
if self.approved!=None:
need_color = (date.today()-self.approved.date()>= timedelta(days = 10))
return need_color
#Эскизы
class Sketch(models.Model):
sketch_file = models.FileField(upload_to = 'sketches') #путь к файу

BIN
asuzr/models.pyc
View File

Binary file not shown.

10
asuzr/views.py
View File

@@ -69,11 +69,17 @@ def main(request, day, month, year):
})
return HttpResponse(t.render(c))
def orders (request):
order_list = Order.objects.filter(is_done=False).order_by('-id')
def orders (request, archive):
if archive=='0':
is_done_value=False
else:
is_done_value=True
order_list = Order.objects.filter(is_done=is_done_value).order_by('-id')
t=loader.get_template('asuzr/orders.html')
c=Context({
'order_list': order_list,
'archive': is_done_value,
})
return HttpResponse(t.render(c))

BIN
asuzr/views.pyc
View File

Binary file not shown.

BIN
db.sqlite3
View File

Binary file not shown.

BIN
record/__init__.pyc
View File

Binary file not shown.

BIN
record/settings.pyc
View File

Binary file not shown.

2
record/urls.py
View File

@@ -10,6 +10,6 @@ urlpatterns = patterns('',
url(r'^product/$', 'asuzr.views.prod_list'),
url(r'^product/(?P<prod_id>\d+)/$', 'asuzr.views.prod_detail'),
url(r'^main/(?P<day>\d+)/(?P<month>\d+)/(?P<year>\d+)/$', 'asuzr.views.main', name='asuzr-main'),
url(r'^orders/$', 'asuzr.views.orders'),
url(r'^orders/(?P<archive>\d+)/$', 'asuzr.views.orders'),
url(r'^admin/', include(admin.site.urls)),
)

BIN
record/urls.pyc
View File

Binary file not shown.

BIN
record/wsgi.pyc
View File

Binary file not shown.

5
templates/asuzr/orders.html
View File

@@ -5,7 +5,7 @@
<style></style>
</head>
<body>
<H1>Таблица выхода заказов</H1>
<H1>{% if archive %} Архивная таблица заказов {% else %} Таблица выхода заказов {% endif %}</H1>
<TABLE BORDER WIDTH="100%">
{% if order_list %}
<ul>
@@ -23,8 +23,10 @@
<TH>Эскиз</TH>
<TH>Исполнитель</TH>
<TH>Сдан</TH>
{% if archive %} <TH>Обзвон</TH> {% endif %}
</TR>
{% for order in order_list %}
<TR>
<TD>{{ order.date_dmy }}</TD>
<TD>{{ order.deadline_dmy }}</TD>
@@ -39,6 +41,7 @@
<TD>{{order.sketch.sketch_file}}</TD>
<TD>{{ order.executor.first_name }}</TD>
<TD>{%if order.is_done%} Да {%else%} Нет {% endif %}</TD>
{% if archive %} <TD {% if order.calls_color%} bgcolor='FFFACD' {% endif %}>{{ order.calls}}</TD> {% endif %}
</TR>
{% endfor %}
</ul>