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
Merge requests
!258
Resolve "Events should lead to the cancellation of lessons"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Events should lead to the cancellation of lessons"
171-events-should-lead-to-the-cancellation-of-lessons
into
master
Overview
0
Commits
1
Pipelines
2
Changes
3
Merged
Jonathan Weth
requested to merge
171-events-should-lead-to-the-cancellation-of-lessons
into
master
2 years ago
Overview
0
Commits
1
Pipelines
2
Changes
3
Expand
Closes
#171 (closed)
Edited
2 years ago
by
Jonathan Weth
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
25e46744
1 commit,
2 years ago
3 files
+
50
−
20
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
aleksis/apps/chronos/templates/chronos/partials/lesson.html
+
8
−
3
Options
@@ -5,7 +5,7 @@
{# Display background color only if lesson is not cancelled and it is not the old room #}
{% 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
%}
{%
elif
not
sub.cancelled
and
not
lesson_period.get_substitution.cancelled_for_teachers
and
not
lesson_period.replaced_by_event
%}
{%
if
not
type.value =
=
"
room
"
or
lesson_period.room =
=
lesson_period.get_room
or
lesson_period.get_room =
=
el
%}
{%
if
sub
and
sub.subject
%}
{%
include
"
chronos
/
partials
/
subject_colour.html
"
with
subject=
sub.subject
%}
@@ -17,10 +17,15 @@
{%
endwith
%}
"
{
#
Add
CSS
class
for
sub
when
it
'
s
a
sub
#
}
class=
"{% if lesson_period.get_substitution
and smar
t %}lesson-with-sub{% endif %}"
class=
"{% if
smart %}{% if
lesson_period.get_substitution
or lesson_period.replaced_by_even
t %}lesson-with-sub{% endif
%}{% endif
%}"
>
<p>
{% if lesson_period.get_substitution and smart %}
{% if lesson_period.replaced_by_event and smart %}
{% include "chronos/partials/groups.html" with groups=lesson_period.lesson.groups.all %}
{% include "chronos/partials/subject.html" with subject=lesson_period.lesson.subject %}
<br/>
<span
class=
"badge new green"
>
{% trans "Cancelled due to an event" %}
</span>
{% elif lesson_period.get_substitution and smart %}
{% with sub=lesson_period.get_substitution %}
{# SUBSTITUTION #}
{% if type.value == "room" and lesson_period.room != lesson_period.get_room and lesson_period.get_room != el %}
Loading