Date Ranges for workouts and comparisons

2016-11-22 15:02:53 +01:00
parent 4fb1bee385
commit 93bd2d26bf
5 changed files with 130 additions and 24 deletions
--- a/rowers/templates/comparison_list.html
+++ b/rowers/templates/comparison_list.html
@@ -6,8 +6,7 @@

 {% block content %}
 <div id="workouts" class="grid_4 alpha">
-
-
+  <div class="grid_4 alpha">
 	<h1>Workout {{ id }}</h1>
 	<table width=100%>
 	<tr>
@@ -30,13 +29,34 @@
 	<th>Weight Category:</th><td>{{ workout.weightcategory }}</td>
 	</tr>
 	</table>
-<form id="searchform" action="."
-      method="get" accept-charset="utf-8">
-  <button class="button blue small" type="submit">
-    Search
-  </button>
-  <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
-</form>
+        </div>
+  <div class="grid_4 alpha">
+    <p>
+      <form id="searchform" action=""
+            method="get" accept-charset="utf-8">
+        <button class="button blue small" type="submit">
+          Search
+        </button>
+        <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
+      </form>
+    </p>
+  </div>
+
+  Select start and end date for a date range:
+  <div class="grid_4 alpha">
+<p>
+    <form enctype="multipart/form-data" action="/rowers/workout/compare/{{ id }}/" method="post">
+      
+      <table>
+        {{ dateform.as_table }}
+      </table>
+      {% csrf_token %}
+  </div>
+  <div class="grid_2 suffix_2 omega">
+    <input name='daterange' class="button green" type="submit" value="Submit">	</form>
+  </p>
+  </div>
+

 </div>

@@ -85,7 +105,7 @@
                <div class="grid_2 prefix_5 suffix_1 omega">
  <span class="button gray small">
    {% if workouts.has_previous %}
-    <a class="wh" href="?page={{ workouts.previous_page_number }}">&lt;</a>
+    <a class="wh" href="/rowers/workout/compare/{{ id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}?page={{ workouts.previous_page_number }}">&lt;</a>
    {% endif %}

    <span>
@@ -93,7 +113,7 @@
    </span>

    {% if workouts.has_next %}
-    <a class="wh" href="?page={{ workouts.next_page_number }}">&gt;</a>
+    <a class="wh" href="/rowers/workout/compare/{{ id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}?page={{ workouts.next_page_number }}">&gt;</a>
    {% endif %}
    </span>
 </div>
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -6,6 +6,23 @@

 {% block content %}
 <div class="grid_12">
+
+  Select start and end date for a date range:
+  <div class="grid_4 alpha">
+
+    <form enctype="multipart/form-data" action="/rowers/list-workouts/" method="post">
+      
+      <table>
+        {{ dateform.as_table }}
+      </table>
+      {% csrf_token %}
+  </div>
+  <div class="grid_2 suffix_6 omega">
+    <input name='daterange' class="button green" type="submit" value="Submit">	</form>
+  </div>
+
+</div>
+  
 <h1>My Workouts</h1>

 {% if workouts %}
@@ -53,19 +70,19 @@
 	{% endif %}
 </div>
 <div class="grid_6 alpha">
-<form id="searchform" action="."
+<form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
      method="get" accept-charset="utf-8">
-  <div class="grid_3 alpha">
+  <div class="grid_3 prefix_1 alpha">
    <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
  </div>
-  <div class="grid_1 suffix_2 omega">
+  <div class="grid_1 suffix_1 omega">
  <button class="button blue small" type="submit">
    Search
  </button>
  </div>
 </form>
 </div>
-<div class="grid_2 prefix_4 omega">
+<div class="grid_2 prefix_3 omega">
  <span class="button gray small">
    {% if workouts.has_previous %}
    <a class="wh" href="?page={{ workouts.previous_page_number }}">&lt;</a>
@@ -79,7 +96,7 @@
    <a class="wh" href="?page={{ workouts.next_page_number }}">&gt;</a>
    {% endif %}
    </span>
-</div>
+


 {% endblock %}
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -26,6 +26,7 @@ urlpatterns = [
    url(r'^list-workouts/c/(?P<message>\w+.*)/$',views.workouts_view),
    url(r'^list-workouts/s/(?P<successmessage>\w+.*)/$',views.workouts_view),
    url(r'^list-workouts/c/(?P<message>\w+.*)/s/(?P<successmessage>\w+.*)$',views.workouts_view),
+    url(r'^list-workouts/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.workouts_view),
    url(r'^list-workouts/$',views.workouts_view),
    url(r'^list-graphs/$',views.graphs_view),
    url(r'^dashboard/c/(?P<message>\w+.*)/$',views.dashboard_view),
@@ -61,6 +62,7 @@ urlpatterns = [
    url(r'^workout/(?P<id>\d+)/export$',views.workout_export_view),
    url(r'^workout/(\d+)/emailtcx$',views.workout_tcxemail_view),
    url(r'^workout/(\d+)/emailcsv$',views.workout_csvemail_view),
+    url(r'^workout/compare/(?P<id>\d+)/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.workout_comparison_list),
    url(r'^workout/compare/(\d+)/$',views.workout_comparison_list),
    url(r'^workout/compare2/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>\w+.*)/$',views.workout_comparison_view),
    url(r'^workout/(?P<id>\d+)/export/c/(?P<message>\w+.*)/s/(?P<successmessage>\w+.*)$',views.workout_edit_view),
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1572,8 +1572,8 @@ def rankings_view(request,theuser=0,
    for rankingduration in rankingdurations:
    
 	workouts = Workout.objects.filter(user=r,duration=rankingduration,
-				      workouttype='rower',
-				      startdatetime__gte=startdate,
+				          workouttype='rower',
+				          startdatetime__gte=startdate,
 					  startdatetime__lte=enddate).order_by('-distance')
 	if workouts:
 	    thedistances.append(workouts[0].distance)
@@ -1767,14 +1767,45 @@ def workout_recalcsummary_view(request,id=0):
    
    
@login_required()
-def workouts_view(request,message='',successmessage=''):
+def workouts_view(request,message='',successmessage='',
+                  startdatestring="",enddatestring="",
+                  startdate=timezone.now()-datetime.timedelta(days=365),
+                  enddate=timezone.now()):
    try:
 	r = Rower.objects.get(user=request.user)
 	# res = mailprocessing.safeprocessattachments()
 	#if len(res)>0 and np.cumsum(np.array(res)).max()>0:
 	#    successmessage = 'New Workouts have been created from email'

-	workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime")
+        if request.method == 'POST':
+            dateform = DateRangeForm(request.POST)
+            if dateform.is_valid():
+	        startdate = dateform.cleaned_data['startdate']
+	        enddate = dateform.cleaned_data['enddate']
+        else:
+            dateform = DateRangeForm(initial={
+                'startdate':startdate,
+                'enddate':enddate,
+                })
+
+        startdate = datetime.datetime.combine(startdate,datetime.time())
+        enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
+                
+        if startdatestring:
+            startdate = iso8601.parse_date(startdatestring)
+        if enddatestring:
+            enddate = iso8601.parse_date(enddatestring)
+
+        if enddate < startdate:
+	    s = enddate
+	    enddate = startdate
+	    startdate = s
+        
+        
+	workouts = Workout.objects.filter(user=r,
+                                          startdatetime__gte=startdate,
+                                          startdatetime__lte=enddate).order_by("-date", "-starttime")
+        
        query = request.GET.get('q')
        if query:
            query_list = query.split()
@@ -1785,7 +1816,7 @@ def workouts_view(request,message='',successmessage=''):
                       (Q(notes__icontains=q) for q in query_list))
                )

-        paginator = Paginator(workouts,25) # show 25 workouts per page
+        paginator = Paginator(workouts,20) # show 25 workouts per page
        page = request.GET.get('page')

        try:
@@ -1799,16 +1830,49 @@ def workouts_view(request,message='',successmessage=''):
 		      {'workouts': workouts,
 		       'message': message,
 		       'successmessage':successmessage,
+                       'dateform':dateform,
+                       'startdate':startdate,
+                       'enddate':enddate,
 		       })
    except Rower.DoesNotExist:
 	return HttpResponse("Admin has no rower instance")

@user_passes_test(promember,login_url="/login")
-def workout_comparison_list(request,id=0,message='',successmessage=''):
+def workout_comparison_list(request,id=0,message='',successmessage='',
+                            startdatestring="",enddatestring="",
+                            startdate=timezone.now()-datetime.timedelta(days=365),
+                            enddate=timezone.now()):
+
    try:
 	r = Rower.objects.get(user=request.user)
 	u = User.objects.get(id=r.user.id)
-	workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime").exclude(id=id)
+        if request.method == 'POST':
+            dateform = DateRangeForm(request.POST)
+            if dateform.is_valid():
+	        startdate = dateform.cleaned_data['startdate']
+	        enddate = dateform.cleaned_data['enddate']
+        else:
+            dateform = DateRangeForm(initial={
+                'startdate':startdate,
+                'enddate':enddate,
+                })
+
+        if startdatestring:
+            startdate = iso8601.parse_date(startdatestring)
+        if enddatestring:
+            enddate = iso8601.parse_date(enddatestring)
+
+        startdate = datetime.datetime.combine(startdate,datetime.time())
+        enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
+                
+        if enddate < startdate:
+	    s = enddate
+	    enddate = startdate
+	    startdate = s
+
+	workouts = Workout.objects.filter(user=r,
+                                          startdatetime__gte=startdate,
+                                          startdatetime__lte=enddate).order_by("-date", "-starttime").exclude(id=id)

        query = request.GET.get('q')
        if query:
@@ -1840,6 +1904,9 @@ def workout_comparison_list(request,id=0,message='',successmessage=''):
 		       'first_name':u.first_name,
 		       'message': message,
 		       'successmessage':successmessage,
+                       'dateform':dateform,
+                       'startdate':startdate,
+                       'enddate':enddate,
 		       })
    except Rower.DoesNotExist:
 	return HttpResponse("Admin has no rower instance")