diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index da5f4453..f4c58ad5 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -481,3 +481,13 @@ def update_virtualrace(ps,cd): ps.save() return 1,'Virtual Race Updated' + +def race_rower_status(r,race): + + ws = Workout.objects.filter(user=r,plannedsession=race) + + is_complete = is_session_complete_ws(ws,race)[1] + + has_registered = r in race.rower + + return is_complete,has_registered diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index 5d090577..3c50175a 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -21,37 +21,50 @@
-

Race Information

-

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Course{{ race.course }}
Date{{ race.startdate }}
Race Window{{ race.startdate }} {{ race.start_time }} to {{ race.enddate }} {{ race.end_time }}
Results Submission Deadline{{ race.evaluation_closure }}
Organizer{{ race.manager.first_name }} {{ race.manager.last_name }}
Contact Email{{ race.contact_email }}
Contact Phone{{ race.contact_phone }}
Comment{{ race.comment }}
-

+
+

Race Information

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Course{{ race.course }}
Date{{ race.startdate }}
Race Window{{ race.startdate }} {{ race.start_time }} to {{ race.enddate }} {{ race.end_time }}
Results Submission Deadline{{ race.evaluation_closure }}
Organizer{{ race.manager.first_name }} {{ race.manager.last_name }}
Contact Email{{ race.contact_email }}
Contact Phone{{ race.contact_phone }}
Comment{{ race.comment }}
+

+
+
+

+ hier komen de registratieknoppen en zo +

+
+
+

Results

+

+ No results yet +

+

Course

diff --git a/rowers/views.py b/rowers/views.py index ea2ec2bc..b65ba078 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13367,6 +13367,7 @@ def virtualevents_view(request): else: form = VirtualRaceSelectForm() + return render(request,'virtualevents.html', { 'races':races, @@ -13383,6 +13384,8 @@ def virtualevent_view(request,id=0): raise Http404("Virtual Race does not exist") script,div = course_map(race.course) + is_complete,has_registered = race_rower_status(r,race) + return render(request,'virtualevent.html', { @@ -13390,6 +13393,8 @@ def virtualevent_view(request,id=0): 'coursediv':div, 'race':race, 'rower':r + 'has_registered':has_registered, + 'has_rowed':is_complete, }) @login_required()