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

Merge branch 'release/v12.38'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-10 19:55:58 +02:00
parent 5e9a707e45 c34058aae8
commit f4fdac21b6
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
rowers/views/analysisviews.py
View File

@@ -11,7 +11,7 @@ from jinja2 import Template,Environment,FileSystemLoader
def floatformat(x,prec=2): def floatformat(x,prec=2):
return '{x}'.format(x=round(x,prec)) return '{x}'.format(x=round(x,prec))
import time
env = Environment(loader = FileSystemLoader(["rowers/templates"])) env = Environment(loader = FileSystemLoader(["rowers/templates"]))
env.filters['floatformat'] = floatformat env.filters['floatformat'] = floatformat
@@ -4660,25 +4660,25 @@ def history_view(request,userid=0):
usertimezone = pytz.timezone(r.defaulttimezone) usertimezone = pytz.timezone(r.defaulttimezone)
time_min = datetime.time(hour=0,minute=0,second=0)
time_max = datetime.time(hour=23,minute=59,second=59)
if request.GET.get('startdate'): if request.GET.get('startdate'):
startdate,enddate = get_dates_timeperiod(request) startdate,enddate = get_dates_timeperiod(request)
sstartdate = startdate sstartdate = startdate
senddate = enddate senddate = enddate
activity_startdate = datetime.datetime( activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate,time_min))
startdate.year,startdate.month,startdate.day activity_enddate = usertimezone.localize(timezone.datetime.combine(enddate,time_max))
).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
activity_enddate = datetime.datetime(
enddate.year,enddate.month,enddate.day
).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
else: else:
activity_enddate = timezone.now() activity_enddate = timezone.now()
activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone) activity_enddate = usertimezone.localize(timezone.datetime.combine(activity_enddate.date(),time_max))
activity_startdate = activity_enddate-datetime.timedelta(days=15) startdate = timezone.now()-datetime.timedelta(days=14)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone) activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate.date(),time_min))
sstartdate = datetime.date(year=activity_startdate.year,month=activity_startdate.month, sstartdate = activity_startdate.date
day=activity_startdate.day) senddate = activity_enddate.date
senddate = datetime.date(year=activity_enddate.year,month=activity_enddate.month, startdate = sstartdate
day=activity_enddate.day) enddate = senddate
@@ -4815,23 +4815,19 @@ def history_view_data(request,userid=0):
r = getrequestrower(request,userid=userid) r = getrequestrower(request,userid=userid)
usertimezone = pytz.timezone(r.defaulttimezone) usertimezone = pytz.timezone(r.defaulttimezone)
time_min = datetime.time(hour=0,minute=0,second=0)
time_max = datetime.time(hour=23,minute=59,second=59)
print(request.GET)
if request.GET.get('startdate'): if request.GET.get('startdate'):
startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d") startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d")
enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d") enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d")
activity_startdate = datetime.datetime( activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate,time_min))
startdate.year,startdate.month,startdate.day activity_enddate = usertimezone.localize(timezone.datetime.combine(enddate,time_max))
).replace(hour=0,minute=0,second=0).astimezone(usertimezone)
activity_enddate = datetime.datetime(
enddate.year,enddate.month,enddate.day
).replace(hour=23,minute=59,second=59).astimezone(usertimezone)
else: else:
activity_enddate = timezone.now() activity_enddate = timezone.now()
activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone) activity_enddate = usertimezone.localize(timezone.datetime.combine(activity_enddate.date(),time_max))
activity_startdate = activity_enddate-datetime.timedelta(days=15) startdate = timezone.now()-datetime.timedelta(days=14)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone) activity_startdate = usertimezone.localize(timezone.datetime.combine(startdate.date(),time_min))
typeselect = 'All' typeselect = 'All'