From 4b52a9080647e3c31ca6e80a8b04a2015737e6bb Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 8 Oct 2018 22:00:42 +0200
Subject: [PATCH] crewnerd summary

---
 rowers/templates/cn_form.html       | 38 ++++++++++++++---------------
 rowers/templatetags/rowerfilters.py |  5 +++-
 rowers/views.py                     | 24 ++++++++++++++++++
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/rowers/templates/cn_form.html b/rowers/templates/cn_form.html
index 354a1694..5a32d235 100644
--- a/rowers/templates/cn_form.html
+++ b/rowers/templates/cn_form.html
@@ -1,25 +1,25 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 
 {% block title %}CrewNerd Summary loading{% endblock %}
 
-{% block content %}
-    <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
-<div id="left" class="grid_6 alpha">
-	<h1>Upload Workout Summary File (CrewNerd)</h1>
-    {% if form.errors %}
-        <p style="color: red;">
-            Please correct the error{{ form.errors|pluralize }} below.
-        </p>
-    {% endif %}
-
-        <table>
-            {{ form.as_table }}
-        </table>
-        {% csrf_token %}
-   <div id="formbutton" class="grid_1 prefix_4 suffix_1">
-        <input type="submit" value="Submit">
-   </div>
-</div>
+{% block main %}
+<form enctype="multipart/form-data" action="{{ formloc }}" method="post">
+  <h1>Upload Workout Summary File (CrewNerd)</h1>
+  {% if form.errors %}
+  <p style="color: red;">
+    Please correct the error{{ form.errors|pluralize }} below.
+  </p>
+  {% endif %}
+  
+  <table>
+    {{ form.as_table }}
+  </table>
+  {% csrf_token %}
+  <input type="submit" value="Submit">
 </form>
 {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_workout.html' %}
+{% endblock %}
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 51629331..e3d86059 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -52,7 +52,10 @@ def secondstotimestring(tdelta):
 
 @register.filter
 def water(workout):
-    return workout.workouttype in otwtypes
+    try:
+        return workout.workouttype in otwtypes
+    except AttributeError:
+        return False
 
 @register.filter
 def ddays(ddelta):
diff --git a/rowers/views.py b/rowers/views.py
index ef39d0d4..53525b4e 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -6763,6 +6763,22 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
 @user_passes_test(ispromember,login_url="/",redirect_field_name=None)
 def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
     row = get_workout(id)
+    r = getrower(request.user)
+    breadcrumbs = [
+            {
+                'url':'/rowers/list-workouts',
+                'name':'Workouts'
+                },
+            {
+                'url':get_workout_default_page(request,id),
+                'name': str(row.id)
+                },
+            {
+                'url':reverse(workout_crewnerd_summary_view,kwargs={'id':id}),
+                'name': 'CrewNerd Summary'
+                }
+            
+            ]
 
     if request.method == 'POST':
 	form = CNsummaryForm(request.POST,request.FILES)
@@ -6799,6 +6815,10 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
 	    return render(request,
 			  "cn_form.html",
 			  {'form':form,
+                           'active':'nav-workouts',
+                           'rower':r,
+                           'workout':row,
+                           'breadcrumbs':breadcrumbs,
                            'teams':get_my_teams(request.user),
 			   'id':row.id})
     else:
@@ -6807,6 +6827,10 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
 	return render(request,
 		      "cn_form.html",
 		      {'form':form,
+                       'active':'nav-workouts',
+                       'rower':r,
+                       'workout':row,
+                       'breadcrumbs':breadcrumbs,
                        'teams':get_my_teams(request.user),
 		       'id':row.id})