From e6ddf80b6c8d86fbd910108e48d2d4358af67d98 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 22 Apr 2018 15:56:14 +0200 Subject: [PATCH] auto refresh using ajax in virtualevents_view --- rowers/forms.py | 1 + rowers/templates/racelist.html | 22 +++++++++ rowers/templates/virtualevents.html | 76 ++++++++++++++++++++--------- rowers/views.py | 16 ++++-- 4 files changed, 87 insertions(+), 28 deletions(-) create mode 100644 rowers/templates/racelist.html diff --git a/rowers/forms.py b/rowers/forms.py index a974efba..f4d4e457 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -763,6 +763,7 @@ class VirtualRaceSelectForm(forms.Form): choices = get_countries() ) + def __init__(self, *args, **kwargs): super(VirtualRaceSelectForm, self).__init__(*args, **kwargs) self.fields['country'] = forms.ChoiceField( diff --git a/rowers/templates/racelist.html b/rowers/templates/racelist.html new file mode 100644 index 00000000..dfe8ae95 --- /dev/null +++ b/rowers/templates/racelist.html @@ -0,0 +1,22 @@ +

+ + + + + + + + + + + {% for race in races %} + + + + + + + {% endfor %} + +
DateEventCountryCourse
{{ race.startdate }}{{ race.name }}{{ race.course.country }}{{ race.course.name }}
+

diff --git a/rowers/templates/virtualevents.html b/rowers/templates/virtualevents.html index 3c2b75a7..cae08ea1 100644 --- a/rowers/templates/virtualevents.html +++ b/rowers/templates/virtualevents.html @@ -5,6 +5,55 @@ {% block title %}Rowsandall Virtual Racing{% endblock %} {% block scripts %} + + + {% endblock %} @@ -19,7 +68,7 @@
-
+
{{ form.as_table }} {% csrf_token %} @@ -30,29 +79,8 @@
-
-

- - - - - - - - - - - {% for race in races %} - - - - - - - {% endfor %} - -
DateEventCountryCourse
{{ race.startdate }}{{ race.name }}{{ race.course.country }}{{ race.course.name }}
-

+
+ {% include 'racelist.html' %}
diff --git a/rowers/views.py b/rowers/views.py index 20509a85..446c1caf 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13317,13 +13317,17 @@ def plannedsession_deleteconfirm_view(request,id=0): ) def virtualevents_view(request): + is_ajax = False + if request.is_ajax(): + is_ajax = True # default races races = VirtualRace.objects.filter( startdate__gte=datetime.date.today() ).order_by("startdate","start_time") - r = getrower(request.user) + if not request.user.is_anonymous(): + r = getrower(request.user) if request.method == 'POST': # process form @@ -13367,11 +13371,15 @@ def virtualevents_view(request): form = VirtualRaceSelectForm() - + if is_ajax: + return render(request,'racelist.html', + { 'races':races, + }) + return render(request,'virtualevents.html', { 'races':races, 'form':form, - } + } ) def virtualevent_view(request,id=0): @@ -13417,7 +13425,7 @@ def virtualevent_view(request,id=0): race=race, workoutid__isnull=True, ) - print dns[0].username,"noot" + records = VirtualRaceResult.objects.filter(