diff --git a/rowers/models.py b/rowers/models.py index 5ef03d68..db5795ed 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1349,6 +1349,7 @@ class VirtualRaceResult(models.Model): verbose_name='Weight Category') race = models.ForeignKey(VirtualRace) duration = models.TimeField(default=datetime.time(1,0)) + distance = models.IntegerField(default=0) boattype = models.CharField(choices=boattypes,max_length=40, default='1x', verbose_name = 'Boat Type' diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 847d2f26..10a11d8f 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -720,6 +720,7 @@ def add_workout_race(ws,race,r): return result,comments, errors record.coursecompleted=coursecompleted + record.distance = int(coursemeters) record.workoutid=ws[0].id record.duration = duration record.save() diff --git a/rowers/templates/course_view.html b/rowers/templates/course_view.html index 89b8b03d..fa10318a 100644 --- a/rowers/templates/course_view.html +++ b/rowers/templates/course_view.html @@ -40,7 +40,7 @@ Country{{ course.country }} - Notes{{ course.notes }} + Notes{{ course.notes|linebreaks }} diff --git a/rowers/templates/racelist.html b/rowers/templates/racelist.html index b2f391b1..2784b896 100644 --- a/rowers/templates/racelist.html +++ b/rowers/templates/racelist.html @@ -8,6 +8,7 @@ Event Country Course + Distance Click for Details @@ -25,6 +26,7 @@ {{ race.name }} {{ race.course.country }} {{ race.course.name }} + {{ race.sessionvalue }} m {% if rower %} {% if race|can_register:rower %} diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index 954f66b4..8fe2c290 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -23,6 +23,9 @@ Course{{ race.course }} + + Distance{{ race.sessionvalue }} m + Registration closure {{ race.registration_closure }} @@ -98,6 +101,7 @@   Boat Time + Distance Details @@ -114,6 +118,7 @@ {{ result.weightcategory }} {{ result.boattype }} {{ result.duration |durationprint:"%H:%M:%S.%f" }} + {{ result.distance }} m Details diff --git a/rowers/views.py b/rowers/views.py index 057c5737..e3f056f7 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13624,6 +13624,7 @@ def virtualevent_create_view(request): course=geocourse, comment=comment, sessiontype = 'coursetest', + sessionvalue = sessionvalue, timezone=timezone_str, evaluation_closure=evaluation_closure, registration_closure=registration_closure,