removing date.today and replacing with timezone.now

rowers/views/planviews.py

@@ -1387,7 +1387,7 @@ from rowers.plannedsessions import cratiocolors,checkscores
 def plannedsessions_view(request,
                          userid=0,startdatestring='',enddatestring=''):
 
-    
+
     try:
         r = getrequestplanrower(request,userid=userid)
     except PermissionDenied: # pragma: no cover
@@ -1410,7 +1410,9 @@ def plannedsessions_view(request,
     startdate,enddate = get_dates_timeperiod(
         request,
         startdatestring=startdatestring,
-        enddatestring=enddatestring)
+        enddatestring=enddatestring,
+        rower=r)
+
 
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -2634,7 +2636,14 @@ def rower_view_instantplan(request,id='',userid=0):
 
 
     elif not request.user.is_anonymous:
-        form = InstantPlanSelectForm(targets=targets,instantplan=plan,initial={'datechoice':'startdate'})
+        tz = pytz.timezone(r.defaulttimezone)
+        nowdate = timezone.now().astimezone(tz)
+        initial = {
+            'datechoice':'startdate',
+            'startdate': nowdate,
+            'enddate': nowdate+datetime.timedelta(days=21)
+        }
+        form = InstantPlanSelectForm(targets=targets,instantplan=plan,initial=initial)
     else: # pragma: no cover
         form = None