Added TimeTable
This commit is contained in:
parent
bec6903ca1
commit
f3e9cc9a5d
3 changed files with 45 additions and 1 deletions
|
@ -48,5 +48,9 @@ class Slot(models.Model):
|
||||||
def rooms(self):
|
def rooms(self):
|
||||||
attr = "_rooms"
|
attr = "_rooms"
|
||||||
if not hasattr(self, attr):
|
if not hasattr(self, attr):
|
||||||
setattr(self, attr, InlineSet(obj=self, field="room_set", delimiter=" "))
|
class RoomInlineSet(InlineSet):
|
||||||
|
def consective_count(self):
|
||||||
|
return len(self)
|
||||||
|
value = RoomInlineSet(obj=self, field="room_set", delimiter=" ")
|
||||||
|
setattr(self, attr, value)
|
||||||
return getattr(self, attr)
|
return getattr(self, attr)
|
||||||
|
|
37
symposion/schedule/timetable.py
Normal file
37
symposion/schedule/timetable.py
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
import itertools
|
||||||
|
|
||||||
|
|
||||||
|
class Timetable(object):
|
||||||
|
|
||||||
|
def __init__(self, day):
|
||||||
|
self.day = day
|
||||||
|
|
||||||
|
def slots_qs(self):
|
||||||
|
return Slot.objects.filter(day=self.day)
|
||||||
|
|
||||||
|
def rooms(self):
|
||||||
|
return Room.objects.filter(day=self.day.schedule)
|
||||||
|
|
||||||
|
def __iter__(self):
|
||||||
|
times = sorted(set(itertools.chain(*self.slots_qs().values_list("start", "end"))))
|
||||||
|
slots = list(self.slots_qs().order_by("start"))
|
||||||
|
row = []
|
||||||
|
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)
|
||||||
|
row["slots"].append(slot)
|
||||||
|
row["colspan"] = self.rooms.consecutive_count()
|
||||||
|
if row["slots"] or next_time is None:
|
||||||
|
yield row
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def rowspan(times, start, end):
|
||||||
|
return times.index(end) - times.index(start)
|
||||||
|
|
||||||
|
|
||||||
|
def pairwise(iterable):
|
||||||
|
a, b = itertools.tee(iterable)
|
||||||
|
b.next()
|
||||||
|
return itertools.izip_longest(a, b)
|
|
@ -25,7 +25,10 @@ def schedule_edit(request, slug=None):
|
||||||
raise Http404()
|
raise Http404()
|
||||||
else:
|
else:
|
||||||
schedule = get_object_or_404(qs, slug=slug)
|
schedule = get_object_or_404(qs, slug=slug)
|
||||||
|
days_qs = Day.objects.filter(schedule=schedule)
|
||||||
|
days = [TimeTable(day) for day in days_qs]
|
||||||
ctx = {
|
ctx = {
|
||||||
"schedule": schedule,
|
"schedule": schedule,
|
||||||
|
"days": days,
|
||||||
}
|
}
|
||||||
return render(request, "schedule/schedule_edit.html")
|
return render(request, "schedule/schedule_edit.html")
|
||||||
|
|
Loading…
Reference in a new issue