Sulley
/
ComptaClub
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Close #5

This commit is contained in:
Gregory Trullemans 2022-04-28 21:13:02 +02:00
parent 000b9938a1
commit ea76f2055c
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/eventCompta/views.py
View File

@ -97,28 +97,26 @@ def event_details(request, event_id):
sum_recette = event.transactions.filter(
transaction_type__transaction_type=1
).aggregate(Sum("totalAmount"))
).aggregate(Sum("totalAmount"))["totalAmount__sum"]
sum_depense = event.transactions.filter(
transaction_type__transaction_type=0
).aggregate(Sum("totalAmount"))
).aggregate(Sum("totalAmount"))["totalAmount__sum"]
if not isinstance(sum_recette, float):
sum_recette = 0
if not isinstance(sum_depense, float):
sum_depense = 0
total_simulated_amount = sum_recette - sum_depense
nonsimulated_sum_recette = event.transactions.filter(
transaction_type__transaction_type=1, is_simulated=False
).aggregate(Sum("totalAmount"))
nonsimulated_sum_dépense = event.transactions.filter(
nonsimulated_sum_depense = event.transactions.filter(
transaction_type__transaction_type=0, is_simulated=False
).aggregate(Sum("totalAmount"))
# total_simulated_amount = __compute_sum_amount(transaction_list, with_simulated=True)
total_simulated_amount = (
event.transactions.filter(transaction_type__transaction_type=1).aggregate(
Sum("totalAmount")
)["totalAmount__sum"]
- event.transactions.filter(transaction_type__transaction_type=0).aggregate(
Sum("totalAmount")
)["totalAmount__sum"]
)
total_amount = 0
previous_date = None
date_sum = OrderedDict()
@ -146,10 +144,10 @@ def event_details(request, event_id):
"total_simulated_Amount": total_simulated_amount,
"date_sum": date_sum,
"date_sum_simulated": date_sum_with_simulated,
"sum_recette": sum_recette["totalAmount__sum"],
"sum_depense": sum_depense["totalAmount__sum"],
"sum_recette": sum_recette,
"sum_depense": sum_depense,
"nonsimulated_sum_recette": nonsimulated_sum_recette["totalAmount__sum"],
"nonsimulated_sum_dépense": nonsimulated_sum_dépense["totalAmount__sum"],
"nonsimulated_sum_depense": nonsimulated_sum_depense["totalAmount__sum"],
}
return render(request, "event/details.html", context)