diff --git a/requirements.txt b/requirements.txt index 95162f578fab706905d1cf1eb69c600d9ee99046..e760b444ea85230fa371ede00451160a5bbd353e 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 55ee00afe0e0c57fac5e0e62773131ec36a52309..1d146b35c7961c326f2b7de0bcf33ea6bdb552a5 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 a8f054df29d49f668cbae2601dc5ea00d80bb3a6..c4570e93275c28d095f2d33344e3a869f83bf5a7 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 1a8f979a2854425a642fe53b460ef7db7dd60d99..704099725ade72bee9057fd52bec6f6de3126cfd 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"),