fixed hanging ops in optimer api, added endsIn value

This commit is contained in:
Aaron Static
2010-07-01 19:25:39 +10:00
parent c41c225a29
commit 5aea5763ab

View File

@@ -142,19 +142,23 @@ class OpTimerHandler(BaseHandler):
dt = datetime.strptime(date,'%Y-%m-%d %H:%M:%S') dt = datetime.strptime(date,'%Y-%m-%d %H:%M:%S')
now = datetime.utcnow() now = datetime.utcnow()
startsIn = int(dt.strftime('%s')) - int(now.strftime('%s')) startsIn = int(dt.strftime('%s')) - int(now.strftime('%s'))
duration = node.getAttribute('duration')
endsIn = startsIn + (duration * 60)
if startsIn < 0: if startsIn < 0:
startsIn = 0 startsIn = 0
event = { if endsIn > 0:
'startsIn': startsIn, event = {
'eventID': node.getAttribute('eventID'), 'startsIn': startsIn,
'ownerName': node.getAttribute('ownerName'), 'eventID': node.getAttribute('eventID'),
'eventDate': date, 'ownerName': node.getAttribute('ownerName'),
'eventTitle': node.getAttribute('eventTitle'), 'eventDate': date,
'duration': node.getAttribute('duration'), 'eventTitle': node.getAttribute('eventTitle'),
'isImportant': node.getAttribute('importance'), 'duration': duration,
'eventText': node.getAttribute('eventText') 'isImportant': node.getAttribute('importance'),
} 'eventText': node.getAttribute('eventText'),
events.append(event) 'endsIn':endsIn
}
events.append(event)
return {'ops':events} return {'ops':events}