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
e6a5fa82
Verified
Commit
e6a5fa82
authored
3 years ago
by
Lloyd Meins
Browse files
Options
Downloads
Patches
Plain Diff
Keep colour in regular timetable and change colour on substitutions
parent
56388f38
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!153
Resolve "Check generation of regular timetable"
Pipeline
#10852
canceled
3 years ago
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/chronos/templates/chronos/partials/lesson.html
+10
-2
10 additions, 2 deletions
aleksis/apps/chronos/templates/chronos/partials/lesson.html
with
10 additions
and
2 deletions
aleksis/apps/chronos/templates/chronos/partials/lesson.html
+
10
−
2
View file @
e6a5fa82
{% load i18n %}
<div
style=
"
{% with sub=lesson_period.get_substitution %}
{# Display background color only if lesson is not cancelled and it is not the old room #}
{% if not lesson_period.get_substitution.cancelled and not lesson_period.get_substitution.cancelled_for_teachers %}
{% if not smart %}
{% include "
chronos
/
partials
/
subject_colour.html
"
with
subject=
lesson_period.lesson.subject
%}
{%
elif
not
sub.cancelled
and
not
lesson_period.get_substitution.cancelled_for_teachers
%}
{%
if
not
type.value =
=
"
room
"
or
lesson_period.room =
=
lesson_period.get_room
or
lesson_period.get_room =
=
el
%}
{%
include
"
chronos
/
partials
/
subject_colour.html
"
with
subject=
lesson_period.lesson.subject
%}
{%
if
sub
and
sub.subject
%}
{%
include
"
chronos
/
partials
/
subject_colour.html
"
with
subject=
sub.subject
%}
{%
else
%}
{%
include
"
chronos
/
partials
/
subject_colour.html
"
with
subject=
lesson_period.lesson.subject
%}
{%
endif
%}
{%
endif
%}
{%
endif
%}
{%
endwith
%}
"
{
#
Add
CSS
class
for
sub
when
it
'
s
a
sub
#
}
class=
"{% if lesson_period.get_substitution and smart %}lesson-with-sub{% endif %}"
...
...
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