From 3444995880e4156ccfaa6a1d4bb7cb0073561f51 Mon Sep 17 00:00:00 2001
From: sanderroosendaal
Date: Tue, 8 Nov 2016 10:31:27 +0100
Subject: [PATCH 1/3] Initial updates (rowerpowerform) and ftp everywhere
rrower is called
---
rowers/dataprep.py | 2 +-
rowers/interactiveplots.py | 4 +-
rowers/mailprocessing.py | 2 +-
rowers/models.py | 8 ++-
rowers/tasks.py | 2 +
rowers/templates/rower_form.html | 15 +++--
rowers/tests.py | 33 +++++++++-
rowers/views.py | 104 ++++++++++++++++++++-----------
8 files changed, 124 insertions(+), 46 deletions(-)
diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 353a4f86..092fdb54 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -73,7 +73,7 @@ def getrowdata(id=0):
rr = rrower(hrmax=r.max,hrut2=r.ut2,
hrut1=r.ut1,hrat=r.at,
- hrtr=r.tr,hran=r.an)
+ hrtr=r.tr,hran=r.an,ftp=r.ftp)
rowdata = rdata(f1,rower=rr)
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 15be12f3..2744d1e4 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -359,7 +359,7 @@ def interactive_windchart(id=0,promember=0):
rr = rrower(hrmax=r.max,hrut2=r.ut2,
hrut1=r.ut1,hrat=r.at,
- hrtr=r.tr,hran=r.an)
+ hrtr=r.tr,hran=r.an,ftp=r.ftp)
rowdata = rdata(f1,rower=rr)
if rowdata == 0:
@@ -447,7 +447,7 @@ def interactive_streamchart(id=0,promember=0):
rr = rrower(hrmax=r.max,hrut2=r.ut2,
hrut1=r.ut1,hrat=r.at,
- hrtr=r.tr,hran=r.an)
+ hrtr=r.tr,hran=r.an,ftp=r.ftp)
rowdata = rdata(f1,rower=rr)
if rowdata == 0:
diff --git a/rowers/mailprocessing.py b/rowers/mailprocessing.py
index 32d24bdc..8e900112 100644
--- a/rowers/mailprocessing.py
+++ b/rowers/mailprocessing.py
@@ -142,7 +142,7 @@ def make_new_workout_from_email(rr,f2,name,cntr=0):
# make workout and put in database
#r = rrower(hrmax=rr.max,hrut2=rr.ut2,
# hrut1=rr.ut1,hrat=rr.at,
- # hrtr=rr.tr,hran=rr.an)
+ # hrtr=rr.tr,hran=rr.an,ftp=r.ftp)
row = rdata('media/'+f2) #,rower=r)
if row == 0:
return 0
diff --git a/rowers/models.py b/rowers/models.py
index efa91b55..186cc531 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -32,6 +32,8 @@ class Rower(models.Model):
weightcategory = models.CharField(default="hwt",
max_length=30,
choices=weightcategories)
+
+ ftp = models.IntegerField(default=226,verbose_name="Functional Threshold Power")
c2token = models.CharField(default='',max_length=200,blank=True,null=True)
tokenexpirydate = models.DateTimeField(blank=True,null=True)
@@ -49,7 +51,7 @@ class Rower(models.Model):
)
rowerplan = models.CharField(default='basic',max_length=30,
choices=plans)
- friends = models.ManyToManyField("self")
+ friends = models.ManyToManyField("self",blank=True)
team = models.ForeignKey(Team,blank=True,null=True)
@@ -158,6 +160,10 @@ class AdvancedWorkoutForm(ModelForm):
model = Workout
fields = ['boattype','weightvalue']
+class RowerPowerForm(ModelForm):
+ class Meta:
+ model = Rower
+ fields = ['ftp']
class RowerForm(ModelForm):
class Meta:
diff --git a/rowers/tasks.py b/rowers/tasks.py
index 143f0ffe..5637644b 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -177,6 +177,8 @@ def handle_makeplot(f1,f2,t,hrdata,plotnr,imagename):
fig1 = row.get_timeplot_erg2(t)
elif (plotnr==9) or (plotnr==12):
fig1 = row.get_time_otwpower(t)
+ elif (plotnr==13) or (plotnr==16):
+ fig1 = row.get_power_piechart(t)
canvas = FigureCanvas(fig1)
diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html
index c8368c6e..ffc83a3a 100644
--- a/rowers/templates/rower_form.html
+++ b/rowers/templates/rower_form.html
@@ -9,7 +9,7 @@
{% endif %}
-
Edit your Parameters
+
Heart Rate Bands