DGNum/gestioCOF
14
2
Fork 2
Code Issues 79 Pull requests 18 Projects Releases 12 Packages Wiki Activity Actions

Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats

Browse source
This commit is contained in:
Qwann 2016-12-11 20:45:52 +01:00
commit 4da9327666
5 changed files with 77 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kfet/views.py
View file

@ -493,7 +493,8 @@ class AccountGroupUpdate(UpdateView):
class AccountNegativeList(ListView):
queryset = (AccountNegative.objects
.select_related('account', 'account__cofprofile__user'))
.select_related('account', 'account__cofprofile__user')
.exclude(account__trigramme='#13'))
template_name = 'kfet/account_negative.html'
context_object_name = 'negatives'
@ -504,12 +505,13 @@ class AccountNegativeList(ListView):
'overdraft_duration': Settings.OVERDRAFT_DURATION(),
}
negs_sum = (AccountNegative.objects
.exclude(account__trigramme='#13')
.aggregate(
bal = Coalesce(Sum('account__balance'),0),
offset = Coalesce(Sum('balance_offset'),0),
)
)
context['negatives_sum'] = negs_sum['bal'] + negs_sum['offset']
context['negatives_sum'] = negs_sum['bal'] - negs_sum['offset']
return context
# -----