From 75facb7a4b5e12117b34bae62c4b1fad2006823c Mon Sep 17 00:00:00 2001 From: Dominik George <dominik.george@teckids.org> Date: Wed, 17 Jul 2019 23:51:54 +0200 Subject: [PATCH] Implement room display. --- biscuit/apps/chronos/templates/chronos/tt_day.html | 2 +- biscuit/apps/chronos/templates/chronos/tt_lesson.html | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/biscuit/apps/chronos/templates/chronos/tt_day.html b/biscuit/apps/chronos/templates/chronos/tt_day.html index 3a3f4d65..4e37be64 100644 --- a/biscuit/apps/chronos/templates/chronos/tt_day.html +++ b/biscuit/apps/chronos/templates/chronos/tt_day.html @@ -8,7 +8,7 @@ {% for lesson_period in lesson_periods %} <div class="row"> <div class="col-sm"> - {% include "chronos/tt_lesson.html" with lesson=lesson_period.lesson %} + {% include "chronos/tt_lesson.html" with lesson_period=lesson_period %} </div> </div> {% endfor %} diff --git a/biscuit/apps/chronos/templates/chronos/tt_lesson.html b/biscuit/apps/chronos/templates/chronos/tt_lesson.html index 7d27b6e7..c4a21a59 100644 --- a/biscuit/apps/chronos/templates/chronos/tt_lesson.html +++ b/biscuit/apps/chronos/templates/chronos/tt_lesson.html @@ -2,23 +2,22 @@ <div class="card-body"> <div class="row"> <div class="col-sm"> - <span class="card-title">{{ lesson.subject.abbrev }}</span> + <span class="card-title">{{ lesson_period.lesson.subject.abbrev }}</span> </div> </div> <div class="row"> <div class="col-sm"> - {% for group in lesosn.groups %} + {% for group in lesson_period.lesosn.groups %} <span class="card-text">{{ group.short_name }}</span> {% endfor %} </div> <div class="col-sm"> - {% for teacher in lesosn.teachers %} + {% for teacher in lesson_period.lesosn.teachers %} <span class="card-text">{{ teacher.short_name }}</span> {% endfor %} </div> <div class="col-sm"> - {# FIXME really add room information #} - <span class="card-text">Room</span> + <span class="card-text">{{ lesson_period.room.short_name }}</span> </div> </div> </div> -- GitLab