diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5934b6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*swp +*.pyc +db* diff --git a/asuzr/.views.py.kate-swp b/asuzr/.views.py.kate-swp deleted file mode 100644 index 1a8ec4a..0000000 Binary files a/asuzr/.views.py.kate-swp and /dev/null differ diff --git a/asuzr/__init__.pyc b/asuzr/__init__.pyc deleted file mode 100644 index 69efdda..0000000 Binary files a/asuzr/__init__.pyc and /dev/null differ diff --git a/asuzr/admin.pyc b/asuzr/admin.pyc deleted file mode 100644 index 76624d1..0000000 Binary files a/asuzr/admin.pyc and /dev/null differ diff --git a/asuzr/models.py b/asuzr/models.py index 006eb4a..87f0271 100644 --- a/asuzr/models.py +++ b/asuzr/models.py @@ -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') #путь к файу diff --git a/asuzr/models.pyc b/asuzr/models.pyc deleted file mode 100644 index 4e5cf7c..0000000 Binary files a/asuzr/models.pyc and /dev/null differ diff --git a/asuzr/views.py b/asuzr/views.py index a8fee6d..2329004 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -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)) diff --git a/asuzr/views.pyc b/asuzr/views.pyc deleted file mode 100644 index 7833b76..0000000 Binary files a/asuzr/views.pyc and /dev/null differ diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index 5d8328c..0000000 Binary files a/db.sqlite3 and /dev/null differ diff --git a/record/__init__.pyc b/record/__init__.pyc deleted file mode 100644 index addc66b..0000000 Binary files a/record/__init__.pyc and /dev/null differ diff --git a/record/settings.pyc b/record/settings.pyc deleted file mode 100644 index c38dfe4..0000000 Binary files a/record/settings.pyc and /dev/null differ diff --git a/record/urls.py b/record/urls.py index c5b0f89..938d4fb 100644 --- a/record/urls.py +++ b/record/urls.py @@ -10,6 +10,6 @@ urlpatterns = patterns('', url(r'^product/$', 'asuzr.views.prod_list'), 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'^orders/$', 'asuzr.views.orders'), + url(r'^orders/(?P\d+)/$', 'asuzr.views.orders'), url(r'^admin/', include(admin.site.urls)), ) diff --git a/record/urls.pyc b/record/urls.pyc deleted file mode 100644 index 306caf3..0000000 Binary files a/record/urls.pyc and /dev/null differ diff --git a/record/wsgi.pyc b/record/wsgi.pyc deleted file mode 100644 index 71c5134..0000000 Binary files a/record/wsgi.pyc and /dev/null differ diff --git a/templates/asuzr/orders.html b/templates/asuzr/orders.html index b6cdab8..4e8c599 100644 --- a/templates/asuzr/orders.html +++ b/templates/asuzr/orders.html @@ -5,7 +5,7 @@ -

Таблица выхода заказов

+

{% if archive %} Архивная таблица заказов {% else %} Таблица выхода заказов {% endif %}

{% if order_list %}
    @@ -23,8 +23,10 @@
+ {% if archive %} {% endif %} {% for order in order_list %} + @@ -39,6 +41,7 @@ + {% if archive %} {% endif %} {% endfor %}
Эскиз Исполнитель СданОбзвон
{{ order.date_dmy }} {{ order.deadline_dmy }}{{order.sketch.sketch_file}} {{ order.executor.first_name }} {%if order.is_done%} Да {%else%} Нет {% endif %}{{ order.calls}}