Merge pull request 'fixes' (#16) from fixes into main

Reviewed-on: #16

inventory/admin.py

@@ -67,8 +67,7 @@ class PantryItemAdmin(admin.ModelAdmin):
     autocomplete_fields = ['category', 'unit']
     inlines = [PantryItemInLine]
 
-    # TODO: make category a model
-    # autocomplete_fields = ['category',]
+    autocomplete_fields = ['category', ]
     fields = (
         'name',
         'category',

inventory/migrations/0001_initial.py

@@ -0,0 +1,72 @@
+# Generated by Django 3.1.3 on 2020-11-08 15:14
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Location',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=200, null=True)),
+                ('in_location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.location')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PantryItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('min_quantity', models.IntegerField(default=1)),
+                ('expiry_duration', models.IntegerField(blank=True, null=True)),
+                ('name', models.CharField(max_length=200)),
+                ('info', models.CharField(blank=True, max_length=200, null=True)),
+                ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.category')),
+                ('location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.location')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Unit',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ShoppingListItem',
+            fields=[
+                ('pantryitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='inventory.pantryitem')),
+            ],
+            bases=('inventory.pantryitem',),
+        ),
+        migrations.CreateModel(
+            name='PantryItemLine',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('quantity', models.IntegerField(default=1)),
+                ('expiry_date', models.DateField(blank=True, null=True)),
+                ('size', models.IntegerField(default=1)),
+                ('info', models.CharField(blank=True, max_length=200, null=True)),
+                ('pantry_item', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='inventory.pantryitem')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='pantryitem',
+            name='unit',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='inventory.unit'),
+        ),
+    ]

inventory/models.py

@@ -85,7 +85,7 @@ class PantryItemLine(models.Model):
         return self.pantry_item.unit
 
     def get_absolute_url(self):
-        return reverse('pantryitemlinedetail', kwargs={'pk': self.pk})
+        return reverse('im:pantryitemlinedetail', kwargs={'pk': self.pk})
 
     def __str__(self):
         return ' '.join([str(x) for x in [self.pantry_item.name,  self.quantity, 'X',

inventory/templates/inventory/base.html

@@ -18,7 +18,7 @@
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
       <li class="nav-item">
-        <a class="nav-link"  href="{% url 'im:consume' %} ">Consume</a>
+        <a class="nav-link"  href="{% url 'im:consumelist' %} ">Consume</a>
       </li>
       <li class="nav-item">
         <a class="nav-link"  href="{% url 'admin:inventory_pantryitem_changelist' %} ">Add</a>

inventory/templates/inventory/consume.html

@@ -1,5 +1,10 @@
 {% extends 'inventory/base.html' %}
 
 {% block content %}
-TODO: add form to mark items as consumed
+<h1>Consume</h1>
+Change quantity for "{{ object }}"
+<form method="post">{% csrf_token %}
+    {{ form.as_p }}
+    <input type="submit" value="Update">
+</form>
 {% endblock %}

inventory/templates/inventory/consumelist.html

@@ -0,0 +1,21 @@
+{% extends 'inventory/base.html' %}
+
+{% block content %}
+<h1>Consume</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 date.list %}
+        <li><a href="{% url 'im:consume' pi.id %}">{{ pi|title}}</a></li>
+    {% endfor %}
+    </ul>
+    </div>
+{% endfor %}
+{% else %}
+    <p>No Pantry Items are available.</p>
+{% endif %}
+
+{% endblock %}

inventory/templates/inventory/pantryitemline_detail.html

@@ -0,0 +1,6 @@
+{% extends 'inventory/base.html' %}
+
+{% block content %}
+<h1>Item Details</h1>
+{{ object }}
+{% endblock %}

inventory/urls.py

@@ -4,10 +4,9 @@ from . import views
 app_name = 'im'
 urlpatterns = [
     path('', views.index, name='index'),
-    path('consume/', views.consume, name='consume'),
+    path('items/<pk>', views.PantryItemLineView.as_view(), name='pantryitemlinedetail'),
+    path('consume/', views.ConsumeList.as_view(), name='consumelist'),
+    path('consume/<pk>/', views.Consume.as_view(), name='consume'),
     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'),
 ]

inventory/views.py

@@ -12,10 +12,6 @@ def index(request):
     return render(request, "inventory/index.html")
 
 
-def consume(request):
-    return render(request, "inventory/consume.html")
-
-
 class Shoppinglist(generic.ListView):
     template_name = "inventory/shoppinglist.html"
     context_object_name = 'pis'
@@ -36,3 +32,25 @@ class Expirations(generic.ListView):
 
     def get_queryset(self):
         return PantryItemLine.objects.exclude(expiry_date__isnull=True).exclude(quantity=0).order_by('expiry_date')
+
+
+class ConsumeList(generic.ListView):
+    template_name = "inventory/consumelist.html"
+    context_object_name = 'pis'
+
+    def get_queryset(self):
+        return PantryItemLine.objects.exclude(quantity=0).order_by('expiry_date')
+
+
+class Consume(generic.UpdateView):
+    template_name = "inventory/consume.html"
+    fields = ['quantity']
+
+    context_object_name = 'pis'
+
+    def get_queryset(self):
+        return PantryItemLine.objects.exclude(quantity=0).order_by('expiry_date')
+
+
+class PantryItemLineView(generic.DetailView):
+    model = PantryItemLine