Changeset 8234d14 in indico

Timestamp:

04/03/12 17:54:20 (14 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

5739c10

Parents:

5e2fd1

Message:

[IMP] Added startupsupport to HTTP API export

Location:

indico

Files:

• MaKaC/plugins/RoomBooking/http_api.py (modified) (3 diffs)
• web/http_api/ical.py (modified) (1 diff)

indico/MaKaC/plugins/RoomBooking/http_api.py

@@ -367 +367 @@
     avc = get_query_parameter(queryParams, ['avc'])
     avcSupport = get_query_parameter(queryParams, ['avcs', 'avcsupport'])
+    startupSupport = get_query_parameter(queryParams, ['sts', 'startupsupport'])
     bookedFor = get_query_parameter(queryParams, ['bf', 'bookedfor'])
-    if not any((cancelled, rejected, confirmed != -1, archival, repeating, avc, avcSupport, bookedFor)):
+    if not any((cancelled, rejected, confirmed != -1, archival, repeating, avc, avcSupport, startupSupport, bookedFor)):
         return None
     if cancelled is not None:
@@ -387 +388 @@
     if avcSupport is not None:
         avcSupport = (avcSupport == 'yes')
+    if startupSupport is not None:
+        startupSupport = (startupSupport == 'yes')
     def _filter(obj):
         if cancelled is not None and obj.isCancelled != cancelled:
@@ -402 +405 @@
         if avcSupport is not None and obj.needsAVCSupport != avcSupport:
             return False
+        if startupSupport is not None and obj.needsAssistance != startupSupport:
+            return False
         if bookedFor and not fnmatch.fnmatch(obj.bookedForName.lower(), bookedFor.lower()):
             return False

indico/web/http_api/ical.py

@@ -93 +93 @@
     event.set('dtstamp', now)
     event.set('dtstart', getAdjustedDate(fossil['startDT'], None, "UTC"))
-    event.set('dtend', getAdjustedDate(datetime.datetime.combine(fossil['startDT'].date(), fossil['endDT'].time()), None, "UTC"))
+    event.set('dtend', getAdjustedDate(datetime.datetime.combine(fossil['startDT'].date(), fossil['endDT'].timetz()), None, "UTC"))
     event.set('url', fossil['bookingUrl'])
     event.set('summary', fossil['reason'])