cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Petit refactor

Browse source
This commit is contained in:
Ludovic Stephan 2019-12-25 12:39:41 +01:00
parent 8d11044610
commit b450cb09e6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kfet/views.py
View file

@ -1407,16 +1407,13 @@ def history_json(request):
transfers_only = request.POST.get("transfersonly", None) transfers_only = request.POST.get("transfersonly", None)
opes_only = request.POST.get("opesonly", None) opes_only = request.POST.get("opesonly", None)
# Construction de la requête (sur les opérations) pour le prefetch # Construction de la requête (sur les transferts) pour le prefetch
ope_queryset_prefetch = Operation.objects.select_related(
"article", "canceled_by", "addcost_for"
)
ope_prefetch = Prefetch("opes", queryset=ope_queryset_prefetch)
transfer_queryset_prefetch = Transfer.objects.select_related( transfer_queryset_prefetch = Transfer.objects.select_related(
"from_acc", "to_acc", "canceled_by" "from_acc", "to_acc", "canceled_by"
) )
# Le check sur les comptes est dans le prefetch pour les transferts
if accounts: if accounts:
transfer_queryset_prefetch = transfer_queryset_prefetch.filter( transfer_queryset_prefetch = transfer_queryset_prefetch.filter(
Q(from_acc__trigramme__in=accounts) | Q(to_acc__trigramme__in=accounts) Q(from_acc__trigramme__in=accounts) | Q(to_acc__trigramme__in=accounts)
@ -1435,6 +1432,12 @@ def history_json(request):
"transfers", queryset=transfer_queryset_prefetch, to_attr="filtered_transfers" "transfers", queryset=transfer_queryset_prefetch, to_attr="filtered_transfers"
) )
# Construction de la requête (sur les opérations) pour le prefetch
ope_queryset_prefetch = Operation.objects.select_related(
"article", "canceled_by", "addcost_for"
)
ope_prefetch = Prefetch("opes", queryset=ope_queryset_prefetch)
# Construction de la requête principale # Construction de la requête principale
opegroups = ( opegroups = (
OperationGroup.objects.prefetch_related(ope_prefetch) OperationGroup.objects.prefetch_related(ope_prefetch)