updated models

platty/platty/models.py

@@ -1,18 +1,19 @@
 from django.db import models
-#from django.contrib.auth.models import User
-
-# Create your models here.
-#Eric - This is where database wrappers go
+from django.contrib.auth.models import User
 
 class Event(models.Model):
 	date_time = models.DateTimeField()
 	name = models.CharField(max_length=64)
-	location = models.CharField(max_length=128)
+	addressLineOne = models.CharField(max_length=128)
+	addressLineTwo = models.CharField(max_length=128)
+	city = models.CharField(max_length=36)
+	state = models.CharField(max_length=2)
+	zipCode = models.PositiveIntegerField(max_length=5)
 	description = models.CharField(max_length=1024)
 	id = models.AutoField(primary_key=True)
 
 class Role(models.Model):
-#	user = models.ForeignKey(User)
+	user = models.ForeignKey(User)
 	event = models.ForeignKey(Event)
 	OWNER = 0
 	GOER = 1
@@ -31,12 +32,12 @@ class Requirement(models.Model):
 	id = models.AutoField(primary_key=True)
 
 class Contribution(models.Model):
-#	user = models.ForeignKey(User)
+	user = models.ForeignKey(User)
 	event = models.ForeignKey(Event)
 	requirement = models.ForeignKey(Requirement)
 	value = models.IntegerField(max_length=11)
 
 class Donation(models.Model):
-#	user = models.ForeignKey(User)
+	user = models.ForeignKey(User)
 	event = models.ForeignKey(Event)
 	value = models.DecimalField(max_digits=11, decimal_places=2)