diff --git a/requirements.txt b/requirements.txt index d94afcfe..8ca6b0e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,6 +31,7 @@ coreschema==0.0.4 coverage==4.5.3 cryptography==2.9.2 cycler==0.10.0 +Cython==0.29.21 dask==2.20.0 decorator==4.4.0 defusedxml==0.5.0 @@ -70,7 +71,7 @@ entrypoints==0.3 execnet==1.5.0 factory-boy==2.11.1 Faker==1.0.4 -fastparquet==0.4.0 +fastparquet==0.4.1 fitparse==1.1.0 Flask==1.0.2 fsspec==0.5.2 @@ -192,7 +193,7 @@ requests==2.23.0 requests-oauthlib==1.2.0 requests-toolbelt==0.9.1 rfc3986==1.4.0 -rowingdata==3.0.4 +rowingdata==3.0.5 rowingphysics==0.5.0 rq==0.13.0 rules==2.1 diff --git a/rowers/mytypes.py b/rowers/mytypes.py index 862b539d..1716d023 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -36,6 +36,7 @@ workouttypes_ordered = collections.OrderedDict({ 'Kayaking':'Kayaking', 'Workout':'Workout', 'Yoga':'Yoga', + 'bike':'Bike', 'other':'Other', } ) diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index a09e936b..6fce2550 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -849,7 +849,7 @@ def nextworkout(workout,user): if user.rower == workout.user: try: ws = Workout.objects.filter( - startdatetime__gte=workout.startdatetime, + startdatetime__gt=workout.startdatetime, user=workout.user ).order_by( "startdatetime" @@ -859,7 +859,7 @@ def nextworkout(workout,user): else: try: ws = Workout.objects.filter( - startdatetime__gte=workout.startdatetime, + startdatetime__gt=workout.startdatetime, user=workout.user,privacy='visible' ).order_by( "startdatetime" @@ -879,7 +879,7 @@ def previousworkout(workout,user): if user.rower == workout.user: try: ws = Workout.objects.filter( - startdatetime__lte=workout.startdatetime, + startdatetime__lt=workout.startdatetime, user=workout.user ).order_by( "-startdatetime" @@ -889,7 +889,7 @@ def previousworkout(workout,user): else: try: ws = Workout.objects.filter( - startdatetime__lte=workout.startdatetime, + startdatetime__lt=workout.startdatetime, user=workout.user,privacy='visible' ).order_by( "-startdatetime" diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py index 3de64833..a31debc5 100644 --- a/rowers/views/apiviews.py +++ b/rowers/views/apiviews.py @@ -123,7 +123,7 @@ def strokedatajson_v2(request,id): logfile.write(request.data['strokedata']+"\n") except KeyError: logfile.write("No data in request.data\n") - except AttributeError: + except (AttributeError,TypeError): logfile.write("No data in request\n") checkdata, r = dataprep.getrowdata_db(id=row.id) if not checkdata.empty: