Skip to content

Commit f617e26

Browse files
committed
Shift all datetimes for iphone json view to UTC. Commit ready for merge.
- Legacy-Id: 11759
1 parent f2964b9 commit f617e26

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

ietf/meeting/views.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ def json_agenda(request, num=None ):
913913
sessdict['name'] = asgn.session.short
914914
else:
915915
sessdict['name'] = asgn.session.group.name
916-
sessdict['start'] = str(asgn.timeslot.time)
916+
sessdict['start'] = asgn.timeslot.utc_start_time().strftime("%Y-%m-%dT%H:%M:%SZ")
917917
sessdict['duration'] = str(asgn.timeslot.duration)
918918
sessdict['location'] = asgn.room_name
919919
room_names.add(asgn.room_name)
@@ -962,8 +962,10 @@ def json_agenda(request, num=None ):
962962
meetinfo.extend(parents)
963963
meetinfo.sort(key=lambda x: x['modified'],reverse=True)
964964
last_modified = meetinfo[0]['modified']
965+
966+
tz = pytz.timezone(meeting.time_zone)
965967
for obj in meetinfo:
966-
obj['modified'] = obj['modified'].strftime('%Y-%m-%dT%H:%M:%S')
968+
obj['modified'] = tz.localize(obj['modified']).astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
967969

968970
data = {"%s"%num: meetinfo}
969971

0 commit comments

Comments
 (0)