Для шаблона main параметры сделаны необязательными

This commit is contained in:
Anastasia
2015-06-11 11:07:42 +05:00
parent ec6fbc0607
commit 36d5b32628
7 changed files with 16 additions and 7 deletions

View File

@@ -89,6 +89,9 @@ class DesignerTable(tables.Table):
def render_sum_price(self, value):
return '%0.1f' % value
class Meta:
attrs = {'class': 'paleblue'}
class SketchesTable(tables.Table):
sketch_file = tables.FileColumn(verbose_name = 'Имя файла')

View File

@@ -44,6 +44,13 @@ def get_orders_by_date(dt):
@login_required
def main(request, day, month, year):
if day == None:
day = str(date.today().day)
if month == None:
month = str(date.today().month)
if year == None:
year = str(date.today().year)
d,m,y=int(day),int(month), int(year)
attend_list = Attendance.objects.all().order_by('date')
@@ -129,7 +136,7 @@ def desreport(request):
edate = datetime.strptime(end_date, '%d.%m.%y')
Table = DesignerTable
table = Table(Order.objects.filter(cancelled=False, date__range=(sdate,edate)).values('designer__first_name','designer__last_name').annotate(Sum('price'),Count('designer')))
title = 'Отчет по дизайнерам за '+' - '.join((start_date, end_date))
title = u'Отчет по дизайнерам за '+' - '.join((start_date, end_date))
RequestConfig(request).configure(table)
return render(request, 'asuzr/table.html', {'table': table, 'title': title})