sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

adding hrftp

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-09 16:04:47 +02:00
parent c4b10e5b0b
commit d6c9f04b73
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -2305,13 +2305,17 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
def workout_trimp(workout): def workout_trimp(workout):
r = workout.user 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,row = getrowdata_db(id=workout.id)
df = clean_df_stats(df,workstrokesonly=False) df = clean_df_stats(df,workstrokesonly=False)
if df.empty: if df.empty:
df,row = getrowdata_db(id=workout.id) df,row = getrowdata_db(id=workout.id)
df = clean_df_stats(df,workstrokesonly=False) 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) trimp = int(trimp)
hrtss = int(hrtss) hrtss = int(hrtss)

3
rowers/models.py
View File

@@ -478,6 +478,7 @@ class Rower(models.Model):
at = models.IntegerField(default=160,verbose_name="AT band lower HR") at = models.IntegerField(default=160,verbose_name="AT band lower HR")
tr = models.IntegerField(default=167,verbose_name="TR 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") 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) # Weight Category (for sync to C2)
weightcategory = models.CharField(default="hwt", weightcategory = models.CharField(default="hwt",
@@ -1427,7 +1428,7 @@ class RowerExportForm(ModelForm):
class RowerPowerForm(ModelForm): class RowerPowerForm(ModelForm):
class Meta: class Meta:
model = Rower model = Rower
fields = ['ftp','otwslack'] fields = ['hrftp','ftp','otwslack']
# Form to set rower's Power zones, including test routines # Form to set rower's Power zones, including test routines
# to enable consistency # to enable consistency

4
rowers/views.py
View File

@@ -11302,6 +11302,9 @@ def rower_edit_view(request,rowerid=0,message=""):
powerform = RowerPowerForm(request.POST) powerform = RowerPowerForm(request.POST)
if powerform.is_valid(): if powerform.is_valid():
cd = powerform.cleaned_data cd = powerform.cleaned_data
hrftp = cd['hrftp']
if hrftp == 0:
hrftp = int((r.an+r.tr)/2.)
ftp = cd['ftp'] ftp = cd['ftp']
otwslack = cd['otwslack'] otwslack = cd['otwslack']
try: try:
@@ -11317,6 +11320,7 @@ def rower_edit_view(request,rowerid=0,message=""):
r.pw_at = at r.pw_at = at
r.pw_tr = tr r.pw_tr = tr
r.pw_an = an r.pw_an = an
r.hrftp = hrftp
r.save() r.save()
message = "FTP and/or OTW slack values changed." message = "FTP and/or OTW slack values changed."
messages.info(request,message) messages.info(request,message)