Merge branch 'Kerl/fix_decorator' into 'master'

Répare les export du Mega

Fix pas beau mais de toute façon ce code est horrible, il faut refaire ça. Là c'est juste pour éviter les 500 en prod.

See merge request !127
This commit is contained in:
Martin Pepin 2016-12-04 10:43:47 +01:00
commit 2d1a9d8ecb

View file

@ -550,7 +550,6 @@ def export_members(request):
return response return response
@buro_required
def csv_export_mega(filename, qs): def csv_export_mega(filename, qs):
response = HttpResponse(content_type='text/csv') response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=' + filename response['Content-Disposition'] = 'attachment; filename=' + filename
@ -572,12 +571,12 @@ def csv_export_mega(filename, qs):
@buro_required @buro_required
def export_mega_remarksonly(request): def export_mega_remarksonly(request):
filename = 'remarques_mega_2015.csv' filename = 'remarques_mega_2016.csv'
response = HttpResponse(content_type='text/csv') response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=' + filename response['Content-Disposition'] = 'attachment; filename=' + filename
writer = unicodecsv.writer(response) writer = unicodecsv.writer(response)
event = Event.objects.get(title="Mega 15") event = Event.objects.get(title="Mega 2016")
commentfield = event.commentfields.get(name="Commentaires") commentfield = event.commentfields.get(name="Commentaires")
for val in commentfield.values.all(): for val in commentfield.values.all():
reg = val.registration reg = val.registration
@ -600,42 +599,40 @@ def export_mega_bytype(request, type):
if type not in types: if type not in types:
raise Http404 raise Http404
event = Event.objects.get(title="Mega 15") event = Event.objects.get(title="Mega 2016")
type_option = event.options.get(name="Type") type_option = event.options.get(name="Type")
participant_type = type_option.choices.get(value=types[type]).id participant_type = type_option.choices.get(value=types[type]).id
qs = EventRegistration.objects.filter(event=event).filter( qs = EventRegistration.objects.filter(event=event).filter(
options__id__exact=participant_type) options__id__exact=participant_type)
return csv_export_mega(type + '_mega_2015.csv', qs) return csv_export_mega(type + '_mega_2016.csv', qs)
@buro_required @buro_required
def export_mega_orgas(request): def export_mega_orgas(request):
event = Event.objects.get(title="Mega 15") event = Event.objects.get(title="Mega 2016")
type_option = event.options.get(name="Type") type_option = event.options.get(name="Conscrit ou orga ?")
participant_type_a = type_option.choices.get(value="Conscrit étudiant").id participant_type = type_option.choices.get(value="Vieux").id
participant_type_b = type_option.choices.get(value="Conscrit élève").id
qs = EventRegistration.objects.filter(event=event).exclude( qs = EventRegistration.objects.filter(event=event).exclude(
options__id__in=(participant_type_a, participant_type_b)) options__id=participant_type)
return csv_export_mega('orgas_mega_15.csv', qs) return csv_export_mega('orgas_mega_2016.csv', qs)
@buro_required @buro_required
def export_mega_participants(request): def export_mega_participants(request):
event = Event.objects.get(title="Mega 15") event = Event.objects.get(title="Mega 2016")
type_option = event.options.get(name="Type") type_option = event.options.get(name="Conscrit ou orga ?")
participant_type_a = type_option.choices.get(value="Conscrit étudiant").id participant_type = type_option.choices.get(value="Conscrit").id
participant_type_b = type_option.choices.get(value="Conscrit élève").id
qs = EventRegistration.objects.filter(event=event).filter( qs = EventRegistration.objects.filter(event=event).filter(
options__id__in=(participant_type_a, participant_type_b)) options__id=participant_type)
return csv_export_mega('participants_mega_15.csv', qs) return csv_export_mega('participants_mega_2016.csv', qs)
@buro_required @buro_required
def export_mega(request): def export_mega(request):
event = Event.objects.filter(title="Mega 15") event = Event.objects.filter(title="Mega 2016")
qs = EventRegistration.objects.filter(event=event) \ qs = EventRegistration.objects.filter(event=event) \
.order_by("user__username") .order_by("user__username")
return csv_export_mega('all_mega_2015.csv', qs) return csv_export_mega('all_mega_2016.csv', qs)
@buro_required @buro_required