Rework ingredients modeling

keuken/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from .models import Recipe
+from .models import Ingredient, Ingredients, Recipe
 
+admin.site.register(Ingredient)
+admin.site.register(Ingredients)
 admin.site.register(Recipe)
-

keuken/models.py

@@ -1,15 +1,32 @@
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.contrib.auth.models import User
 
+
+class Ingredient(models.Model):
+    quantity = models.DecimalField(decimal_places=2, max_digits=6)
+    unit = models.CharField(max_length=32, blank=True)
+    name = models.CharField(max_length=32, blank=False)
+    origin = models.ForeignKey('Ingredients')
+
+    def __str__(self):
+        return '{}{} {}'.format(self.quantity, self.unit, self.name)
+
+
+class Ingredients(models.Model):
+    name = models.CharField(max_length=256, blank=True)
+    note = models.TextField(blank=True)
+    recipe = models.ForeignKey('Recipe', blank=False)
+
+    def __str__(self):
+        return '{} ({})'.format(self.name or 'Ingredients', self.recipe)
+
+
 class Recipe(models.Model):
-    name = models.CharField(max_length = 256, blank = False)
+    name = models.CharField(max_length=256, blank=False)
     author = models.ForeignKey(User)
-    pub_date = models.DateField(auto_now_add = True)
-    # a free form text field containing the ingredient list
-    ingredients = models.TextField(blank = False)
+    pub_date = models.DateField(auto_now_add=True)
     # a free form text field containing the cooking directions
-    directions = models.TextField(blank = False)
+    directions = models.TextField(blank=False)
 
     def __str__(self):
         return self.name

templates/keuken/recipe.html

@@ -13,7 +13,16 @@ <h2>{{ recipe.name }}</h2>
 
     <section>
         <h3>Ingredients</h3>
-        {{ recipe.ingredients|markdown }}
+		{# XXX: The double related managers is going to hurt with lots of entries, but works for now. #}
+		{% for ingredients in recipe.ingredients_set.all %}
+			{% if ingredients.name %}{{ ingredients.name }}{% endif %}
+			<ul>
+			{% for ingredient in ingredients.ingredient_set.all %}
+				<li>{{ ingredient }}</li>
+			{% endfor %}
+			</ul>
+			{% if ingredients.note %}{{ ingredients.note|markdown }}{% endif %}
+		{% endfor %}
     </section>
 
     <section>
@@ -22,4 +31,4 @@ <h3>Directions</h3>
     </section>
 </article>
 
-{% endblock %}
+{% endblock %}