From 41f34dd1a54f77aadd7b4364e4b41b29bbf8e42d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 24 Jan 2017 15:36:17 +0100
Subject: [PATCH] Showing Power band values in Rower edit

---
 rowers/models.py                 |  6 ++++++
 rowers/templates/rower_form.html | 30 ++++++++++++++++++++++++++++--
 rowers/views.py                  | 27 +++++++++++++++++++++++++--
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index 430c474b..eebab17c 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -73,6 +73,12 @@ class Rower(models.Model):
 				      choices=weightcategories)
 
     ftp = models.IntegerField(default=226,verbose_name="Functional Threshold Power")
+
+    pw_ut2 = models.IntegerField(default=160,verbose_name="UT2 Power")
+    pw_ut1 = models.IntegerField(default=160,verbose_name="UT1 Power")
+    pw_at = models.IntegerField(default=160,verbose_name="AT Power")
+    pw_tr = models.IntegerField(default=160,verbose_name="TR Power")
+    pw_an = models.IntegerField(default=160,verbose_name="AN Power")
     
     c2token = models.CharField(default='',max_length=200,blank=True,null=True)
     tokenexpirydate = models.DateTimeField(blank=True,null=True)
diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html
index 90674a5c..7710ccb7 100644
--- a/rowers/templates/rower_form.html
+++ b/rowers/templates/rower_form.html
@@ -23,7 +23,30 @@
 </div>
 <div class="grid_6 omega">
   <p>
-  <h2>Functional Threshold Power</h2>
+    <h2>Power Bands</h2>
+    <table width="70%" class="listtable">
+      <thead>
+        <tr>
+          <th>Band</th>
+          <th>Value</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>UT2 Power</td><td>{{ rower.pw_ut2 }} Watt</td>
+        </tr><tr>
+          <td>UT1 Power</td><td>{{ rower.pw_ut1 }} Watt</td>
+        </tr><tr>
+          <td>AT Power</td><td>{{ rower.pw_at }} Watt</td>
+        </tr><tr>
+          <td>TR Power</td><td>{{ rower.pw_tr }} Watt</td>
+        </tr><tr>
+          <td>AN Power</td><td>{{ rower.pw_an }} Watt</td>
+        </tr>
+    </table>
+  </p>
+  <p>
+    <h2>Functional Threshold Power</h2>
     <form enctype="multipart/form-data" action="" method="post">
       <table>
 	{{ powerform.as_table }}
@@ -63,9 +86,12 @@
 
   
   <div class="grid_6 prefix_6 alpha">
+      <p>
+    <h2>Favorite Charts</h2>
     <div class="grid_2 suffix_4 alpha">
-      <a class="button gray small" href="/rowers/me/favoritecharts">Manage Favorite Charts</a>
+        <a class="button gray small" href="/rowers/me/favoritecharts">Manage Favorite Charts</a>
     </div>
+      </p>
   </div>
 
 
diff --git a/rowers/views.py b/rowers/views.py
index 42fdca31..74718b57 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4497,7 +4497,9 @@ def rower_edit_view(request,message=""):
 	else:
 	    message = HttpResponse("invalid form")
 	    return render(request, 'rower_form.html',
-			  {'form':form,})
+			  {'form':form,
+                           'rower':r,
+                          })
 	    # url = reverse(rower_edit_view,args=[str(message)])
 	    # response = HttpResponseRedirect(url)
 			  
@@ -4511,9 +4513,16 @@ def rower_edit_view(request,message=""):
 	    try:
 		r = Rower.objects.get(user=request.user)
 		r.ftp = max(min(ftp,650),50)
+                powerperc = [55,75,90,105,120]
+                ut2,ut1,at,tr,an = (r.ftp*np.array(powerperc)/100.).astype(int)
+                r.pw_ut2 = ut2
+                r.pw_ut1 = ut1
+                r.pw_at = at
+                r.pw_tr = tr
+                r.pw_an = an
 		r.save()
 		message = "Functional Threshold Value Changed"
-		url = reverse(workouts_view,args=[str(message)])
+		url = reverse(rower_edit_view,args=[str(message)])
 		response = HttpResponseRedirect(url)
 	    except Rower.DoesNotExist:
 		message = "Funny. This user doesn't exist."
@@ -4524,6 +4533,7 @@ def rower_edit_view(request,message=""):
 	    return render(request, 'rower_form.html',
 			  {'form':form,
 			   'powerform':powerform,
+                           'rower':r,
 			   })
 			  
 	    
@@ -4531,6 +4541,18 @@ def rower_edit_view(request,message=""):
     else:
 	try:
 	    r = Rower.objects.get(user=request.user)
+
+            # Temporary code
+            powerperc = [55,75,90,105,120]
+            ut2,ut1,at,tr,an = (r.ftp*np.array(powerperc)/100.).astype(int)
+            r.pw_ut2 = ut2
+            r.pw_ut1 = ut1
+            r.pw_at = at
+            r.pw_tr = tr
+            r.pw_an = an
+	    r.save()
+            # end temporary
+            
 	    form = RowerForm(instance=r)
 	    powerform = RowerPowerForm(instance=r)
             grants = AccessToken.objects.filter(user=request.user)
@@ -4539,6 +4561,7 @@ def rower_edit_view(request,message=""):
 			      'form':form,
 			      'powerform':powerform,
                               'grants':grants,
+                              'rower':r,
 			      })
 	except Rower.DoesNotExist:
 	    return HttpResponse("This user doesn't exist")