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

Revert "Add lesson list view. Advances #11, #12."

This reverts commit e5980467.
parent 1abaf28e
No related branches found
No related tags found
No related merge requests found
...@@ -12,11 +12,6 @@ MENUS = { ...@@ -12,11 +12,6 @@ MENUS = {
'name': _('Timetable'), 'name': _('Timetable'),
'url': 'timetable', 'url': 'timetable',
'validators': ['menu_generator.validators.is_authenticated'] 'validators': ['menu_generator.validators.is_authenticated']
},
{
'name': _('List of lessons'),
'url': 'lessons_list',
'validators': ['menu_generator.validators.is_authenticated']
} }
] ]
} }
......
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load bootstrap4 font_awesome i18n week_helpers %}
{% block page_title %}
{% blocktrans %}List of lessons{% endblocktrans %},
{{ week|week_start }} - {{ week|week_end }}
{% endblock %}
{% block content %}
<form method="get">
{% csrf_token %}
<ul id="timetable_select_form">
{{ select_form.as_ul }}
</ul>
<input type="submit" value="Select" />
</form>
{% for weekday, lesson_periods_day in lesson_periods %}
<h3>{{ weekday }}</h3>
<table class="table table-striped table-bordered table-hover table-responsive-xl">
<thead>
<tr>
<th>{% blocktrans %}Period{% endblocktrans %}</th>
<th>{% blocktrans %}Groups{% endblocktans %}</th>
<th>{% blocktrans %}Subject{% endblocktrans %}</th>
<th>{% blocktrans %}Teachers{% endblocktrans %}</th>
</tr>
</thead>
<tbody>
{% for period in lesson_periods_day %}
<tr>
<td>{{ period.period.period }}</td>
<td>{{ period.lesson.subject.name }}</td>
<td>{{ period.lesson.groups|join:', ' }}</td>
<td>{{ period.lesson.teachers|join:', ' }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endfor %}
{% endblock %}
...@@ -5,5 +5,4 @@ from . import views ...@@ -5,5 +5,4 @@ from . import views
urlpatterns = [ urlpatterns = [
path('timetable', views.timetable, name='timetable'), path('timetable', views.timetable, name='timetable'),
path('lessons', views.timetable, {'template': 'lessons_list'}, name='lessons_list'),
] ]
...@@ -16,7 +16,7 @@ from .util import current_week ...@@ -16,7 +16,7 @@ from .util import current_week
@login_required @login_required
def timetable(request: HttpRequest, template: str = 'tt_week') -> HttpResponse: def timetable(request: HttpRequest) -> HttpResponse:
context = {} context = {}
lesson_periods = LessonPeriod.objects.all() lesson_periods = LessonPeriod.objects.all()
...@@ -32,7 +32,7 @@ def timetable(request: HttpRequest, template: str = 'tt_week') -> HttpResponse: ...@@ -32,7 +32,7 @@ def timetable(request: HttpRequest, template: str = 'tt_week') -> HttpResponse:
if 'room' in request.GET and request.GET['room']: if 'room' in request.GET and request.GET['room']:
lesson_periods = lesson_periods.filter( lesson_periods = lesson_periods.filter(
room__pk=int(request.GET['room'])) room__pk=int(request.GET['room']))
elif template == 'tt_week': else:
# Redirect to a selected view if no filter provided # Redirect to a selected view if no filter provided
if request.user.person: if request.user.person:
if request.user.person.primary_group: if request.user.person.primary_group:
...@@ -77,4 +77,4 @@ def timetable(request: HttpRequest, template: str = 'tt_week') -> HttpResponse: ...@@ -77,4 +77,4 @@ def timetable(request: HttpRequest, template: str = 'tt_week') -> HttpResponse:
context['current_week'] = current_week() context['current_week'] = current_week()
context['select_form'] = select_form context['select_form'] = select_form
return render(request, 'chronos/%s.html' % template, context) 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