From 9db40cb8e82e7cfc79b95856f097457aa65fb55c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 19 Dec 2022 08:01:26 +0100
Subject: [PATCH] improvment in prefs

---
 rowers/models.py                              |  2 +-
 rowers/templates/rower_simplepreferences.html | 55 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index 36c2cb0f..1ff7545f 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -4222,7 +4222,7 @@ class RowerExportForm(ModelForm):
 
 # Simple form to set rower's Functional Threshold Power
 class SimpleRowerPowerForm(ModelForm):
-    otwftp = forms.IntegerField(initial=0,required=False, label='FTP on water')
+    otwftp = forms.IntegerField(initial=0,required=True, label='FTP on water')
     class Meta:
         model = Rower
         fields = ['ftp']
diff --git a/rowers/templates/rower_simplepreferences.html b/rowers/templates/rower_simplepreferences.html
index 56801cd7..7aa851fd 100644
--- a/rowers/templates/rower_simplepreferences.html
+++ b/rowers/templates/rower_simplepreferences.html
@@ -25,10 +25,59 @@
     </p>
     <p>
       If you do not row with a power meter on the water, the FTP on
-      water is irrelevant. If you do not know your 20 minute or full
-      hour full out power value on the water, take 85% of your indoor
-      rowing value.
+      water is irrelevant. In that case, please use the same value as
+      your FTP. If you do not know your 20 minute or full hour full
+      out power value on the water, take 85% of your indoor rowing
+      value.
     </p>
+    <p>
+      Detailed setting of zones is not necessary but can be done on
+      <a href="/rowers/me/preferences/">this page</a> (Zones &
+      Fitness, detailed in the left menu).
+    </p>
+  </li>
+  <li class="grid_2">
+    <table class="listtable shortpadded" width=100%>
+      <thead>
+         <tr>
+           <th>ID&nbsp;</th><th>Zone Name</th><th>Lower Boundary (Watt)&nbsp;</th><th>Lower Boundary (Watt)</th>
+	  </tr>
+	  <tr>
+	    <th></th><th></th><th>Indoor</th><th>OTW</th>
+          </tr>
+      </thead>
+        <tbody>
+          <tr>
+            <td>1</td><td>{{ user.rower.powerzones.0 }}</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2</td><td>{{ user.rower.powerzones.1 }}</td>
+            <td>{{ user.rower.pw_ut2 }}</td>
+            <td>{{ user.rower.pw_ut2|otwslack:user }}</td>
+          </tr>
+          <tr>
+            <td>3</td><td>{{ user.rower.powerzones.2 }}</td>
+            <td>{{ user.rower.pw_ut1 }}</td>
+            <td>{{ user.rower.pw_ut1|otwslack:user }}</td>
+          </tr>
+          <tr>
+            <td>4</td><td>{{ user.rower.powerzones.3 }}</td>
+            <td>{{ user.rower.pw_at }}</td>
+            <td>{{ user.rower.pw_at|otwslack:user }}</td>
+          </tr>
+          <tr>
+            <td>5</td><td>{{ user.rower.powerzones.4 }}</td>
+            <td>{{ user.rower.pw_tr }}</td>
+            <td>{{ user.rower.pw_tr|otwslack:user }}</td>
+          </tr>
+          <tr>
+            <td>6</td><td>{{ user.rower.powerzones.5 }}</td>
+            <td>{{ user.rower.pw_an }}</td>
+            <td>{{ user.rower.pw_an|otwslack:user }}</td>
+          </tr>
+        </tbody>
+    </table>
   </li>
 </ul>