Working version of ics interface - not very efficient

RIGS/urls.py

@@ -115,7 +115,7 @@ urlpatterns = patterns('',
                         name='profile_update_self'),
 
                        # ICS Calendar
-                       url(r'^ics/$', (views.CalendarICS()), name="ics_calendar"),
+                       url(r'^calendar/rigs.ics$', (views.CalendarICS()), name="ics_calendar"),
 
                        # API
                        url(r'^api/(?P<model>\w+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"),

RIGS/views.py

@@ -9,6 +9,7 @@ from django.core import serializers
 import simplejson
 from django.contrib import messages
 from django_ical.views import ICalFeed
+import datetime
 
 from RIGS import models, forms
 
@@ -268,12 +269,18 @@ class CalendarICS(ICalFeed):
     """
     A simple event calender
     """
-    product_id = '-//example.com//Example//EN'
+    product_id = 'PyRIGS'
+    title = 'PyRIGS Calendar'
     timezone = 'UTC'
-    file_name = "event.ics"
+    file_name = "rigs.ics"
 
     def items(self):
-        return models.Event.objects.all().order_by('-start_date')
+        #get events for today +- 1 year
+        start = datetime.datetime.now() - datetime.timedelta(days=1*365)
+        end = datetime.date.today() + datetime.timedelta(days=1*365)
+        filter = Q(start_date__lte=end) & Q(start_date__gte=start)
+
+        return models.Event.objects.filter(filter).order_by('-start_date')
 
     def item_title(self, item):
         title = ''
@@ -288,30 +295,35 @@ class CalendarICS(ICalFeed):
 
         title += item.name
         
-        title += ' ('+str(item.status)+')'
+        title += ' ('+str(item.get_status_display())+')'
 
         return title
 
     def item_start_datetime(self, item):
-        startDateTime = item.start_date#.strftime("%Y%M%d")
-
-        #if item.start_time:
-        #    startDateTime += 'T'+item.start_time.strftime("%H%i")
+        #set start date to the earliest defined time for the event
+        if item.meet_at:
+            startDateTime = item.meet_at
+        elif item.access_at:
+            startDateTime = item.access_at
+        elif item.start_time:
+            startDateTime = datetime.datetime.combine(item.start_date,item.start_time)
+        else:
+            startDateTime = item.start_date
 
         return startDateTime
 
     def item_end_datetime(self, item):
-        endDateTime = item.start_date.strftime("%Y%M%d")
+        endDateTime = item.start_date
 
-        #if item.end_date:
-        #    endDateTime = item.end_date.strftime("%Y%M%d")
-        #
-        #if item.start_time and item.end_time: # don't allow an event with specific end but no specific start
-        #    endDateTime += 'T'+item.end_time.strftime("%H%i")
-        #elif item.start_time: # if there's a start time specified then an end time should also be specified
-        #    endDateTime += 'T2359'
+        if item.end_date:
+            endDateTime = item.end_date
+        
+        if item.start_time and item.end_time: # don't allow an event with specific end but no specific start
+            endDateTime = datetime.datetime.combine(endDateTime,item.end_time)
+        elif item.start_time: # if there's a start time specified then an end time should also be specified
+            endDateTime = datetime.datetime.combine(endDateTime+datetime.timedelta(days=1),datetime.time(00, 00))
         #elif item.end_time: # end time but no start time - this is weird - don't think ICS will like it so ignoring
-        #    endDateTime += '' # do nothing
+             # do nothing
 
         return endDateTime
 
@@ -320,25 +332,35 @@ class CalendarICS(ICalFeed):
 
     def item_description(self, item):
         desc = 'Rig ID = '+str(item.pk)+'\n'
-        desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
-        desc += 'Status = ' + str(item.status) + '\n'
         desc += 'Event = ' + item.name + '\n'
         desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
         if item.is_rig and item.person:
-            desc += 'Client = ' + item.person.name + ( ('for'+item.organisation.name) if item.organisation else '') + '\n'
-        desc += '\n\n'
+            desc += 'Client = ' + item.person.name + ( (' for '+item.organisation.name) if item.organisation else '') + '\n'
+        desc += 'Status = ' + str(item.get_status_display()) + '\n'
+        desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
+        
+        
+        desc += '\n'
+        if item.meet_at:
+            desc += 'Crew Meet = ' + item.meet_at.strftime('%Y-%m-%d %H:%M') + (('('+item.meet_info+')') if item.meet_info else '---') + '\n'
+        if item.access_at:
+            desc += 'Access At = ' + item.access_at.strftime('%Y-%m-%d %H:%M') + '\n'
+        if item.start_date:
+            desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ((' '+item.start_time.strftime('%H:%M')) if item.start_time else '') + '\n'
+        if item.end_date:
+            desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + ((' '+item.end_time.strftime('%H:%M')) if item.end_time else '') + '\n'
+
+        desc += '\n'
         if item.description:
-            desc += 'Event Description:\n'+item.description
+            desc += 'Event Description:\n'+item.description+'\n\n'
         if item.notes:
             desc += 'Notes:\n'+item.notes
 
         
-
-
-        return item.description
+        return desc
 
     def item_link(self, item):
-        return ''
+        return '/event/'+str(item.pk)+'/'
 
     # def item_created(self, item):  #TODO - Implement created date-time (using django-reversion?)
     #     return ''