Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Chronos
Commits
e9a568cd
Verified
Commit
e9a568cd
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
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
!31
Biscuit merge. Closes #53.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/chronos/views.py
+13
-4
13 additions, 4 deletions
aleksis/apps/chronos/views.py
with
13 additions
and
4 deletions
aleksis/apps/chronos/views.py
+
13
−
4
View file @
e9a568cd
...
@@ -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
()))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment