Skip to content
Snippets Groups Projects
Unverified Commit 7444fc58 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Add times and periods as first column.

parent 0a87e9f0
No related branches found
No related tags found
1 merge request!1Add templates for timetable. Advances #1.
......@@ -24,6 +24,14 @@ class TimePeriod(models.Model):
def __str__(self):
return '%s, %d. period (%s - %s)' % (self.weekday, self.period, self.time_start, self.time_end)
@classmethod
def get_times_dict(cls):
periods = {}
for period in cls.objects.all():
periods[period.period] = (period.time_start, period.time_end)
return periods
class Subject(models.Model):
abbrev = models.CharField(verbose_name=_(
......
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load bootstrap4 %}
{% load bootstrap4 i18n %}
{% block page_title %}Timetable{% endblock %}
......@@ -9,6 +9,42 @@
{{ filter_descs }}
</p>
<div class="float-left">
<ul class="list-group">
<li class="list-group-item active">
{% blocktrans %}Times{% endblocktrans %}
</li>
</ul>
<div class="container">
{% for num, times in periods.items %}
<div class="row">
<div class="col-sm">
<div class="card" style="width: 18rem; {% if lesson.colour_fg %} color: {{ lesson.colour_fg }}; {% endif %} {% if lesson.colour_bg %} background-color: {{ lesson.colour_bg }}; {% endif %}">
<div class="card-body">
<div class="row">
<div class="col-sm">
<span class="card-title">{{ num }}.</span>
</div>
</div>
<div class="row">
<div class="col-sm">
<span class="card-text">{{ times.0}}</span>
</div>
<div class="col-sm">
<span class="card-text">-</span>
</div>
<div class="col-sm">
<span class="card-text">{{ times.1 }}</span>
</div>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
{% for weekday, lesson_periods_day in lesson_periods.items %}
{% include "chronos/tt_day.html" with lesson_periods=lesson_periods_day %}
{% endfor %}
......
......@@ -8,7 +8,7 @@ from biscuit.apps.cambro.models import Room
from biscuit.core.decorators import admin_required
from biscuit.core.models import Group, Person
from .models import LessonPeriod
from .models import LessonPeriod, TimePeriod
@login_required
......@@ -42,5 +42,6 @@ def timetable(request):
context['lesson_periods'] = OrderedDict(sorted(per_day.items()))
context['filter_descs'] = ', '.join(filter_descs)
context['periods'] = TimePeriod.get_times_dict()
return render(request, 'chronos/tt_week.html', context)
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