starting plan view tests

rowers/models.py

@@ -246,7 +246,7 @@ class PowerTimeFitnessMetric(models.Model):
         ('water','On the water')
         )
     
-    date = models.DateField(default=timezone.now)
+    date = models.DateField(default=datetime.date.today)
     last_workout = models.IntegerField(default=0)
     user = models.ForeignKey(User)
     PowerFourMin = models.FloatField(default=0)
@@ -334,7 +334,7 @@ class TeamForm(ModelForm):
 class TeamInvite(models.Model):
     team = models.ForeignKey(Team)
     user = models.ForeignKey(User,null=True)
-    issuedate = models.DateField(default=timezone.now)
+    issuedate = models.DateField(default=datetime.date.today)
     code = models.CharField(max_length=150,unique=True)
     email = models.CharField(max_length=150,null=True,blank=True)
 
@@ -352,7 +352,7 @@ class TeamInviteForm(ModelForm):
 class TeamRequest(models.Model):
     team = models.ForeignKey(Team)
     user = models.ForeignKey(User,null=True)
-    issuedate = models.DateField(default=timezone.now)
+    issuedate = models.DateField(default=datetime.date.today)
     code = models.CharField(max_length=150,unique=True)
 
 from utils import (
@@ -655,8 +655,8 @@ class Rower(models.Model):
 
     paidplan = models.ForeignKey(PaidPlan,null=True,default=None)
     
-    planexpires = models.DateField(default=timezone.now)
-    teamplanexpires = models.DateField(default=timezone.now)
+    planexpires = models.DateField(default=datetime.date.today)
+    teamplanexpires = models.DateField(default=datetime.date.today)
     clubsize = models.IntegerField(default=0)
     protrialexpires = models.DateField(blank=True,null=True)
     plantrialexpires = models.DateField(blank=True,null=True)
@@ -1022,10 +1022,10 @@ class GeoPoint(models.Model):
 
 
 def half_year_from_now():
-    return timezone.now()+timezone.timedelta(days=182)
+    return (timezone.now()+timezone.timedelta(days=182)).date()
 
 def a_week_from_now():
-    return timezone.now()+timezone.timedelta(days=7)
+    return (timezone.now()+timezone.timedelta(days=7)).date()
 
 # models related to training planning - draft
 # Do we need a separate class TestTarget?
@@ -1089,20 +1089,6 @@ class TrainingTargetForm(ModelForm):
 
 
 
-# SportTracks has a TrainingGoal like this
-#class TrainingGoal(models.Model):
-#    rower = models.ForeignKey(Rower)
-#    name = models.CharField(max_length=150,blank=True)
-#    startdate = models.DateField(default=timezone.now)
-#    enddate = models.DateField(
-#        default=timezone.now()+datetime.timedelta(days=28))
-#    goalmetric = models.CharField(max_length=150,default='rower',
-#                                  choices = modechoices)
-#    value = models.IntegerValue(default=1)
-
-# I think we can use PlannedSession for that (in challenge mode)
-# although such a TrainingGoal could have automatically calculated
-# values without needing the user to assign
 
 
 class TrainingPlan(models.Model):
@@ -1118,7 +1104,7 @@ class TrainingPlan(models.Model):
     name = models.CharField(max_length=150,blank=True)
     status = models.BooleanField(default=True,verbose_name='Active')
     target = models.ForeignKey(TrainingTarget,blank=True,null=True)
-    startdate = models.DateField(default=timezone.now)
+    startdate = models.DateField(default=datetime.date.today)
     enddate = models.DateField(
         default=half_year_from_now)
 
@@ -1482,7 +1468,7 @@ def macrocyclecheckdates(plan):
 class TrainingMacroCycle(models.Model):
     plan = models.ForeignKey(TrainingPlan)
     name = models.CharField(max_length=150,blank=True)
-    startdate = models.DateField(default=timezone.now)
+    startdate = models.DateField(default=datetime.date.today)
     enddate = models.DateField(
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
@@ -1568,7 +1554,7 @@ class TrainingMacroCycleForm(ModelForm):
 class TrainingMesoCycle(models.Model):
     plan = models.ForeignKey(TrainingMacroCycle)
     name = models.CharField(max_length=150,blank=True)
-    startdate = models.DateField(default=timezone.now)
+    startdate = models.DateField(default=datetime.date.today)
     enddate = models.DateField(
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
@@ -1643,7 +1629,7 @@ class TrainingMesoCycle(models.Model):
 class TrainingMicroCycle(models.Model):
     plan = models.ForeignKey(TrainingMesoCycle)
     name = models.CharField(max_length=150,blank=True)
-    startdate = models.DateField(default=timezone.now)
+    startdate = models.DateField(default=datetime.date.today)
     enddate = models.DateField(
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
@@ -1790,7 +1776,7 @@ class PlannedSession(models.Model):
     comment = models.TextField(max_length=500,blank=True,
                                )
 
-    startdate = models.DateField(default=timezone.now,
+    startdate = models.DateField(default=datetime.date.today,
                                  verbose_name='On or After')
 
     enddate = models.DateField(default=a_week_from_now,
@@ -3302,10 +3288,10 @@ class RowerForm(ModelForm):
 # An announcement that goes to the right of the workouts list
 # optionally sends a tweet to our twitter account
 class SiteAnnouncement(models.Model):
-    created = models.DateField(default=timezone.now)
+    created = models.DateField(default=datetime.date.today)
     announcement = models.TextField(max_length=280)
-    expires = models.DateField(default=timezone.now)
-    modified = models.DateField(default=timezone.now)
+    expires = models.DateField(default=datetime.date.today)
+    modified = models.DateField(default=datetime.date.today)
     dotweet = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):