From 4695dad4894e383d710c7e140507bb31737a1595 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 7 Dec 2016 21:43:16 +0100
Subject: [PATCH] FavoriteCharts update

---
 rowers/templates/flexchart3otw.html |  4 +-
 rowers/templates/rower_form.html    | 64 ++++++++++++++++-------------
 rowers/views.py                     |  2 +-
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html
index d643a073..37525b3a 100644
--- a/rowers/templates/flexchart3otw.html
+++ b/rowers/templates/flexchart3otw.html
@@ -211,7 +211,7 @@
     {% if favoritenr > 0 %}
     <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:-1 }}">&lt</a>
     {% else %}
-    <p>&nbsp;</p>
+    <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ maxfav }}">&lt</a>
     {% endif %}
   </div>
   <div class="grid_2">
@@ -225,7 +225,7 @@
   {% if favoritenr < maxfav %}
   <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:1 }}">&gt</a>
     {% else %}
-  <p>&nbsp;</p>
+  <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart=0">&gt</a>
     {% endif %}
   </div>                        
 </div>
diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html
index ffc83a3a..e103f631 100644
--- a/rowers/templates/rower_form.html
+++ b/rowers/templates/rower_form.html
@@ -3,37 +3,45 @@
 {% block title %}Change Rower {% endblock %}
 
 {% block content %}
-    {% if form.errors %}
-        <p style="color: red;">
-            Please correct the error{{ form.errors|pluralize }} below.
-        </p>
-    {% endif %}
-	<div class="grid_6 alpha">
-	<h1>Heart Rate Bands</h1>
+{% if form.errors %}
+<p style="color: red;">
+  Please correct the error{{ form.errors|pluralize }} below.
+</p>
+{% endif %}
+<div class="grid_6 alpha">
+  <h1>Heart Rate Bands</h1>
 
+  <form enctype="multipart/form-data" action="" method="post">
+    <table>
+      {{ form.as_table }}
+    </table>
+    {% csrf_token %}
+    <div class="grid_2 prefix_2 suffix_2">
+      <input class="button green" type="submit" value="Save">
+  </form>
+  </div>
+</div>
+<div class="grid_6 omega">
+  <h1>Functional Threshold Power</h1>
+  <p>
     <form enctype="multipart/form-data" action="" method="post">
-        <table>
-            {{ form.as_table }}
-        </table>
-        {% csrf_token %}
-	<div class="grid_2 prefix_2 suffix_2">
-        <input class="button green" type="submit" value="Save">
-    </form>
-	</div>
-	</div>
-	<div class="grid_6 omega">
-	<h1>Functional Threshold Power</h1>
-	<p>
-    <form enctype="multipart/form-data" action="" method="post">
-	<table>
+      <table>
 	{{ powerform.as_table }}
-	</table>
-        {% csrf_token %}
-	<div class="grid_2 prefix_2 suffix_2">
+      </table>
+      {% csrf_token %}
+      <div class="grid_2 prefix_2 suffix_2">
         <input class="button green" type="submit" value="Save">
     </form>
-	</div>
-	</p>
-	</div>
+    </div>
+  </p>
+</div>
 
-{% endblock %}
\ No newline at end of file
+  
+  <div class="grid_6 prefix_6 alpha">
+    <div class="grid_2 suffix_4 alpha">
+      <a class="button gray small" href="/rowers/me/favoritecharts">Manage Favorite Charts</a>
+    </div>
+  </div>
+
+
+{% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index 875457bf..cc2e29b6 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -2660,7 +2660,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
     if request.method == 'POST' and 'savefavorite' in request.POST:
         f = FavoriteChart(user=r,xparam=xparam,
                           yparam1=yparam1,yparam2=yparam2,
-                          plottype=plottype)
+                          plottype=plottype,workouttype=workouttype)
         f.save()
     if request.method == 'POST' and 'workstrokesonly' in request.POST:
 	workstrokesonly = request.POST['workstrokesonly']