sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

no future dates in activity chart

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-29 13:14:18 +02:00
parent 4db523b396
commit 5a5c3508ea
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/interactiveplots.py
View File

@@ -235,7 +235,16 @@ def interactive_activitychart(workouts,startdate,enddate):
durations.append(du) durations.append(du)
types.append(w.workouttype) types.append(w.workouttype)
d = startdate try:
d = utc.localize(startdate)
except ValueError:
d = startdate
try:
enddate = utc.localize(enddate)
except ValueError:
pass
while d<=enddate: while d<=enddate:
dates.append(d.strftime('%m/%d')) dates.append(d.strftime('%m/%d'))

17
rowers/views.py
View File

@@ -106,6 +106,7 @@ from rowingdata import summarydata
import pandas as pd import pandas as pd
import numpy as np import numpy as np
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
from pytz import timezone as tz,utc from pytz import timezone as tz,utc
import dateutil import dateutil
import mpld3 import mpld3
@@ -4017,6 +4018,14 @@ def workouts_view(request,message='',successmessage='',
# start date for the small graph # start date for the small graph
activity_startdate = enddate-datetime.timedelta(days=15) activity_startdate = enddate-datetime.timedelta(days=15)
if utc.localize(enddate) > timezone.now():
activity_enddate = timezone.now()
activity_startdate = activity_enddate-datetime.timedelta(days=15)
else:
activity_enddate = enddate
print "aap",activity_enddate
if teamid: if teamid:
try: try:
theteam = Team.objects.get(id=teamid) theteam = Team.objects.get(id=teamid)
@@ -4029,14 +4038,14 @@ def workouts_view(request,message='',successmessage='',
startdatetime__lte=enddate).order_by("-date", "-starttime") startdatetime__lte=enddate).order_by("-date", "-starttime")
g_workouts = Workout.objects.filter(team=theteam, g_workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=activity_startdate, startdatetime__gte=activity_startdate,
startdatetime__lte=enddate).order_by("-date", "-starttime") startdatetime__lte=activity_enddate).order_by("-date", "-starttime")
elif theteam.viewing == 'coachonly': elif theteam.viewing == 'coachonly':
workouts = Workout.objects.filter(team=theteam,user=r, workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date","-starttime") startdatetime__lte=enddate).order_by("-date","-starttime")
g_workouts = Workout.objects.filter(team=theteam,user=r, g_workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=activity_startdate, startdatetime__gte=activity_startdate,
enddatetime__lte=enddate).order_by("-date","-starttime") enddatetime__lte=activity_enddate).order_by("-date","-starttime")
else: else:
@@ -4046,7 +4055,7 @@ def workouts_view(request,message='',successmessage='',
startdatetime__lte=enddate).order_by("-date", "-starttime") startdatetime__lte=enddate).order_by("-date", "-starttime")
g_workouts = Workout.objects.filter(user=r, g_workouts = Workout.objects.filter(user=r,
startdatetime__gte=activity_startdate, startdatetime__gte=activity_startdate,
startdatetime__lte=enddate).order_by("-date","-starttime") startdatetime__lte=activity_enddate).order_by("-date","-starttime")
query = request.GET.get('q') query = request.GET.get('q')
if query: if query:
@@ -4078,7 +4087,7 @@ def workouts_view(request,message='',successmessage='',
script,div = interactive_activitychart(g_workouts, script,div = interactive_activitychart(g_workouts,
activity_startdate, activity_startdate,
enddate) activity_enddate)
messages.info(request,successmessage) messages.info(request,successmessage)
messages.error(request,message) messages.error(request,message)