removing obsolete .ix calls to pandas

rowers/models.py

@@ -56,6 +56,19 @@ timezones = (
     (x,x) for x in pytz.common_timezones
 )
 
+def half_year_from_now():
+    return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=182)).date()
+
+def a_week_from_now():
+    return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=7)).date()
+
+def current_day():
+    return (datetime.datetime.now(tz=timezone.utc)).date()
+
+def current_time():
+    return datetime.datetime.now(tz=timezone.utc)
+
+
 class UserFullnameChoiceField(forms.ModelChoiceField):
     def label_from_instance(self,obj):
         return obj.get_full_name()
@@ -246,7 +259,7 @@ class PowerTimeFitnessMetric(models.Model):
         ('water','On the water')
         )
     
-    date = models.DateField(default=datetime.date.today)
+    date = models.DateField(default=current_day)
     last_workout = models.IntegerField(default=0)
     user = models.ForeignKey(User)
     PowerFourMin = models.FloatField(default=0)
@@ -334,7 +347,7 @@ class TeamForm(ModelForm):
 class TeamInvite(models.Model):
     team = models.ForeignKey(Team)
     user = models.ForeignKey(User,null=True)
-    issuedate = models.DateField(default=datetime.date.today)
+    issuedate = models.DateField(default=current_day)
     code = models.CharField(max_length=150,unique=True)
     email = models.CharField(max_length=150,null=True,blank=True)
 
@@ -352,7 +365,7 @@ class TeamInviteForm(ModelForm):
 class TeamRequest(models.Model):
     team = models.ForeignKey(Team)
     user = models.ForeignKey(User,null=True)
-    issuedate = models.DateField(default=datetime.date.today)
+    issuedate = models.DateField(default=current_day)
     code = models.CharField(max_length=150,unique=True)
 
 from utils import (
@@ -655,8 +668,8 @@ class Rower(models.Model):
 
     paidplan = models.ForeignKey(PaidPlan,null=True,default=None)
     
-    planexpires = models.DateField(default=datetime.date.today)
-    teamplanexpires = models.DateField(default=datetime.date.today)
+    planexpires = models.DateField(default=current_day)
+    teamplanexpires = models.DateField(default=current_day)
     clubsize = models.IntegerField(default=0)
     protrialexpires = models.DateField(blank=True,null=True)
     plantrialexpires = models.DateField(blank=True,null=True)
@@ -1021,11 +1034,6 @@ class GeoPoint(models.Model):
 # of multiple GeoPoint instances
 
 
-def half_year_from_now():
-    return (timezone.now()+timezone.timedelta(days=182)).date()
-
-def a_week_from_now():
-    return (timezone.now()+timezone.timedelta(days=7)).date()
 
 # models related to training planning - draft
 # Do we need a separate class TestTarget?
@@ -1104,7 +1112,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=datetime.date.today)
+    startdate = models.DateField(default=current_day)
     enddate = models.DateField(
         default=half_year_from_now)
 
@@ -1193,7 +1201,7 @@ class TrainingPlanForm(ModelForm):
         elif self.instance.pk is not None:
             self.fields['target'].queryset = TrainingTarget.objects.filter(
                 manager=self.instance.manager,
-                date__gte=datetime.date.today()).order_by("date")
+                date__gte=current_day()).order_by("date")
         else:
             self.fields.pop('target')
 
@@ -1468,7 +1476,7 @@ def macrocyclecheckdates(plan):
 class TrainingMacroCycle(models.Model):
     plan = models.ForeignKey(TrainingPlan)
     name = models.CharField(max_length=150,blank=True)
-    startdate = models.DateField(default=datetime.date.today)
+    startdate = models.DateField(default=current_day)
     enddate = models.DateField(
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
@@ -1554,7 +1562,7 @@ class TrainingMacroCycleForm(ModelForm):
 class TrainingMesoCycle(models.Model):
     plan = models.ForeignKey(TrainingMacroCycle)
     name = models.CharField(max_length=150,blank=True)
-    startdate = models.DateField(default=datetime.date.today)
+    startdate = models.DateField(default=current_day)
     enddate = models.DateField(
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
@@ -1629,7 +1637,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=datetime.date.today)
+    startdate = models.DateField(default=current_day)
     enddate = models.DateField(
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
@@ -1776,7 +1784,7 @@ class PlannedSession(models.Model):
     comment = models.TextField(max_length=500,blank=True,
                                )
 
-    startdate = models.DateField(default=datetime.date.today,
+    startdate = models.DateField(default=current_day,
                                  verbose_name='On or After')
 
     enddate = models.DateField(default=a_week_from_now,
@@ -3288,10 +3296,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=datetime.date.today)
+    created = models.DateField(default=current_day)
     announcement = models.TextField(max_length=280)
-    expires = models.DateField(default=datetime.date.today)
-    modified = models.DateField(default=datetime.date.today)
+    expires = models.DateField(default=current_day)
+    modified = models.DateField(default=current_day)
     dotweet = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):