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"