Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make private methods more robust

Browse source
This commit is contained in:
David Ray 2014-03-03 13:47:46 -05:00
parent 6102c4e5e4
commit 62289cad36
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
symposion/schedule/forms.py
View file

@ -75,11 +75,15 @@ class ScheduleSectionForm(forms.Form):
def _get_start_end_times(self, data): def _get_start_end_times(self, data):
"Return start and end time objects" "Return start and end time objects"
start_time = time.strptime(data[self.START_KEY], '%I:%M %p') times = []
start = datetime(100, 1, 1, start_time.tm_hour, start_time.tm_min, 00) for x in [data[self.START_KEY], data[self.END_KEY]]:
end_time = time.strptime(data[self.END_KEY], '%I:%M %p') try:
end = datetime(100, 1, 1, end_time.tm_hour, end_time.tm_min, 00) time_obj = time.strptime(x, '%I:%M %p')
return start.time(), end.time() except:
return messages.ERROR, u'Malformed time found: %s.' % x
time_obj = datetime(100, 1, 1, time_obj.tm_hour, time_obj.tm_min, 00)
times.append(time_obj.time())
return times
def _build_rooms(self, data): def _build_rooms(self, data):
"Get or Create Rooms based on schedule type and set of Tracks" "Get or Create Rooms based on schedule type and set of Tracks"
@ -98,7 +102,11 @@ class ScheduleSectionForm(forms.Form):
created_days = [] created_days = []
days = set([x[self.DATE_KEY] for x in data]) days = set([x[self.DATE_KEY] for x in data])
for day in days: for day in days:
try:
date = datetime.strptime(day, "%m/%d/%Y") date = datetime.strptime(day, "%m/%d/%Y")
except ValueError:
[x.delete() for x in created_days]
return messages.ERROR, u'Malformed data found: %s.' % day
day, created = Day.objects.get_or_create( day, created = Day.objects.get_or_create(
schedule=self.schedule, date=date schedule=self.schedule, date=date
) )
@ -139,9 +147,9 @@ class ScheduleSectionForm(forms.Form):
) )
created_items.append(slot) created_items.append(slot)
try: try:
with transaction.atomic():
SlotRoom.objects.create(slot=slot, room=room) SlotRoom.objects.create(slot=slot, room=room)
except IntegrityError: except IntegrityError:
transaction.rollback()
# delete all created objects and report error # delete all created objects and report error
for x in created_items: for x in created_items:
x.delete() x.delete()