Export List: 1. filter expired, 2. added internal note.

dav_events/forms/events.py

@@ -57,6 +57,8 @@ class EventListExportForm(forms.Form):
                                                 'pickerPosition': 'bottom-left',
                                             },
                                             bootstrap_version=3))
+    expired = forms.BooleanField(required=False,
+                                 label=_(u'auch ausgelaufene Veranstaltungen auflisten'))
 
     def __init__(self, *args, **kwargs):
         super(EventListExportForm, self).__init__(*args, **kwargs)

dav_events/views/events.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 import logging
 import os
 from django.apps import apps
@@ -82,12 +83,17 @@ class EventListExportView(generic.FormView):
             filter_kwargs['first_day__lte'] = date
             filename += u'--%s' % date.strftime('%Y-%m-%d')
 
+        exclude_expired = not form.cleaned_data.get('expired', False)
+
         txt = u''
         event_qs = models.Event.objects.filter(**filter_kwargs).order_by('sport', 'first_day')
         for event in event_qs:
-            # txt += unicode(event)
+            if exclude_expired and event.get_status() == 'expired':
+                continue
             txt += event.render_as_text()
-            txt += u'\n-----\n\n'
+            if event.internal_note:
+                txt += u'\n> Bearbeitungshinweis:\n> ' + event.internal_note.replace('\n', '\n> ') + u'\n'
+            txt += u'\n' + (u'-' * 72) + '\n\n'
 
         filename += u'.txt'