From 2629a35eb139d7e5d3cfe1736600b6a7fc985f38 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 5 May 2020 19:27:39 +0200
Subject: [PATCH 1/2] small improvements

---
 rowers/templates/history.html | 2 +-
 rowers/urls.py                | 1 +
 rowers/views/analysisviews.py | 7 +++++--
 rowers/views/workoutviews.py  | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index 89132f1e..f975cd41 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -5,7 +5,7 @@
 {% block title %}Rowsandall {% endblock %}
 
 {% block main %}
-  <h1>History</h1>
+  <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 <ul class="main-content">
   <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
   <li class="grid_2">
diff --git a/rowers/urls.py b/rowers/urls.py
index caf74576..f989100e 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -752,6 +752,7 @@ urlpatterns = [
     re_path(r'^workout/api/upload/',views.workout_upload_api,name='workout_upload_api'),
     re_path(r'^access/share/$',views.createShareURL, name="sharedURL"),
     re_path(r'^access/(?P<key>\w+)/$', views.sharedPage, name="sharedPage"),
+    re_path(r'^history/user/(?P<userid>\d+)/$',views.history_view,name="history_view"),
     re_path(r'^history/$',views.history_view,name="history_view"),
     ]
 
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 9b093827..9858b060 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4651,7 +4651,10 @@ class AlertDelete(DeleteView):
 
         return obj
 
-@login_required()
+@user_passes_test(ispromember, login_url="/rowers/paidplans",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
+                  redirect_field_name=None)
+@permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True)
 def history_view(request,userid=0):
     r = getrequestrower(request,userid=userid)
 
@@ -4757,7 +4760,7 @@ def history_view(request,userid=0):
     except KeyError:
         totalsdict['hrmean'] = 0
         totalsdict['hrmax'] = 0
-        
+
     totalsdict['nrworkouts'] =  g_workouts.count()
 
     breadcrumbs = [
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 0163840d..952b6fa9 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2010,6 +2010,7 @@ def workouts_view(request,message='',successmessage='',
                                            stack=stack)
 
     totalmeters,totalhours, totalminutes = get_totals(g_workouts)
+    totalminutes = '{totalminutes:02d}'.format(totalminutes=totalminutes)
 
 
     messages.info(request,successmessage)

From 265bf8e99ce2a8b4614c41c95434d5dbd1fc71a5 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 5 May 2020 20:01:45 +0200
Subject: [PATCH 2/2] small improv

---
 rowers/templates/history.html       | 2 ++
 rowers/templates/list_workouts.html | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index f975cd41..303ec369 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -7,6 +7,8 @@
 {% block main %}
   <h1>History for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 <ul class="main-content">
+  <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
+    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
   <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
   <li class="grid_2">
     <p>
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 85b00a46..4ce811c4 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -63,6 +63,8 @@
       Total meters: {{ totalmeters }}. Total time {{ totalhours }}:{{ totalminutes }}h.
       <a href="/rowers/history/">Dig deeper</a>.
     </p>
+    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
+    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
     <script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
 
     {{ interactiveplot |safe }}