AFPy/PonyConf
AFPy
/
PonyConf
7
2
Fork 3
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

filter speakers by talks status

This commit is contained in:
Élie Bouttier 2016-09-24 18:34:06 +02:00
parent 1f635cb379
commit b605a85903
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proposals/forms.py
View File

@ -75,6 +75,11 @@ class TalkFilterForm(forms.Form):
class SpeakerFilterForm(forms.Form):
status = forms.MultipleChoiceField(
required=False,
widget=forms.CheckboxSelectMultiple,
choices=STATUS_CHOICES,
)
topic = forms.MultipleChoiceField(
required=False,
widget=forms.CheckboxSelectMultiple,

3
proposals/templates/proposals/speaker_list.html
View File

@ -18,10 +18,11 @@
<div class="row">
<div class="col-md-4 col-xs-6">
{% bootstrap_field filter_form.transport layout="horizontal" %}
{% bootstrap_field filter_form.hosting layout="horizontal" %}
</div>
<div class="col-md-4 col-xs-6">
{% bootstrap_field filter_form.hosting layout="horizontal" %}
{% bootstrap_field filter_form.sound layout="horizontal" %}
{% bootstrap_field filter_form.status layout="horizontal" %}
</div>
<div class="col-md-4 col-xs-6">
{% bootstrap_field filter_form.topic layout="horizontal" %}

5
proposals/views.py
View File

@ -280,10 +280,13 @@ def speaker_list(request):
# Filtering
if filter_form.is_valid():
data = filter_form.cleaned_data
if len(data['status']):
show_filters = True
talks = talks.filter(reduce(lambda x, y: x | y, [Q(accepted=dict(STATUS_VALUES)[status]) for status in data['status']]))
if len(data['topic']):
show_filters = True
talks = talks.filter(reduce(lambda x, y: x | y, [Q(topics__slug=topic) for topic in data['topic']]))
speakers = Participation.objects.filter(user__talk__in=talks).all().distinct()
speakers = Participation.objects.filter(site=site,user__talk__in=talks).order_by('pk').distinct()
if filter_form.is_valid():
data = filter_form.cleaned_data
if len(data['transport']):