From d6c9f04b735e5b1415fb54c684ee80ed6b878c97 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 9 Apr 2018 16:04:47 +0200
Subject: [PATCH] adding hrftp

---
 rowers/dataprep.py | 8 ++++++--
 rowers/models.py   | 3 ++-
 rowers/views.py    | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index ff689960..d14c23a8 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -2305,13 +2305,17 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
 
 def workout_trimp(workout):
     r = workout.user
-    hrftp = (r.an+r.tr)/2.
+    if r.hrftp == 0:
+        hrftp = (r.an+r.tr)/2.
+        r.hrftp = hrftp
+        r.save()
+        
     df,row = getrowdata_db(id=workout.id)
     df = clean_df_stats(df,workstrokesonly=False)
     if df.empty:
         df,row = getrowdata_db(id=workout.id)
         df = clean_df_stats(df,workstrokesonly=False)
-    trimp,hrtss = calc_trimp(df,r.sex,r.max,r.rest,hrftp)
+    trimp,hrtss = calc_trimp(df,r.sex,r.max,r.rest,r.hrftp)
     trimp = int(trimp)
     hrtss = int(hrtss)
 
diff --git a/rowers/models.py b/rowers/models.py
index 5ec4a937..c35331e1 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -478,6 +478,7 @@ class Rower(models.Model):
     at = models.IntegerField(default=160,verbose_name="AT band lower HR")
     tr = models.IntegerField(default=167,verbose_name="TR band lower HR")
     an = models.IntegerField(default=180,verbose_name="AN band lower HR")
+    hrftp = models.IntegerField(default=0,verbose_name="FTP heart rate")
 
     # Weight Category (for sync to C2)
     weightcategory = models.CharField(default="hwt",
@@ -1427,7 +1428,7 @@ class RowerExportForm(ModelForm):
 class RowerPowerForm(ModelForm):
     class Meta:
 	model = Rower
-	fields = ['ftp','otwslack']
+	fields = ['hrftp','ftp','otwslack']
 
 # Form to set rower's Power zones, including test routines
 # to enable consistency
diff --git a/rowers/views.py b/rowers/views.py
index f3f2bfa1..560166d2 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11302,6 +11302,9 @@ def rower_edit_view(request,rowerid=0,message=""):
 	powerform = RowerPowerForm(request.POST)
 	if powerform.is_valid():
 	    cd = powerform.cleaned_data
+            hrftp = cd['hrftp']
+            if hrftp == 0:
+                hrftp = int((r.an+r.tr)/2.)
 	    ftp = cd['ftp']
             otwslack = cd['otwslack']
 	    try:
@@ -11317,6 +11320,7 @@ def rower_edit_view(request,rowerid=0,message=""):
                 r.pw_at = at
                 r.pw_tr = tr
                 r.pw_an = an
+                r.hrftp = hrftp
 		r.save()
 		message = "FTP and/or OTW slack values changed."
                 messages.info(request,message)