not yet working fully

rowers/templates/gdpr_optin.html

@@ -5,13 +5,18 @@
 {% block title %}GDPR Opt-In{% endblock %}
 
 {% block main %}
+<p>
+  We know you are eager to start using rowsandall.com, but we must
+  ask you to read and agree with the below first.
+</p>
+
 <h2>GDPR Opt-In</h2>
 <p>
   <b>
     To comply with the European Union General Data Protection Regulation,
     we need to record your consent to use personal data on this website.
     Please take some time to review our data policies. If you agree and
-    opt in, click the green button at the bottom to be taken to the site.
+    opt in, click the "opt in" button at the bottom to be taken to the site.
     If you do not agree, please use the red button to delete your
     account. This will irreversibly delete all your data on rowsandall.com
     and remove your account.
@@ -32,7 +37,7 @@
 </p>
 
 <p>
-  <a class="button gray small" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}">Opt in and continue</a>
+  <a class="button green small" href="/rowers/me/gdpr-optin-confirm/?next={{ next }}">Opt in and continue</a>
 </p>
 
 <p>

rowers/templates/list_workouts.html

@@ -6,7 +6,7 @@
 
 {% block scripts %}
 <script>
-  setTimeout("location.reload(true);",60000);
+  setTimeout("location.reload(true);",180000);
 </script>
 <script
   type='text/javascript'

rowers/templates/menu_workouts.html

@@ -57,7 +57,7 @@
       <li>
         <a href={{ request.path|userurl:member }}>
           <i class="fas fa-user fa-fw"></i>
-          {% if member == rower.user and team.id == 0 %}
+          {% if member == rower.user and not team %}
           &bull;
           {% else %}
           &nbsp; 

rowers/templates/workout_form.html

@@ -41,6 +41,17 @@ $('#id_workouttype').change();
 
 {% block main %}
 
+<p>
+  {% if workout|previousworkout:rower.user %}
+  <a href="/rowers/workout/{{ workout|previousworkout:rower.user }}/edit"
+     title="Jump to preceding workout"><em>Previous</em></a>&nbsp;
+  {% endif %}
+  {% if workout|nextworkout:rower.user %}
+  <a href="/rowers/workout/{{ workout|nextworkout:rower.user }}/edit"
+     title="Jump to following workout"><em>Next</em></a>
+  {% endif %}
+</p>
+
 <h1>Edit Workout {{ workout.name }}</h1>
 <ul class="main-content">
   <li class="grid_4">

rowers/templatetags/rowerfilters.py

@@ -11,7 +11,7 @@ from rowers.utils import calculate_age
 from rowers.models import (
     course_length,WorkoutComment,
     TrainingMacroCycle,TrainingMesoCycle, TrainingMicroCycle,
-    Rower
+    Rower,Workout
     )
 from rowers.plannedsessions import (
     race_can_register, race_can_submit,race_rower_status
@@ -464,4 +464,53 @@ def micromacroid(id):
 
     return str(theid)
 
+@register.filter
+def nextworkout(workout,user):
+    if user.rower == workout.user:
+        ws = Workout.objects.filter(
+            startdatetime__gte=workout.startdatetime,
+            user=workout.user
+        ).order_by(
+            "startdatetime"
+        ).exclude(id=workout.id)
+    else:
+        ws = Workout.objects.filter(
+            startdatetime__gte=workout.startdatetime,
+            user=workout.user,privacy='visible'
+        ).order_by(
+            "startdatetime"
+        ).exclude(id=workout.id)
+
+        
+    if ws:
+        return ws[0].id
+    else:
+        return 0
+
+        
+
+@register.filter
+def previousworkout(workout,user):
+    if user.rower == workout.user:
+        ws = Workout.objects.filter(
+            startdatetime__lte=workout.startdatetime,
+            user=workout.user
+        ).order_by(
+                "-startdatetime"
+        ).exclude(id=workout.id)
+    else:
+        ws = Workout.objects.filter(
+            startdatetime__lte=workout.startdatetime,
+            user=workout.user,privacy='visible'
+        ).order_by(
+            "-startdatetime"
+        ).exclude(id=workout.id)
+
+
+    if ws:
+        return ws[0].id
+    else:
+        return 0
+
+        
 

rowers/urls.py

@@ -357,7 +357,9 @@ urlpatterns = [
     url(r'^me/deactivate$',views.deactivate_user),
     url(r'^me/delete$',views.remove_user),
     url(r'^me/gdpr-optin-confirm/?$',views.user_gdpr_confirm),
+    url(r'^me/gdpr-optin-confirm/$',views.user_gdpr_confirm),
     url(r'^me/gdpr-optin/?$',views.user_gdpr_optin),
+    url(r'^me/gdpr-optin/$',views.user_gdpr_optin),
     url(r'^me/teams/$',views.rower_teams_view),
     url(r'^me/calcdps/$',views.rower_calcdps_view),
     url(r'^me/exportsettings/$',views.rower_exportsettings_view),