1 files changed, 18 insertions, 13 deletions

diff --git a/recipe/models.py b/recipe/models.py
index fc611a3..1db7f42 100644
--- a/recipe/models.py
+++ b/recipe/models.py
@@ -1,5 +1,4 @@
 from django.db import models
-from django.db.models import fields
 
 
 class Unit(models.Model):
@@ -7,8 +6,14 @@ class Unit(models.Model):
     class Meta:
         ordering = ('name',)
 
-    name = fields.CharField(max_length=100)
-    abbreviation = fields.CharField(max_length=10, blank=True, null=True)
+    name = models.CharField(max_length=100)
+    abbreviation = models.CharField(max_length=10, blank=True, null=True)
+    grams = models.DecimalField(max_digits=10, decimal_places=10,
+            blank=True, null=True,
+            help_text="Conversion from this unit to grams (dry measure)")
+    liters = models.DecimalField(max_digits=10, decimal_places=10,
+            blank=True, null=True,
+            help_text="Conversion from this unit to liters (liquid measure)")
 
     def __unicode__(self):
         return "{0} ({1})".format(self.name, self.abbreviation)
@@ -19,14 +24,14 @@ class Recipe(models.Model):
     class Meta:
         ordering = ('title',)
 
-    title = fields.CharField(max_length=100)
-    slug = fields.SlugField(max_length=150)
-    description = fields.TextField(blank=True, null=True)
-    servings = fields.IntegerField(blank=True, null=True)
-    instructions = fields.TextField()
-    oven_temp = fields.IntegerField(blank=True, null=True)
-    cook_time = fields.IntegerField(blank=True, null=True, help_text="In minutes")
-    prep_time = fields.IntegerField(blank=True, null=True, help_text="In minutes")
+    title = models.CharField(max_length=100)
+    slug = models.SlugField(max_length=150)
+    description = models.TextField(blank=True, null=True)
+    servings = models.IntegerField(blank=True, null=True)
+    instructions = models.TextField()
+    oven_temp = models.IntegerField(blank=True, null=True)
+    cook_time = models.IntegerField(blank=True, null=True, help_text="In minutes")
+    prep_time = models.IntegerField(blank=True, null=True, help_text="In minutes")
 
     def __unicode__(self):
         return self.title
@@ -37,7 +42,7 @@ class Ingredient(models.Model):
     class Meta:
         ordering = ('name',)
 
-    name = fields.CharField(max_length=100, unique=True)
+    name = models.CharField(max_length=100, unique=True)
 
     def __unicode__(self):
         return self.name
@@ -47,7 +52,7 @@ class RecipeIngredient(models.Model):
 
     ingredient = models.ForeignKey(Ingredient)
     units = models.ForeignKey(Unit)
-    quantity = fields.FloatField()
+    quantity = models.FloatField()
     recipe = models.ForeignKey(Recipe)
 
     def __unicode__(self):