From 24735d4cc04651408f7157ec3ea3d504e1e5990a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 10 May 2020 17:56:35 +0200
Subject: [PATCH] better dates

---
 rowers/templates/history.html |  8 +++++---
 rowers/views/analysisviews.py | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index 480592b2..ded24cc7 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -30,7 +30,7 @@
 
 <ul class="main-content">
   <li class="grid_2">
-    <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
+    <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }} from {{ startdate }} to {{ enddate }}</h1>
   </li>
   <li class="grid_2">
     <a href="/rowers/history/?enddate={{ today|date:"Y-m-d" }}&startdate={{ lastseven|date:"Y-m-d" }}&workouttype={{ workouttype }}">Past 7 days</a>
@@ -143,8 +143,10 @@
 <script>
   $(function($) {
   console.log('loading script for chart');
-
-  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ startdate|date:"Y-m-d" }}&{{ enddate|date:"Y-m-d" }}&workouttype={{ workouttype }}', function(json) {
+  var ed = '{{ senddate|date:"Y-m-d" }}'
+  console.log('End',ed);
+  console.log(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}')
+  $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}', function(json) {
 
   var script = json.script;
   var div = json.div;
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 0c383938..2eb55d7f 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -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,