medium level and account page

rowers/models.py

@@ -11,6 +11,7 @@ from datetimewidget.widgets import DateTimeWidget
 from django.core.validators import validate_email
 import os
 import twitter
+import re
 
 from django.conf import settings
 from sqlalchemy import create_engine
@@ -63,6 +64,22 @@ class PowerZonesField(models.TextField):
         if not value: return
         if isinstance(value, list):
             return value
+        # remove double quotes and brackets
+        print value
+        value = re.sub(r'u\"','',value)
+        value = re.sub(r'u\'','',value)
+        value = re.sub(r'\\','',value)
+        value = re.sub(r'\"','',value)
+        value = re.sub(r'\'','',value)
+        value = re.sub(r'\[','',value)
+        value = re.sub(r'\]','',value)
+        value = re.sub(r'\[\[','[',value)
+        value = re.sub(r'\]\]',']',value)
+        value = re.sub(r'\ \ ',' ',value)
+        value = re.sub(r', ',',',value)
+        print "aap"
+        print value
+        
         return value.split(self.token)
 
     def from_db_value(self,value, expression, connection, context):
@@ -100,7 +117,7 @@ class TeamInvite(models.Model):
     user = models.ForeignKey(User,null=True)
     issuedate = models.DateField(default=timezone.now)
     code = models.CharField(max_length=150,unique=True)
-    
+    email = models.CharField(max_length=150,null=True,blank=True)
     
 # Extension of User with rowing specific data
 class Rower(models.Model):
@@ -310,7 +327,7 @@ class Workout(models.Model):
 	)
     
     user = models.ForeignKey(Rower)
-    team = models.ForeignKey(Team,blank=True,null=True)
+    team = models.ManyToManyField(Team,blank=True,null=True)
     name = models.CharField(max_length=150)
     date = models.DateField()
     workouttype = models.CharField(choices=workouttypes,max_length=50)