From 2a67e9d8b25674e8fa04ffeb4aecb7776d1962d3 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 22 Apr 2015 14:35:05 +0100 Subject: [PATCH] Stripped out all timezone references. Also reduced query to past 3 months --- RIGS/ical.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RIGS/ical.py b/RIGS/ical.py index 944d03a9..15dc73af 100644 --- a/RIGS/ical.py +++ b/RIGS/ical.py @@ -16,8 +16,8 @@ class CalendarICS(ICalFeed): file_name = "rigs.ics" def items(self): - #include events from up to 1 year ago - start = datetime.datetime.now() - datetime.timedelta(days=365) + #include events from up to 3 months ago + start = datetime.datetime.now() - datetime.timedelta(days=31*3) filter = Q(start_date__gte=start) return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic') @@ -46,11 +46,11 @@ class CalendarICS(ICalFeed): def item_start_datetime(self, item): #set start date to the earliest defined time for the event if item.meet_at: - startDateTime = item.meet_at + startDateTime = item.meet_at.replace(tzinfo=None) elif item.access_at: - startDateTime = item.access_at + startDateTime = item.access_at.replace(tzinfo=None) elif item.start_time: - startDateTime = datetime.datetime.combine(item.start_date,item.start_time) + startDateTime = datetime.datetime.combine(item.start_date,item.start_time).replace(tzinfo=None) else: startDateTime = item.start_date @@ -65,9 +65,9 @@ class CalendarICS(ICalFeed): 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) + endDateTime = datetime.datetime.combine(endDateTime,item.end_time).replace(tzinfo=None) 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)) + endDateTime = datetime.datetime.combine(endDateTime+datetime.timedelta(days=1),datetime.time(00, 00)).replace(tzinfo=None) #elif item.end_time: # end time but no start time - this is weird - don't think ICS will like it so ignoring # do nothing @@ -106,7 +106,7 @@ class CalendarICS(ICalFeed): desc += 'Notes:\n'+item.notes+'\n\n' base_url = "https://pyrigs.nottinghamtec.co.uk" - desc += 'URL = '+base_url+str(reverse_lazy('event_detail',kwargs={'pk':item.pk})) + desc += 'URL = '+base_url+str(item.get_absolute_url()) return desc @@ -119,7 +119,7 @@ class CalendarICS(ICalFeed): # return '' def item_updated(self, item): # some ical clients will display this - return item.last_edited_at + return item.last_edited_at.replace(tzinfo=None) def item_guid(self, item): # use the rig-id as the ical unique event identifier return item.pk \ No newline at end of file