klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-11-03 18:43:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better sum writing

Browse Source
This commit is contained in:
Antoine Bartuccio
2017-04-05 14:23:51 +02:00
parent 53a2a160be
commit 6ca183ad55
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
counter/views.py
View File

@@ -1031,14 +1031,10 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
start_date = start_date.replace(tzinfo=pytz.UTC) start_date = start_date.replace(tzinfo=pytz.UTC)
end_date = (start_date + timedelta(days=32)).replace(day=1, hour=0, minute=0, microsecond=0) end_date = (start_date + timedelta(days=32)).replace(day=1, hour=0, minute=0, microsecond=0)
from django.db.models import Sum, Case, When, F, DecimalField from django.db.models import Sum, Case, When, F, DecimalField
sum_cb = 0 kwargs['sum_cb']= sum([r.amount for r in Refilling.objects.filter(payment_method='CARD', is_validated=True,
for r in Refilling.objects.filter(payment_method='CARD', is_validated=True, date__gte=start_date, date__lte=end_date)]) + sum(
date__gte=start_date, date__lte=end_date): [s.quantity*s.unit_price for s in Selling.objects.filter(payment_method='CARD', is_validated=True,
sum_cb +=r.amount date__gte=start_date, date__lte=end_date)])
for s in Selling.objects.filter(payment_method='CARD', is_validated=True,
date__gte=start_date, date__lte=end_date):
sum_cb +=s.quantity*s.unit_price
kwargs['sum_cb'] = sum_cb
kwargs['start_date'] = start_date kwargs['start_date'] = start_date
kwargs['sums'] = Selling.objects.values('club__name').annotate(selling_sum=Sum( kwargs['sums'] = Selling.objects.values('club__name').annotate(selling_sum=Sum(
Case(When(date__gte=start_date, Case(When(date__gte=start_date,