From 2cb7df5fd490c9f9d6d7188581ef75a17c31e9ea Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 26 Jan 2021 19:49:03 +0100 Subject: [PATCH 1/2] commit --- rowers/models.py | 53 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 745e9386..ece4f8e3 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -907,12 +907,11 @@ class Rower(models.Model): 'Pwr AN']) hrzones = PowerZonesField(default=['Rest', - 'UT2', - 'UT1', - 'AT', - 'TR', - 'AN','max']) - + 'UT2', + 'UT1', + 'AT', + 'TR', + 'AN','max']) emailalternatives = AlternativeEmails(default=[],null=True,blank=True,verbose_name='Alternative Email addresses (separate with ",")') @@ -944,6 +943,11 @@ class Rower(models.Model): tptokenexpirydate = models.DateTimeField(blank=True,null=True) tprefreshtoken = models.CharField(default='',max_length=1000, blank=True,null=True) + rp3token = models.CharField(default='',max_length=1000,blank=True,null=True) + rp3tokenexpirydate = models.DateTimeField(blank=True,null=True) + rp3refreshtoken = models.CharField(default='',max_length=1000, + blank=True,null=True) + trainingpeaks_auto_export = models.BooleanField(default=False) polartoken = models.CharField(default='',max_length=1000,blank=True,null=True) @@ -3662,7 +3666,6 @@ class RowerCPForm(ModelForm): model = Rower fields = ['cprange','kfit','kfatigue'] - # Form to set rower's Power zones, including test routines # to enable consistency class RowerHRZonesForm(ModelForm): @@ -3905,12 +3908,44 @@ class RowerPowerZonesForm(ModelForm): trname = cleaned_data['trname'] except: trname = 'TR' - cleaned_data['trname'] = 'TR' + cleaned_data['ut1name'] = 'TR' try: anname = cleaned_data['anname'] except: anname = 'AN' - cleaned_data['anname'] = 'AN' + cleaned_data['ut1name'] = 'AN' + + + try: + ut3name = cleaned_data['ut3name'] + except: + ut2name = 'UT3' + cleaned_data['ut3name'] = 'UT3' + try: + ut2name = cleaned_data['ut2name'] + except: + ut2name = 'UT2' + cleaned_data['ut2name'] = 'UT2' + try: + ut1name = cleaned_data['ut1name'] + except: + ut1name = 'UT1' + cleaned_data['ut1name'] = 'UT1' + try: + atname = cleaned_data['atname'] + except: + atname = 'AT' + cleaned_data['atname'] = 'AT' + try: + trname = cleaned_data['trname'] + except: + trname = 'TR' + cleaned_data['ut1name'] = 'TR' + try: + anname = cleaned_data['anname'] + except: + anname = 'AN' + cleaned_data['ut1name'] = 'AN' if pw_ut1 <= pw_ut2: From 6fde1a58323fa840da6e3ffc87d7877cbfed3742 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 4 Feb 2021 19:41:27 +0100 Subject: [PATCH 2/2] fix --- rowers/views/analysisviews.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 483ea122..9989cbd2 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -638,7 +638,11 @@ def cpdata(workouts, options): minutes = options['piece'] if minutes != 0: # minutes = 77 - hourvalue,tvalue = divmod(minutes,60) + try: + hourvalue,tvalue = divmod(minutes,60) + else: + hourvalue = 0 + tvalue = minutes # hourvalue = 1, tvalue = 17 hourvalue = int(hourvalue) minutevalue = int(tvalue) @@ -2426,6 +2430,11 @@ def rankings_view2(request,userid=0, velo = 500./p t = rankingdistance/velo pwr = 2.8*(velo**3) + try: + pwr = int(pwr) + except ValueError: + pwr = 0 + a = {'distance':rankingdistance, 'duration':timedeltaconv(t), 'pace':timedeltaconv(p),