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

Merge branch 'master' of ssh://192.168.100.6/repo/record

Browse Source
This commit is contained in:
Denis V. Dedkov
2015-05-16 15:56:25 +05:00
parent e0f6275268 c09b5f59b1
commit 7c19a78d70
3 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
asuzr/views.py
View File

@@ -5,7 +5,9 @@ from asuzr.models import Product
from asuzr.models import Attendance from asuzr.models import Attendance
from asuzr.models import Order from asuzr.models import Order
from asuzr.models import OrderPlan from asuzr.models import OrderPlan
from datetime import datetime, date, time from datetime import datetime, date
from django.db.models import Count, Sum
# Create your views here. # Create your views here.
def prod_list(request): def prod_list(request):
@@ -83,4 +85,20 @@ def orders (request, archive):
}) })
return HttpResponse(t.render(c)) return HttpResponse(t.render(c))
def desreport(request):
start_date = request.GET.get('sdate', date.today().strftime('%d.%m.%y'))
sdate = datetime.strptime(start_date, '%d.%m.%y')
end_date = request.GET.get('edate', date.today().strftime('%d.%m.%y'))
edate = datetime.strptime(end_date, '%d.%m.%y')
des_list = Order.objects.filter(cancelled=False, date__range=(sdate,edate)).values('designer__first_name').annotate(Sum('price'),Count('designer'))
t=loader.get_template('asuzr/desreport.html')
c=Context({
'des_list' : des_list,
'start_date' : start_date,
'end_date' : end_date,
})
return HttpResponse(t.render(c))

1
record/urls.py
View File

@@ -11,5 +11,6 @@ urlpatterns = patterns('',
url(r'^product/(?P<prod_id>\d+)/$', 'asuzr.views.prod_detail'), 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'^main/(?P<day>\d+)/(?P<month>\d+)/(?P<year>\d+)/$', 'asuzr.views.main', name='asuzr-main'),
url(r'^orders/(?P<archive>\d+)/$', 'asuzr.views.orders'), url(r'^orders/(?P<archive>\d+)/$', 'asuzr.views.orders'),
url(r'^desreport/$', 'asuzr.views.desreport'),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
) )

29
templates/asuzr/desreport.html Normal file
View File

@@ -0,0 +1,29 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<H3>Отчет по дизайнерам за {{start_date}} - {{end_date}} </H3>
<TABLE BORDER WIDTH="30%">
{% if des_list %}
<ul>
<TR>
<TH WIDTH="40%">Дизайнер</TH>
<TH>Всего заказов</TH>
<TH>Общая сумма</TH>
</TR>
{% for des in des_list %}
<TR>
<TD>{{des.designer__first_name}}</TD>
<TD>{{des.designer__count}}</TD>
<TD>{{des.price__sum}}</TD>
</TR>
{% endfor %}
</ul>
{% else %}
<p>Список заказов пуст</p>
{% endif %}
</body>
</html>