From d3448c66f1f9cd8e780f4f6d0024790f21598c32 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 6 Feb 2018 21:00:59 +0100
Subject: [PATCH] Date range selection on session view

---
 rowers/models.py                      |  4 +++
 rowers/templates/plannedsessions.html | 39 ++++++++++++++++++++++-----
 rowers/urls.py                        |  2 ++
 rowers/views.py                       | 17 +++++++++++-
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index 678920bb..9b801cc3 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -855,6 +855,10 @@ class PlannedSession(models.Model):
         choices=verificationchoices
     )
 
+    # 0 = incomplete, 1 = complete, >1 = partial (details could
+    # be defined later)
+    sessioncompleted = models.IntegerField(default=0)
+
     team = models.ManyToManyField(Team,blank=True)
     rower = models.ManyToManyField(Rower,blank=True)
 
diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html
index 8ff10042..efa4d83b 100644
--- a/rowers/templates/plannedsessions.html
+++ b/rowers/templates/plannedsessions.html
@@ -6,17 +6,40 @@
 {% block content %}
 <div class="grid_12 alpha">
   {% include "planningbuttons.html" %}
-
 </div>
-<div id="left" class="grid_6 alpha">
-<p>Placeholder text</p>
+<div class="grid_6 alpha">
+  <h1>Plan for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 </div>
-<div id="right" class="grid_6 omega">
-  <h1>Plan</h1>
+<div id="timeperiod" class="grid_2 dropdown">
+  <button class="grid_2 alpha button gray small dropbtn">Time Period</button>
+  <div class="dropdown-content">
+    <a class="button gray small alpha"
+       href="/rowers/sessions/today/rower/{{ rower.id }}">
+      Today
+    </a>
+    <a class="button gray small alpha"
+       href="/rowers/sessions/thisweek/rower/{{ rower.id }}">
+      This Week
+    </a>
+    <a class="button gray small alpha"
+       href="/rowers/sessions/thismonth/rower/{{ rower.id }}">
+      This Month
+    </a>
+    <a class="button gray small alpha"
+       href="/rowers/sessions/lastweek/rower/{{ rower.id }}">
+      Last Week
+    </a>
+    <a class="button gray small alpha"
+       href="/rowers/sessions/lastmonth/rower/{{ rower.id }}">
+      Last Month
+    </a>
+  </div>
+</div>
+<div class="grid_12 alpha">
   <p>
     Click on session name to view
   </p>
-  <table class="listtable shortpadded">
+  <table width="80%" class="listtable shortpadded">
     <thead>
       <tr>
         <th>After</th>
@@ -24,6 +47,9 @@
         <th>Name</th>
         <th>Value</th>
         <th>&nbsp;</th>
+        <th>Type</th>
+        <th>Done</th>
+        <th>
       </tr>
     </thead>
     <tbody>
@@ -42,6 +68,7 @@
         </td>
         <td> {{ ps.sessionvalue }} </td>
         <td> {{ ps.sessionunit }} </td>
+        <td> {{ ps.sessiontype }} </td>
       </tr>
       {% endfor %}
     </tbody>
diff --git a/rowers/urls.py b/rowers/urls.py
index bced6757..06676d0f 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -402,6 +402,8 @@ urlpatterns = [
     url(r'^sessions/(?P<id>\d+)/deleteconfirm$',views.plannedsession_deleteconfirm_view),
     url(r'^sessions/(?P<id>\d+)/delete$',views.plannedsession_delete_view),
     url(r'^sessions/?$',views.plannedsessions_view),
+    url(r'^sessions/rower/(?P<rowerid>\d+)$',views.plannedsessions_view),
+    url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsessions_view),
     url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsessions_view),
     ]
 
diff --git a/rowers/views.py b/rowers/views.py
index ebe3ed56..625c790f 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11758,7 +11758,10 @@ def plannedsessions_view(request,timeperiod='today',rowerid=0):
     if rowerid==0:
         r = getrower(request.user)
     else:
-        r = getrower(id=rowerid)
+        try:
+            r = Rower.objects.get(id=rowerid)
+        except Rower.DoesNotExist:
+            raise Http404("This rower doesn't exist")
         if not checkaccessuser(request.user,r):
             raise Http404("You don't have access to this plan")
 
@@ -11778,6 +11781,17 @@ def plannedsessions_view(request,timeperiod='today',rowerid=0):
         startdate = today.replace(day=1)
         enddate = startdate+timezone.timedelta(days=32)
         enddate = enddate.replace(day=1)
+    elif timeperiod=='lastweek':
+        today = datetime.date.today()
+        enddate = today-timezone.timedelta(days=today.weekday())
+        startdate = enddate-timezone.timedelta(days=7)
+    elif timeperiod=='lastmonth':
+        today = datetime.date.today()
+        startdate = today.replace(day=1)
+        startdate = startdate-timezone.timedelta(days=3)
+        startdate = startdate.replace(day=1)
+        enddate = startdate+timezone.timedelta(days=32)
+        enddate = enddate.replace(day=1)
     else:
         startdate = datetime.date.today()
         enddate = datetime.date.today()
@@ -11790,6 +11804,7 @@ def plannedsessions_view(request,timeperiod='today',rowerid=0):
                   {
                       'teams':get_my_teams(request.user),
                       'plannedsessions':sps,
+                      'rower':r,
                   })