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

better dates

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-10 17:56:35 +02:00
parent 988da6ded8
commit 24735d4cc0
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/views/analysisviews.py
View File

@@ -4662,6 +4662,8 @@ def history_view(request,userid=0):
if request.GET.get('startdate'):
startdate,enddate = get_dates_timeperiod(request)
sstartdate = startdate
senddate = enddate
activity_startdate = datetime.datetime(
startdate.year,startdate.month,startdate.day
).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
@@ -4673,6 +4675,12 @@ def history_view(request,userid=0):
activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
activity_startdate = activity_enddate-datetime.timedelta(days=15)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
sstartdate = datetime.date(year=activity_startdate.year,month=activity_startdate.month,
day=activity_startdate.day)
senddate = datetime.date(year=activity_enddate.year,month=activity_enddate.month,
day=activity_enddate.day)
typeselect = 'All'
if request.GET.get('workouttype'):
@@ -4685,6 +4693,8 @@ def history_view(request,userid=0):
'enddate':activity_enddate,
'workouttype':typeselect})
g_workouts = Workout.objects.filter(
user=r,
startdatetime__gte=activity_startdate,
@@ -4693,6 +4703,7 @@ def history_view(request,userid=0):
privacy='visible'
).order_by("-startdatetime")
ids = [w.id for w in g_workouts]
columns = ['hr','power','time']
@@ -4772,6 +4783,8 @@ def history_view(request,userid=0):
if firstmay>today:
firstmay = datetime.datetime(year=today.year-1,month=5,day=1)
print(sstartdate,senddate,'history')
return render(request,'history.html',
{
'tscript':tscript,
@@ -4793,6 +4806,8 @@ def history_view(request,userid=0):
'today':today,
'workouttype':typeselect,
'firstmay':firstmay,
'sstartdate':sstartdate,
'senddate':senddate,
})
@login_required()
@@ -4801,8 +4816,10 @@ def history_view_data(request,userid=0):
usertimezone = pytz.timezone(r.defaulttimezone)
print(request.GET)
if request.GET.get('startdate'):
startdate,enddate = get_dates_timeperiod(request)
startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d")
enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d")
activity_startdate = datetime.datetime(
startdate.year,startdate.month,startdate.day
).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
@@ -4815,6 +4832,8 @@ def history_view_data(request,userid=0):
activity_startdate = activity_enddate-datetime.timedelta(days=15)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
typeselect = 'All'
if request.GET.get('workouttype'):
typeselect = request.GET.get('workouttype')
@@ -4822,6 +4841,7 @@ def history_view_data(request,userid=0):
if typeselect not in mytypes.checktypes:
typeselect = 'All'
g_workouts = Workout.objects.filter(
user=r,
startdatetime__gte=activity_startdate,