jens
/
im
1
0
Fork 1
Code Issues 10 Pull Requests Releases 1 Wiki Activity

bugfix for shopping list, also show items that have min quantity great than 0 but no itemlines

This commit is contained in:
Jens Timmerman 2018-09-30 15:50:30 +02:00
parent e21b7ec33d
commit fe56c86007
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inventory/views.py
View File

@ -2,7 +2,7 @@ from django.shortcuts import render, get_object_or_404
from django.http import HttpResponse
from django.views import generic
from django.views.generic.edit import CreateView, DeleteView, UpdateView
from django.db.models import F, Sum
from django.db.models import F, Sum, Q
from .models import PantryItem, PantryItemLine
@ -23,8 +23,12 @@ class Shoppinglist(generic.ListView):
context_object_name = 'pis'
def get_queryset(self):
return PantryItem.objects.annotate(total_quantity=Sum(F('pantryitemline__quantity') * F('pantryitemline__size'))).filter(min_quantity__gt=F('total_quantity'))
#return PantryItemLine.objects.filter(quantity__lt=F('pantry_item__min_quantity'))
"""
Return pantryitems for which we have None itemlines or Itemlines whith a total quantitly less than required
"""
return PantryItem.objects.annotate(total_quantity=Sum(F('pantryitemline__quantity') *
F('pantryitemline__size'))).filter(Q(min_quantity__gt=F('total_quantity')) | Q(pantryitemline=None,
min_quantity__gt=0))
class Expirations(generic.ListView):