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

Add links in timetable (without substitutions) (issue #129)

parent 3887d437
No related branches found
No related tags found
No related merge requests found
......@@ -26,7 +26,8 @@
{# Class or room > Display teacher #}
{% if type == 2 or type == 1 %}
<span data-position="bottom" class="tooltipped"
data-tooltip="{{ element_container.element.teacher }}">{{ element_container.element.teacher.shortcode }}</span>
data-tooltip="{{ element_container.element.teacher }}"><a
href="{% url "timetable_plan" "teacher" element_container.element.teacher.id %}">{{ element_container.element.teacher.shortcode }}</a></span>
<br>
{% endif %}
......@@ -70,13 +71,22 @@
{# Teacher or room > Display classes #}
{% if type == 0 or type == 1 %}
{{ element_container.classes_formatted }}
{# {{ element_container.element.classes }}#}
{% if element_container.element.classes %}
<a href="{% url "timetable_plan" "class" element_container.element.classes.0.id %}">
{{ element_container.classes_formatted }}
</a>
{% endif %}
{% endif %}
{# Class or room > Display teacher #}
{% if type == 2 or type == 1 %}
<span data-position="bottom" class="tooltipped"
data-tooltip="{{ element_container.element.teacher }}">{{ element_container.element.teacher.shortcode }}</span>
data-tooltip="{{ element_container.element.teacher }}">
<a href="{% url "timetable_plan" "teacher" element_container.element.teacher.id %}">
{{ element_container.element.teacher.shortcode }}
</a>
</span>
{% endif %}
{# Display subject #}
......@@ -85,7 +95,13 @@
{# Teacher or class > Display room #}
{% if type == 0 or type == 2 %}
<span class="tooltipped" data-position="bottom"
data-tooltip="{{ element_container.room.name }}">{{ element_container.room.shortcode }}</span>
data-tooltip="{{ element_container.room.name }}">
{% if element_container.room %}
<a href="{% url "timetable_plan" "room" element_container.room.id %}">
{{ element_container.room.shortcode }}
</a>
{% endif %}
</span>
{% endif %}
{% endif %}
</p>
......
......@@ -6,6 +6,7 @@ urlpatterns = [
path('my', views.my_plan, name='timetable_my_plan'),
path('my/<int:year>/<int:month>/<int:day>/', views.my_plan, name='timetable_my_plan'),
path('quick/', views.quicklaunch, name='timetable_quicklaunch'),
# plan_type = ["teacher", "class", "room"]
path('<str:plan_type>/<int:plan_id>', views.plan, name='timetable_plan'),
path('<str:plan_type>/<int:plan_id>/<str:smart>', views.plan, name='timetable_smart_plan'),
path('<str:plan_type>/<int:plan_id>/<str:smart>/<int:year>/<int:calendar_week>', views.plan,
......
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