From b833b7d8695a388523393ae9d13629269a5b20e9 Mon Sep 17 00:00:00 2001 From: James Polley Date: Sun, 24 Dec 2017 14:52:09 +1100 Subject: [PATCH] Order slots by room order first * lca2018 has a situation where we have multiple slots starting at the same time, but ending at different times * The headers of the timetable grid are sorted by room sort order * In sqlite at least, ordering by start,order seems to implicitly resolve duplicate start times by looking at the other sort fields first, and will only sort on order if all other fields are identical * This results in the slot that ends first going in column 1, which gets out of sync with the room listed in the header * I can't figure out how to solve this in the database, so... * Force the slots to be sorted by room order. * Then, for each start_time, select out slots starting at that time and operate on them * This both gets the slots in the right order *and* keeps multi-room slots with the right colspan. Yay! * It's possible that this wouldn't be needed on some DBs which might do the sorting differently. --- vendor/symposion/schedule/timetable.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/symposion/schedule/timetable.py b/vendor/symposion/schedule/timetable.py index b0488aae..9fcb627d 100644 --- a/vendor/symposion/schedule/timetable.py +++ b/vendor/symposion/schedule/timetable.py @@ -27,16 +27,16 @@ class TimeTable(object): times = sorted(set(itertools.chain(*self.slots_qs().values_list("start", "end")))) slots = Slot.objects.filter(pk__in=self.slots_qs().values("pk")) slots = slots.annotate(room_count=Count("slotroom"), order=Min("slotroom__room__order")) - slots = slots.order_by("start", "order") + slots = slots.order_by("order") row = [] total_room_count = self.rooms().count() for time, next_time in pairwise(times): row = {"time": time, "slots": []} - for slot in slots: - if slot.start == time: - slot.rowspan = TimeTable.rowspan(times, slot.start, slot.end) - slot.colspan = slot.room_count if not slot.exclusive else total_room_count - row["slots"].append(slot) + row_slots = [ slot for slot in slots if slot.start == time] + for slot in row_slots: + slot.rowspan = TimeTable.rowspan(times, slot.start, slot.end) + slot.colspan = slot.room_count if not slot.exclusive else total_room_count + row["slots"].append(slot) if row["slots"] or next_time is None: yield row