From b6b37c90b2c1357b5ca95e5071b41df2d76a8648 Mon Sep 17 00:00:00 2001
From: Frank Poetzsch-Heffter <p-h@katharineum.de>
Date: Fri, 13 Dec 2019 16:15:01 +0100
Subject: [PATCH] dashboard cache length, look header Klassenlehrkraefte
---
requirements.txt | 2 +-
schoolapps/dashboard/migrations/0002_cache.py | 4 ++--
schoolapps/timetable/templates/timetable/plan.html | 8 +++-----
schoolapps/timetable/urls.py | 3 ++-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 95162f578..e760b444e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
requests
mysqlclient
-django
+django<3.0
django-auth-ldap
django-dbsettings
django-pdb
diff --git a/schoolapps/dashboard/migrations/0002_cache.py b/schoolapps/dashboard/migrations/0002_cache.py
index 55ee00afe..1d146b35c 100644
--- a/schoolapps/dashboard/migrations/0002_cache.py
+++ b/schoolapps/dashboard/migrations/0002_cache.py
@@ -13,8 +13,8 @@ class Migration(migrations.Migration):
name='Cache',
fields=[
('id',
- models.CharField(max_length=200, primary_key=True, serialize=False, unique=True, verbose_name='ID')),
- ('name', models.CharField(max_length=200, verbose_name='Name')),
+ models.CharField(max_length=150, primary_key=True, serialize=False, unique=True, verbose_name='ID')),
+ ('name', models.CharField(max_length=150, verbose_name='Name')),
('expiration_time', models.IntegerField(default=20, verbose_name='Ablaufzeit')),
],
options={
diff --git a/schoolapps/timetable/templates/timetable/plan.html b/schoolapps/timetable/templates/timetable/plan.html
index a8f054df2..c4570e932 100755
--- a/schoolapps/timetable/templates/timetable/plan.html
+++ b/schoolapps/timetable/templates/timetable/plan.html
@@ -46,16 +46,14 @@
{# Show class teacher and deputy class teacher #}
{% if type == 2 and el.teachers %}
- <h6>Klassenlehrkraft:
+ <h5>Klassenlehrkräfte:
<span data-position="bottom" class="tooltipped"
data-tooltip="{{ el.teachers.0 }}">
<a href="{% url "timetable_smart_plan" "teacher" el.teachers.0.id %}">
{{ el.teachers.0.shortcode }}
- </a>
+ </a>,
</span>
- {# {{ el.teachers.0.shortcode }}#}
{% if el.teachers.1 %}
- · Vertretung:
<span data-position="bottom" class="tooltipped"
data-tooltip="{{ el.teachers.1 }}">
<a href="{% url "timetable_smart_plan" "teacher" el.teachers.1.id %}">
@@ -63,7 +61,7 @@
</a>
</span>
{% endif %}
- </h6>
+ </h5>
{% endif %}
</div>
{# Show print button only if not on mobile #}
diff --git a/schoolapps/timetable/urls.py b/schoolapps/timetable/urls.py
index 1a8f979a2..704099725 100755
--- a/schoolapps/timetable/urls.py
+++ b/schoolapps/timetable/urls.py
@@ -27,8 +27,9 @@ try:
path('<str:plan_date>-aktuell.pdf', views.sub_pdf, name="timetable_substitutions_pdf_date")
]
-except (Terms.DoesNotExist, Schoolyear.DoesNotExist, ProgrammingError, OperationalError):
+except (Terms.DoesNotExist, Schoolyear.DoesNotExist, ProgrammingError, OperationalError) as e:
from . import fallback_view
+ print(e)
urlpatterns = [
path('hints', fallback_view.fallback, name="timetable_hints"),
--
GitLab