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

Merge branch 'hotfix/v3.49'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-29 13:17:38 +02:00
parent 4db523b396 5a5c3508ea
commit 57429f5ee3
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,8 +235,17 @@ def interactive_activitychart(workouts,startdate,enddate):
durations.append(du)
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:
dates.append(d.strftime('%m/%d'))
durations.append(0)

17
rowers/views.py
View File

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