Specto fixes #9

Merged
confestim merged 7 commits from specto-fixes into main 2021-09-10 16:35:54 +02:00
Showing only changes of commit 39700082e1 - Show all commits

View File

@ -5,10 +5,12 @@ from django.conf import settings
from users.models import User
import operator
from upload.models import Media
from django.db.models import Sum
def homePage(request):
iter_var = 0
all_balance = []
all_balance = 0
Cashier = False
Processor = False
@ -29,19 +31,19 @@ def homePage(request):
userQR = f"Name = {request.user.username}, Date Joined = {request.user.date_joined.date()}, ID = {request.user.id}, isCashier={Cashier}, isProcessor={Processor}, Balance = {userBalance}"
else:
userQR=None
a = Balance.objects.all()
for user in a:
all_balance.append(user.balanceValue)
print(f"{all_balance}")
limited_coins = settings.ALL_COINS - sum(all_balance)
# Use aggregation that can be calculated in database (fast)
all_balance = Balance.objects.all().aggregate(s=Sum("balanceValue"))['s']
# print(f"{all_balance}")
limited_coins = settings.ALL_COINS - all_balance
context = {
"isCashier": Cashier,
"isProcessor": Processor,
"userQR":userQR,
"fullbalance": limited_coins,
"currencyTotal": sum(all_balance),
"userBalance": userBalance
"currencyTotal": all_balance,
"userBalance": userBalance,
}