From 11f9956b4b729137831b911dd4581ee6c5e4b16b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 20 May 2024 16:15:41 +0200 Subject: [PATCH] first changes --- rowers/models.py | 3 +++ rowers/nkimportutils.py | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/rowers/models.py b/rowers/models.py index a05de7c5..be3247eb 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3626,6 +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) notes = models.CharField(blank=True, null=True, max_length=1000) summary = models.TextField(blank=True) diff --git a/rowers/nkimportutils.py b/rowers/nkimportutils.py index 9d682a54..67d65f85 100644 --- a/rowers/nkimportutils.py +++ b/rowers/nkimportutils.py @@ -82,6 +82,14 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata oarlockfirmware = oarlocksession["firmwareVersion"] except KeyError: oarlockfirmware = '' + try: + boatName = oarlocksession["boatName"] + except: + boatName = '' + try: + portStarboard = oarlocksession["portStarboard"] + except: + portStarboard = 1 else: # pragma: no cover # boatName = '' oarLength = 289 @@ -108,6 +116,8 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata 'totalDistance': totalDistance, 'useImpeller': useImpeller, 'seatNumber': seatNumber, + 'boatName': boatName, + 'portStarboard': portStarboard, } dologging('nklog.log',json.dumps(uploadoptions))