added shopping list view, fixed expirations view

README.md

@@ -29,6 +29,7 @@ The object of this django app is to keep track of which goods you own, when they
 # feature requests
 ## High
 - shopping list based on min quantity
+- make it look something like this https://getbootstrap.com/docs/4.0/examples/dashboard/
 
 - one off shoping list
 

inventory/models.py

@@ -38,7 +38,7 @@ UNITS = (
 class PantryItem(models.Model):
     # user?
     name =  models.CharField(max_length=200)
-    category = models.CharField(max_length=200, choices=CATEGORIES)
+    category = models.CharField(max_length=200, choices=CATEGORIES, default='UC')
     min_quantity = models.IntegerField(default=1) #, decimal_places=3, max_digits=32)
     unit = models.CharField(max_length=20, null=True, blank=True, choices=UNITS)
     info = models.CharField(max_length=200, null=True, blank=True)
@@ -48,12 +48,15 @@ class PantryItem(models.Model):
 
 class PantryItemLine(models.Model):
     # user?
-    pantry_item = models.ForeignKey(PantryItem, on_delete=models.PROTECT, default='UC' )
+    pantry_item = models.ForeignKey(PantryItem, on_delete=models.PROTECT)
     quantity = models.IntegerField(default=1)
     expiry_date = models.DateField(null=True, blank=True)
     size = models.IntegerField(default=1) #, decimal_places=3, max_digits=32)
     unit = models.CharField(max_length=20, null=True, blank=True, choices=UNITS)
     info = models.CharField(max_length=200, null=True, blank=True)
 
+    def get_absolute_url(self):
+        return reverse('pantryitemlinedetail', kwargs={'pk': self.pk})
+
     def __str__(self):
-        return self.pantry_item.name + ' ' + str(self.quantity)
+        return ' '.join([str(x) for x in [self.pantry_item.name,  self.quantity, 'X', self.size, self.unit]])

inventory/templates/inventory/base.html

@@ -20,6 +20,10 @@
       <li class="nav-item">
         <a class="nav-link"  href="{% url 'im:consume' %} ">Consume</a>
       </li>
+      <li class="nav-item">
+        <a class="nav-link"  href="{% url 'admin:inventory_pantryitemline_add' %} ">Add</a>
+      </li>
+
 <li class="nav-item">
         <a class="nav-link"  href="{% url 'im:shoppinglist' %} ">Shopping List</a>
       </li>

inventory/templates/inventory/expirations.html

@@ -1,12 +1,19 @@
 {% extends 'inventory/base.html' %}
 
 {% block content %}
+<h1>Expirations</h1>
 {% if pis %}
+{% regroup pis by expiry_date as pis_by_date %}
+{% for date in pis_by_date %}
+    <div class="content">
+    <h2>{{ date.grouper|date:"d F Y" }}</h2>
     <ul>
-    {% for pi in pis %}
-        <li><a href="{% url 'im:pantryitemlinedetail' pi.id %}">{{ pi}}</a></li>
+    {% for pi in date.list %}
+        <li><a href="{% url 'admin:inventory_pantryitemline_change' pi.id %}">{{ pi}}</a></li>
     {% endfor %}
     </ul>
+    </div>
+{% endfor %}
 {% else %}
     <p>No Pantry Items are available.</p>
 {% endif %}

inventory/templates/inventory/pantryitemline_detail.html

@@ -1,5 +0,0 @@
-{% extends 'inventory/base.html' %}
-
-{% block content %}
-{{ pantryitemline }}
-{% endblock %}

inventory/templates/inventory/shoppinglist.html

@@ -1,5 +1,14 @@
 {% extends 'inventory/base.html' %}
 
 {% block content %}
-TODO: add list of items below minimal level
+<h1>Shopping list</h1>
+    <ul>
+{% for pi in pis%}
+<li>
+   {{ pi }} (We have
+   {{ pi.total_quantity }} {{pi.unit}} but we want at least
+   {{ pi.min_quantity }} {{pi.unit }})
+</li>
+{% endfor %}
+    </ul>
 {% endblock %}

inventory/urls.py

@@ -5,11 +5,10 @@ app_name = 'im'
 urlpatterns = [
     path('', views.index, name='index'),
     path('consume/', views.consume, name='consume'),
-    path('shoppinglist/', views.shoppinglist, name='shoppinglist'),
+    path('shoppinglist/', views.Shoppinglist.as_view(), name='shoppinglist'),
     # TODO: add exiperes before X date?
     # TODO: add categories
     # TODO: add pantry item selection
     path('expirations/', views.Expirations.as_view(), name='expirations'),
-    #TODO: later: add edit views instead of admin edits
     path('item/<int:pk>/', views.DetailView.as_view(), name='pantryitemlinedetail'),
 ]

inventory/views.py

@@ -1,8 +1,11 @@
 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 .models import PantryItemLine
+
+from .models import PantryItem, PantryItemLine
 
 # Create your views here.
 
@@ -15,8 +18,17 @@ def consume(request):
     return render(request, "inventory/consume.html")
 
 
-def shoppinglist(request):
-    return render(request, "inventory/shoppinglist.html")
+def add(request):
+    return render(request, "inventory/add.html")
+
+class Shoppinglist(generic.ListView):
+    template_name = "inventory/shoppinglist.html"
+    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'))
+
 
 
 class Expirations(generic.ListView):
@@ -24,7 +36,7 @@ class Expirations(generic.ListView):
     context_object_name = 'pis'
 
     def get_queryset(self):
-        return PantryItemLine.objects.order_by('-expiry_date')
+        return PantryItemLine.objects.exclude(expiry_date__isnull=True).order_by('expiry_date')
 
 
 class DetailView(generic.DetailView):