Skip to content
Snippets Groups Projects
Verified Commit e9a568cd authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Add a third level to plans to allow parallel lessons (like elective courses)

parent 3a9f3ec8
No related branches found
No related tags found
1 merge request!31Biscuit merge. Closes #53.
...@@ -71,9 +71,18 @@ def timetable( ...@@ -71,9 +71,18 @@ def timetable(
per_period = {} per_period = {}
for lesson_period in lesson_periods: for lesson_period in lesson_periods:
print(lesson_period.period) print(lesson_period.period)
per_period.setdefault(lesson_period.period.period, {})[ added = False
lesson_period.period.weekday if lesson_period.period.period in per_period :
] = lesson_period if lesson_period.period.weekday in per_period[lesson_period.period.period]:
print("HEY HEY")
print(per_period[lesson_period.period.period][lesson_period.period.weekday])
per_period[lesson_period.period.period][lesson_period.period.weekday].append(lesson_period)
added =True
if not added:
per_period.setdefault(lesson_period.period.period, {})[
lesson_period.period.weekday
] = [lesson_period]
print(per_period) print(per_period)
# Determine overall first and last day and period # Determine overall first and last day and period
...@@ -97,7 +106,7 @@ def timetable( ...@@ -97,7 +106,7 @@ def timetable(
# Fill in empty lessons on this workday # Fill in empty lessons on this workday
for weekday_num in range(weekday_min, weekday_max + 1): for weekday_num in range(weekday_min, weekday_max + 1):
if weekday_num not in per_period[period_num].keys(): if weekday_num not in per_period[period_num].keys():
per_period[period_num][weekday_num] = None per_period[period_num][weekday_num] = []
# Order this weekday by periods # Order this weekday by periods
per_period[period_num] = OrderedDict(sorted(per_period[period_num].items())) per_period[period_num] = OrderedDict(sorted(per_period[period_num].items()))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment