From 42072eff822de0e4aadd76c1276003503e80db15 Mon Sep 17 00:00:00 2001 From: "Denis V. Dedkov" Date: Wed, 17 Jun 2015 00:33:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=81=D1=82=D1=8B=D0=B5=20=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D0=B5=D0=B3=D0=B0=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Агрегаты возвращают NoneType вместо кошерного 0, поэтому пришлось добавить дополнительную проверку --- asuzr/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/asuzr/views.py b/asuzr/views.py index a3bb3d4..cfb2ed2 100644 --- a/asuzr/views.py +++ b/asuzr/views.py @@ -73,7 +73,7 @@ def get_attendance_table(year, month, prefix): month_plan = OrderPlan.objects.filter(date = sdate).first() month_plan = 0 if month_plan == None else month_plan.plan - month_balance = month_plan - order_sum['price__sum'] + month_balance = month_plan - (order_sum['price__sum'] or 0) additional_info = {'title': 'Справочно', 'rows': [ @@ -85,10 +85,10 @@ def get_attendance_table(year, month, prefix): table = VisitTable(month_days.values(), prefix = prefix) table.verbose_name = 'Сводная информация' table.set_summaries({ - 'calls': attend_sum['calls__sum'], - 'visits': attend_sum['visits__sum'], - 'orders': order_sum['product__count'], - 'cost': order_sum['price__sum'], + 'calls': attend_sum['calls__sum'] or 0, + 'visits': attend_sum['visits__sum'] or 0, + 'orders': order_sum['product__count'] or 0, + 'cost': order_sum['price__sum'] or 0, }) return table, additional_info @@ -98,7 +98,7 @@ def get_day_orders_table(date, prefix): orders_price = orders.aggregate(Sum('price')) table = DayOrdersTable(orders, prefix = prefix) table.verbose_name = 'Заказы на %s' % date.strftime('%d %B %Y г') - table.set_summary(orders_price['price__sum']) + table.set_summary(orders_price['price__sum'] or 0) return table