diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 2711a35d..1f1cf9de 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -51,7 +51,7 @@ import arrow thetimezone = get_current_timezone() from rowingdata import ( TCXParser, RowProParser, ErgDataParser, - CoxMateParser, + CoxMateParser, HeroParser, BoatCoachParser, RowPerfectParser, BoatCoachAdvancedParser, ETHParser, MysteryParser, BoatCoachOTWParser,QuiskeParser, @@ -1828,6 +1828,7 @@ parsers = { 'humon': HumonParser, 'eth': ETHParser, 'nklinklogbook': NKLiNKLogbookParser, + 'hero': HeroParser, } def parsenonpainsled(fileformat,f2,summary,startdatetime='',empowerfirmware=None,inboard=None,oarlength=None): diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 56c2ac42..c4a92124 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1850,7 +1850,7 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7, outids = [] - workouts = Workout.objects.filter(user=user.rower,date__gte=startdate, + workouts = Workout.objects.filter(user=user.rower,date__gte=startdate-datetime.timedelta(days=90), date__lte=enddate, workouttype__in=mytypes.rowtypes, duplicate=False).order_by('date') @@ -1869,7 +1869,8 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7, dates, testpower,testduration, impulses, - startdate,enddate, + startdate-datetime.timedelta(days=90), + enddate, user,metricchoice, kfatigue,kfitness) @@ -1900,6 +1901,9 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7, df.sort_values(['date'],inplace=True) df = df.groupby(['date']).max() df['date'] = df.index.values + mask = df['date'] > np.datetime64(startdate) + df = df.loc[mask] + source = ColumnDataSource( diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 93d865ae..5ff2fda8 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -383,6 +383,9 @@ def async_get_workout(user,stravaid): # Get a Strava workout summary data and stroke data by ID def get_workout(user,stravaid,do_async=False): + if do_async: + res = async_get_workout(user,stravaid) + return {},pd.DataFrame() try: thetoken = strava_open(user) except NoTokenError: # pragma: no cover diff --git a/rowers/templates/strava_list_import.html b/rowers/templates/strava_list_import.html index f6b1bea0..c2eac8d6 100644 --- a/rowers/templates/strava_list_import.html +++ b/rowers/templates/strava_list_import.html @@ -34,7 +34,7 @@ {% for workout in workouts %}