arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 13:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #314 from nottinghamtec/hotfix/ical

Browse Source 
Fix ical end dates being wrong by 24 hours
This commit is contained in:
David Taylor
2017-09-25 23:16:54 +01:00
committed by GitHub
parent 92acd17e64 ca9e309b1b
commit cf8edc8a1c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/ical.py
View File

@@ -99,7 +99,7 @@ class CalendarICS(ICalFeed):
return item.earliest_time
def item_end_datetime(self, item):
if isinstance(item.latest_time, datetime.date): # Ical end_datetime is non-inclusive, so add a day
if type(item.latest_time) == datetime.date: # Ical end_datetime is non-inclusive, so add a day
return item.latest_time + datetime.timedelta(days=1)
return item.latest_time
@@ -137,7 +137,7 @@ class CalendarICS(ICalFeed):
# if item.notes: // Need to add proper keyholder checks before this gets put back
# desc += 'Notes:\n'+item.notes+'\n\n'
base_url = "http://rigs.nottinghamtec.co.uk"
base_url = "https://rigs.nottinghamtec.co.uk"
desc += 'URL = ' + base_url + str(item.get_absolute_url())
return desc

10
RIGS/test_functional.py
View File

@@ -834,7 +834,9 @@ class IcalTest(LiveServerTestCase):
description="start past 1 week with end past")
models.Event.objects.create(name="TE E6", status=models.Event.BOOKED,
start_date=date.today() - timedelta(days=2),
end_date=date.today() + timedelta(days=2), description="start past, end future")
start_time=time(8, 00),
end_date=date.today() + timedelta(days=2),
end_time=time(23, 00), description="start past, end future")
models.Event.objects.create(name="TE E7", status=models.Event.BOOKED,
start_date=date.today() + timedelta(days=2),
end_date=date.today() + timedelta(days=2), description="start + end in future")
@@ -924,6 +926,8 @@ class IcalTest(LiveServerTestCase):
# Awesome - all seems to work
def testICSFiles(self):
specialEvent = models.Event.objects.get(name="TE E6")
# Requests address
self.browser.get(self.live_server_url + '/user/')
# Gets redirected to login
@@ -953,6 +957,10 @@ class IcalTest(LiveServerTestCase):
else:
self.assertNotContains(response, "TE E" + str(test) + " ")
# Check that times have been included correctly
self.assertContains(response, specialEvent.start_date.strftime('%Y%m%d') + 'T' + specialEvent.start_time.strftime('%H%M%S'))
self.assertContains(response, specialEvent.end_date.strftime('%Y%m%d') + 'T' + specialEvent.end_time.strftime('%H%M%S'))
# Only dry hires
self.browser.find_element_by_xpath("//input[@value='rig']").click()
self.browser.find_element_by_xpath("//input[@value='non-rig']").click()