sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

improved types for c2 import of bike

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-17 09:13:03 +01:00
parent 1fa7a8c9a2
commit 07930f6181
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/mytypes.py
View File

@@ -36,6 +36,7 @@ workouttypes_ordered = collections.OrderedDict({
'Kayaking':'Kayaking', 'Kayaking':'Kayaking',
'Workout':'Workout', 'Workout':'Workout',
'Yoga':'Yoga', 'Yoga':'Yoga',
'bike':'Bike',
'other':'Other', 'other':'Other',
} }
) )

8
rowers/templatetags/rowerfilters.py
View File

@@ -849,7 +849,7 @@ def nextworkout(workout,user):
if user.rower == workout.user: if user.rower == workout.user:
try: try:
ws = Workout.objects.filter( ws = Workout.objects.filter(
startdatetime__gte=workout.startdatetime, startdatetime__gt=workout.startdatetime,
user=workout.user user=workout.user
).order_by( ).order_by(
"startdatetime" "startdatetime"
@@ -859,7 +859,7 @@ def nextworkout(workout,user):
else: else:
try: try:
ws = Workout.objects.filter( ws = Workout.objects.filter(
startdatetime__gte=workout.startdatetime, startdatetime__gt=workout.startdatetime,
user=workout.user,privacy='visible' user=workout.user,privacy='visible'
).order_by( ).order_by(
"startdatetime" "startdatetime"
@@ -879,7 +879,7 @@ def previousworkout(workout,user):
if user.rower == workout.user: if user.rower == workout.user:
try: try:
ws = Workout.objects.filter( ws = Workout.objects.filter(
startdatetime__lte=workout.startdatetime, startdatetime__lt=workout.startdatetime,
user=workout.user user=workout.user
).order_by( ).order_by(
"-startdatetime" "-startdatetime"
@@ -889,7 +889,7 @@ def previousworkout(workout,user):
else: else:
try: try:
ws = Workout.objects.filter( ws = Workout.objects.filter(
startdatetime__lte=workout.startdatetime, startdatetime__lt=workout.startdatetime,
user=workout.user,privacy='visible' user=workout.user,privacy='visible'
).order_by( ).order_by(
"-startdatetime" "-startdatetime"