get dates timeperiod updates to work better with local time zones
This commit is contained in:
@@ -275,6 +275,8 @@ def plannedsession_multiclone_view(
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
teamid = get_team(request)
|
||||
|
||||
if request.method == 'POST' and 'daterange' in request.POST: # pragma: no cover
|
||||
@@ -455,6 +457,8 @@ def template_library_view(request,userid=0):
|
||||
templates = templates | templates2
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -515,6 +519,8 @@ def plannedsession_create_view(request,
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request,startdatestring=startdatestring,
|
||||
enddatestring=enddatestring)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
|
||||
|
||||
@@ -610,7 +616,8 @@ def plannedsession_create_view(request,
|
||||
|
||||
if request.GET.get('startdate') or request.GET.get('when'):
|
||||
startdate, enddate = get_dates_timeperiod(request)
|
||||
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
|
||||
sps = get_sessions(r,startdate=startdate,enddate=enddate).exclude(
|
||||
@@ -696,7 +703,8 @@ def plannedsession_createtemplate_view(request,
|
||||
r = getrequestplanrower(request,userid=userid)
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
|
||||
if request.method == 'POST':
|
||||
@@ -790,6 +798,8 @@ def plannedsession_multicreate_view(request,
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
teamid = get_team(request)
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -923,6 +933,8 @@ def plannedsession_teamcreate_view(request,
|
||||
therower = getrequestplanrower(request,userid=userid)
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
|
||||
|
||||
teams = Team.objects.filter(manager=request.user)
|
||||
@@ -1101,6 +1113,8 @@ def plannedsession_teamedit_view(request,
|
||||
ps = get_object_or_404(PlannedSession,pk=id)
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
|
||||
|
||||
@@ -1110,6 +1124,8 @@ def plannedsession_teamedit_view(request,
|
||||
teaminitial = ps.team.all()
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -1278,7 +1294,8 @@ def plannedsessions_coach_view(request,
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
trainingplan = None
|
||||
|
||||
@@ -1412,17 +1429,18 @@ def plannedsessions_view(request,
|
||||
startdatestring=startdatestring,
|
||||
enddatestring=enddatestring,
|
||||
rower=r)
|
||||
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
startdate__lte = startdate,
|
||||
rowers = r,
|
||||
enddate__gte = enddate)[0]
|
||||
enddate__gte = enddate
|
||||
)[0]
|
||||
except IndexError:
|
||||
trainingplan = None
|
||||
|
||||
|
||||
sps = get_sessions(r,startdate=startdate,enddate=enddate)
|
||||
|
||||
completeness = {}
|
||||
@@ -1447,7 +1465,9 @@ def plannedsessions_view(request,
|
||||
|
||||
ws = Workout.objects.filter(
|
||||
user=r,
|
||||
date__gte=startdate,date__lte=enddate)
|
||||
date__gte=startdate,
|
||||
date__lte=enddate,
|
||||
)
|
||||
|
||||
for w in ws:
|
||||
thetrimp,hrtss = dataprep.workout_trimp(w)
|
||||
@@ -1512,7 +1532,9 @@ def plannedsessions_view(request,
|
||||
unmatchedworkouts = Workout.objects.filter(
|
||||
user=r,
|
||||
plannedsession=None,
|
||||
date__gte=startdate,date__lte=enddate)
|
||||
date__gte=startdate,
|
||||
date__lte=enddate
|
||||
)
|
||||
|
||||
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
|
||||
breadcrumbs = [
|
||||
@@ -1558,6 +1580,8 @@ def plannedsessions_print_view(request,userid=0,startdatestring='',enddatestring
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request,startdatestring=startdatestring,
|
||||
enddatestring=enddatestring)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -1599,6 +1623,8 @@ def plannedsessions_manage_view(request,userid=0,
|
||||
r = getrequestrower(request,userid=userid)
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -1761,6 +1787,8 @@ def plannedsession_clone_view(request,id=0,userid=0):
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -1834,6 +1862,8 @@ def plannedsession_teamclone_view(request,id=0):
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
@@ -1882,6 +1912,8 @@ redirect_field_name=None)
|
||||
def plannedsession_templateedit_view(request,id=0):
|
||||
r = getrequestrower(request)
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
startdate__lte = startdate,
|
||||
@@ -1992,6 +2024,8 @@ def plannedsession_togarmin_view(request,id=0):
|
||||
r = getrequestplanrower(request)
|
||||
|
||||
startdate, enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
ps = get_object_or_404(PlannedSession,pk=id)
|
||||
|
||||
@@ -2023,6 +2057,8 @@ def plannedsession_totemplate_view(request,id=0):
|
||||
r = getrequestplanrower(request)
|
||||
|
||||
startdate, enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
ps = get_object_or_404(PlannedSession,pk=id)
|
||||
|
||||
@@ -2054,6 +2090,9 @@ def plannedsession_edit_view(request,id=0,userid=0):
|
||||
r = getrequestplanrower(request,userid=userid)
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
|
||||
|
||||
|
||||
@@ -2381,6 +2420,9 @@ def plannedsession_view(request,id=0,userid=0):
|
||||
# if coursetest, need to reorder the ranking
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
try:
|
||||
trainingplan = TrainingPlan.objects.filter(
|
||||
startdate__lte = startdate,
|
||||
@@ -3125,6 +3167,8 @@ def rower_trainingplan_execution_view(request,
|
||||
userid=0):
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
r = getrequestrower(request,userid=userid)
|
||||
|
||||
@@ -3147,6 +3191,8 @@ def rower_trainingplan_execution_view(request,
|
||||
else:
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
if int(id)>0:
|
||||
data,message = get_execution_report(r,startdate,enddate,plan=plan)
|
||||
@@ -3221,6 +3267,8 @@ def rower_trainingplan_view(request,
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
startdate = startdate.date()
|
||||
enddate = enddate.date()
|
||||
|
||||
plan = get_object_or_404(TrainingPlan,pk=id)
|
||||
r = getrequestrower(request,userid=userid)
|
||||
|
||||
Reference in New Issue
Block a user