more removing of date.today and replacing with timezone.now

rowers/views/analysisviews.py

@@ -362,7 +362,7 @@ def trendflexdata(workouts, options,userid=0):
     datadf['date'] = datadf['workoutid']
     datadf['date'].replace(datemapping,inplace=True)
 
-    today = datetime.date.today()
+    today = timezone.now()
 
     try:
         datadf['days ago'] = list(map(lambda x : x.days, datadf.date - today))

rowers/views/planviews.py

@@ -2568,7 +2568,7 @@ def rower_view_instantplan(request,id='',userid=0):
 
     targets = TrainingTarget.objects.filter(
         rowers=r,
-        date__gte=datetime.date.today(),
+        date__gte=timezone.now(),
     ).order_by("-date")
 
     if request.method == 'POST' and not request.user.is_anonymous:
@@ -2855,12 +2855,12 @@ def rower_create_trainingplan(request,id=0):
 
     targets = TrainingTarget.objects.filter(
         rowers=therower,
-        date__gte=datetime.date.today(),
+        date__gte=timezone.now(),
     ).order_by("date")
 
     old_targets = TrainingTarget.objects.filter(
         rowers=therower,
-        date__lt=datetime.date.today(),
+        date__lt=timezone.now(),
         ).order_by("-date")
 
     targetform = TrainingTargetForm(user=request.user)
@@ -2869,7 +2869,7 @@ def rower_create_trainingplan(request,id=0):
 
     plans_to_deactivate = TrainingPlan.objects.filter(
         rowers=therower,
-        enddate__lt=datetime.date.today(),
+        enddate__lt=timezone.now(),
         status=True,
     ).order_by("-startdate")
 

rowers/views/racesviews.py

@@ -841,10 +841,10 @@ def virtualevents_view(request):
 
     # default races
     races1 = VirtualRace.objects.filter(
-        startdate__gte=datetime.date.today(),
+        startdate__gte=timezone.now(),
     )
     races2 = VirtualRace.objects.filter(
-        startdate__lte=datetime.date.today(),
+        startdate__lte=timezone.now(),
         evaluation_closure__gte=timezone.now()-datetime.timedelta(days=3),
     )
 
@@ -876,11 +876,11 @@ def virtualevents_view(request):
 
             if regattatype == 'upcoming':
                 races1 = VirtualRace.objects.filter(
-                    startdate__gte=datetime.date.today(),
+                    startdate__gte=timezone.now(),
                     country__in=countries
                 )
                 races2 = VirtualRace.objects.filter(
-                    startdate__lte=datetime.date.today(),
+                    startdate__lte=timezone.now(),
                     evaluation_closure__gte=timezone.now(),
                     country__in=countries
                     )
@@ -896,7 +896,7 @@ def virtualevents_view(request):
                     ).order_by("-startdate","-start_time")
             elif regattatype == 'ongoing':
                 races = VirtualRace.objects.filter(
-                    startdate__lte=datetime.date.today(),
+                    startdate__lte=timezone.now(),
                     evaluation_closure__gte=timezone.now(),
                     country__in=countries
                     ).order_by("startdate","start_time")

rowers/views/userviews.py

@@ -153,7 +153,7 @@ def start_trial_view(request):
         url = '/rowers/paidplans'
         return HttpResponseRedirect(url)
 
-    r.protrialexpires = datetime.date.today()+datetime.timedelta(13)
+    r.protrialexpires = timezone.now()+datetime.timedelta(13)
     r.save()
 
     url = reverse('workouts_view')
@@ -187,8 +187,8 @@ def start_plantrial_view(request):
         url = '/rowers/paidplans'
         return HttpResponseRedirect(url)
 
-    r.plantrialexpires = datetime.date.today()+datetime.timedelta(13)
-    r.protrialexpires = datetime.date.today()+datetime.timedelta(13)
+    r.plantrialexpires = timezone.now()+datetime.timedelta(13)
+    r.protrialexpires = timezone.now()+datetime.timedelta(13)
     r.save()
 
     url = reverse('workouts_view')

rowers/views/workoutviews.py

@@ -758,7 +758,7 @@ def addmanual_view(request,raceid=0):
 
     initial = {
         'workouttype':'rower',
-        'date':datetime.date.today(),
+        'date':timezone.now(),
         'starttime':timezone.now(),
         'timezone':r.defaulttimezone,
         'duration':datetime.timedelta(minutes=2),