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

initial

Browse Source
This commit is contained in:
Sander Roosendaal
2024-05-20 19:37:09 +02:00
parent 1a2647457a
commit 7733298f5c
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/dataprep.py
View File

@@ -1126,6 +1126,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
summary='',
makeprivate=False,
oarlength=2.89, inboard=0.88,
boatname='',
empowerside='port',
seatnumber=1,
forceunit='lbs',
consistencychecks=False,
startdatetime='',
@@ -1343,6 +1346,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
w.startdatetime = workoutstartdatetime
w.inboard = inboard
w.oarlength = oarlength
w.seatnumber = seatnumber
w.boatname = boatname
w.empowerside = empowerside
w.timezone = timezone_str
w.privacy = privacy
w.impeller = impeller
@@ -1367,6 +1373,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
maxhr=maxhr, averagehr=averagehr,
startdatetime=workoutstartdatetime,
inboard=inboard, oarlength=oarlength,
boatname=boatname,
empowerside=empowerside,
seatnumber=seatnumber,
timezone=timezone_str,
privacy=privacy,
impeller=impeller)
@@ -1418,6 +1427,9 @@ def new_workout_from_file(r, f2,
oarlockfirmware='',
inboard=None,
oarlength=None,
boatname='',
seatnumber=1,
empowerside='port',
impeller=False,
uploadoptions={'boattype': '1x', 'workouttype': 'rower'}):
message = ""
@@ -1583,6 +1595,8 @@ def new_workout_from_file(r, f2,
startdatetime=startdatetime,
rpe=rpe,
inboard=inboard, oarlength=oarlength,
seatnumber=seatnumber, boatname=boatname,
empowerside=empowerside,
title=title,
forceunit='N',
impeller=impeller,

9
rowers/models.py
View File

@@ -3626,9 +3626,9 @@ class Workout(models.Model):
# empower stuff
inboard = models.FloatField(default=0.88)
oarlength = models.FloatField(default=2.89)
seatnumber = models.IntegerField(default=1)
boatname = models.CharField(default='', blank=True, null=True, max_length=150)
empowerside = models.CharField(default='starboard', blank=True, null=True, max_length=150)
seatnumber = models.IntegerField(default=1, verbose_name='Seat Number')
boatname = models.CharField(default='', blank=True, null=True, max_length=150, verbose_name='Boat Name')
empowerside = models.CharField(default='starboard', blank=True, null=True, max_length=150, verbose_name='Empower Oarlock side')
notes = models.CharField(blank=True, null=True, max_length=1000)
summary = models.TextField(blank=True)
@@ -4363,6 +4363,9 @@ class WorkoutForm(ModelForm):
'distance',
'workouttype',
'boattype',
'boatname',
'seatnumber',
'empowerside',
'dragfactor',
'weightcategory',
'adaptiveclass',

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

10
rowers/views/workoutviews.py
View File

@@ -4855,6 +4855,13 @@ def workout_upload_api(request):
inboard = post_data.get('inboard', None)
oarlength = post_data.get('oarlength', None)
useImpeller = post_data.get('useImpeller', False)
seatnumber = post_data.get('seatNumber', 1)
boatname = post_data.get('boatName','')
portStarboard = post_data.get('portStarboard', 1)
empowerside = 'port'
if portStarboard == 1:
empowerside = 'starboard'
totalDistance = post_data.get('totalDistance', None)
elapsedTime = post_data.get('elapsedTime', None)
@@ -4946,6 +4953,9 @@ def workout_upload_api(request):
oarlength=oarlength,
impeller=useImpeller,
workoutid=workoutid,
empowerside=empowerside,
boatname=boatname,
seatnumber=seatnumber,
)
if id == 0: # pragma: no cover