mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-22 06:03:20 +00:00
club: use sums in bdd for ClubSellingView
This commit is contained in:
parent
7d40e11144
commit
a73f5cb270
@ -37,6 +37,8 @@ from django.utils.translation import ugettext_lazy as _
|
|||||||
from django.utils.translation import ugettext as _t
|
from django.utils.translation import ugettext as _t
|
||||||
from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS
|
from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS
|
||||||
from django.shortcuts import get_object_or_404, redirect
|
from django.shortcuts import get_object_or_404, redirect
|
||||||
|
from django.db.models import Sum
|
||||||
|
|
||||||
|
|
||||||
from core.views import (
|
from core.views import (
|
||||||
CanCreateMixin,
|
CanCreateMixin,
|
||||||
@ -365,19 +367,20 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
|
|||||||
if form.cleaned_data["archived_products"]:
|
if form.cleaned_data["archived_products"]:
|
||||||
selected_products.extend(form.cleaned_data["selected_products"])
|
selected_products.extend(form.cleaned_data["selected_products"])
|
||||||
|
|
||||||
print(selected_products)
|
|
||||||
|
|
||||||
if len(selected_products) > 0:
|
if len(selected_products) > 0:
|
||||||
qs = qs.filter(product__in=selected_products)
|
qs = qs.filter(product__in=selected_products)
|
||||||
|
|
||||||
kwargs["result"] = qs.all().order_by("-id")
|
kwargs["result"] = qs.all().order_by("-id")
|
||||||
for selling in kwargs["result"]:
|
kwargs["total"] = sum([s.quantity * s.unit_price for s in kwargs["result"]])
|
||||||
kwargs["total"] += selling.quantity * selling.unit_price
|
total_quantity = qs.all().aggregate(Sum("quantity"))
|
||||||
kwargs["total_quantity"] += selling.quantity
|
if total_quantity["quantity__sum"]:
|
||||||
if hasattr(selling, "product"):
|
kwargs["total_quantity"] = total_quantity["quantity__sum"]
|
||||||
kwargs["benefit"] += selling.product.purchase_price
|
benefit = (
|
||||||
|
qs.exclude(product=None).all().aggregate(Sum("product__purchase_price"))
|
||||||
|
)
|
||||||
|
if benefit["product__purchase_price__sum"]:
|
||||||
|
kwargs["benefit"] = benefit["product__purchase_price__sum"]
|
||||||
|
|
||||||
kwargs["benefit"] = kwargs["total"] - kwargs["benefit"]
|
|
||||||
return kwargs
|
return kwargs
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user