From 998298ccdcfd91b57a2d40d0c520b623a03ddaa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Sat, 16 Jul 2016 02:39:27 +0200 Subject: [PATCH] Suppression de code inutile Plus de raison d'utiliser les autres exports ics --- bda/templates/liste_spectacles.ics | 10 --------- bda/templates/resume_places.html | 1 - bda/templates/resume_places.ics | 10 --------- bda/templates/spectacle_list.html | 1 - bda/urls.py | 6 ----- bda/views.py | 36 ------------------------------ 6 files changed, 64 deletions(-) delete mode 100644 bda/templates/liste_spectacles.ics delete mode 100644 bda/templates/resume_places.ics diff --git a/bda/templates/liste_spectacles.ics b/bda/templates/liste_spectacles.ics deleted file mode 100644 index 1ce599f3..00000000 --- a/bda/templates/liste_spectacles.ics +++ /dev/null @@ -1,10 +0,0 @@ -BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//GESTIOCOF/bda//EN -{% for spectacle in spectacles %}BEGIN:VEVENT -DTSTART;TZID=Europe/Paris:{{ spectacle.date|date:'Ymd\\THis' }} -DTEND;TZID=Europe/Paris:{{ spectacle.dtend|date:'Ymd\\THis' }} -SUMMARY:{{ spectacle.title|safe }} -LOCATION:{{ spectacle.location.name|safe }} -END:VEVENT -{% endfor %}END:VCALENDAR \ No newline at end of file diff --git a/bda/templates/resume_places.html b/bda/templates/resume_places.html index 8954d7c3..39711f51 100644 --- a/bda/templates/resume_places.html +++ b/bda/templates/resume_places.html @@ -12,7 +12,6 @@ {% endfor %}

Total à payer : {{ total|floatformat }}€

-

Exporter au format calendrier (.ics, compatible avec tous les logiciels d'agenda)

{% else %}

Vous n'avez aucune place :(

{% endif %} diff --git a/bda/templates/resume_places.ics b/bda/templates/resume_places.ics deleted file mode 100644 index 72aa4347..00000000 --- a/bda/templates/resume_places.ics +++ /dev/null @@ -1,10 +0,0 @@ -BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//GESTIOCOF/bda//EN -{% for place in places %}BEGIN:VEVENT -DTSTART;TZID=Europe/Paris:{{ place.spectacle.date|date:'Ymd\\THis' }} -DTEND;TZID=Europe/Paris:{{ place.spectacle.dtend|date:'Ymd\\THis' }} -SUMMARY:{{ place.spectacle.title|safe }}{% if place.double %} (deux places){% endif %} -LOCATION:{{ place.spectacle.location.name|safe }} -END:VEVENT -{% endfor %}END:VCALENDAR \ No newline at end of file diff --git a/bda/templates/spectacle_list.html b/bda/templates/spectacle_list.html index 752a9315..33a69142 100644 --- a/bda/templates/spectacle_list.html +++ b/bda/templates/spectacle_list.html @@ -11,6 +11,5 @@

Exports

{% endblock %} diff --git a/bda/urls.py b/bda/urls.py index 268bb352..0788f551 100644 --- a/bda/urls.py +++ b/bda/urls.py @@ -11,9 +11,6 @@ urlpatterns = patterns( url(r'^places/(?P\d+)$', 'bda.views.places', name="bda-places-attribuees"), - url(r'^places/(?P\d+)/places_bda.ics$', - 'bda.views.places_ics', - name="bda-places-attribuees-ics"), url(r'^revente/(?P\d+)$', 'bda.views.revente', name='bda-revente'), @@ -27,9 +24,6 @@ urlpatterns = patterns( url(r'^spectacles/(?P\d+)/(?P\d+)$', "bda.views.spectacle", name="bda-spectacle"), - url(r'^spectacles-ics/(?P\d+)$', - 'bda.views.liste_spectacles_ics', - name="bda-liste-spectacles-ics"), url(r'^spectacles/unpaid/(?P\d+)$', "bda.views.unpaid", name="bda-unpaid"), diff --git a/bda/views.py b/bda/views.py index 844ef60c..3cb70ed1 100644 --- a/bda/views.py +++ b/bda/views.py @@ -104,31 +104,6 @@ def places(request, tirage_id): "warning": warning}) -@cof_required -def places_ics(request, tirage_id): - tirage = get_object_or_404(Tirage, id=tirage_id) - participant, created = Participant.objects.get_or_create( - user=request.user, tirage=tirage) - places = participant.attribution_set.order_by( - "spectacle__date", "spectacle").all() - filtered_places = [] - places_dict = {} - spectacles = [] - for place in places: - if place.spectacle in spectacles: - places_dict[place.spectacle].double = True - else: - place.double = False - place.spectacle.dtend = place.spectacle.date \ - + timedelta(seconds=7200) - places_dict[place.spectacle] = place - spectacles.append(place.spectacle) - filtered_places.append(place) - return render(request, "resume_places.ics", - {"participant": participant, - "places": filtered_places}, content_type="text/calendar") - - @cof_required def inscription(request, tirage_id): tirage = get_object_or_404(Tirage, id=tirage_id) @@ -361,17 +336,6 @@ def unpaid(request, tirage_id): return render(request, "bda-unpaid.html", {"unpaid": unpaid}) -@buro_required -def liste_spectacles_ics(request, tirage_id): - tirage = get_object_or_404(Tirage, id=tirage_id) - spectacles = tirage.spectacle_set.order_by("date").all() - for spectacle in spectacles: - spectacle.dtend = spectacle.date + timedelta(seconds=7200) - return render(request, "liste_spectacles.ics", - {"spectacles": spectacles, "tirage": tirage}, - content_type="text/calendar") - - @buro_required def send_rappel(request, spectacle_id): show = get_object_or_404(Spectacle, id=spectacle_id)