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
204195c0
Verified
Commit
204195c0
authored
4 years ago
by
Lloyd Meins
Committed by
Jonathan Weth
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix view of regular plans
parent
36d38608
No related branches found
No related tags found
1 merge request
!125
Fix view of regular plans
Pipeline
#5515
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/templates/chronos/partials/elements.html
+2
-2
2 additions, 2 deletions
...sis/apps/chronos/templates/chronos/partials/elements.html
aleksis/apps/chronos/templates/chronos/partials/lesson.html
+1
-3
1 addition, 3 deletions
aleksis/apps/chronos/templates/chronos/partials/lesson.html
with
3 additions
and
5 deletions
aleksis/apps/chronos/templates/chronos/partials/elements.html
+
2
−
2
View file @
204195c0
...
...
@@ -3,9 +3,9 @@
{% for element in elements %}
{% if element.label_ == "lesson_period" %}
{% include "chronos/partials/lesson.html" with lesson_period=element %}
{% elif element.label_ == "extra_lesson" %}
{% elif element.label_ == "extra_lesson"
and smart
%}
{% include "chronos/partials/extra_lesson.html" with extra_lesson=element %}
{% elif element.label_ == "event" %}
{% elif element.label_ == "event"
and smart
%}
{% include "chronos/partials/event.html" with event=element %}
{% endif %}
{% endfor %}
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/templates/chronos/partials/lesson.html
+
1
−
3
View file @
204195c0
...
...
@@ -12,9 +12,7 @@
class=
"{% if lesson_period.get_substitution and smart %}lesson-with-sub{% endif %}"
>
<p>
{% if lesson_period.is_hol and smart %}
{# Do nothing #}
{% elif lesson_period.get_substitution and smart %}
{% if 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 %}
...
...
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