Skip to content
Snippets Groups Projects
Commit 6a92a2ee authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 125-django-3-2-database-improvements

parents 05b034dd 577c6da3
No related branches found
No related tags found
1 merge request!150Resolve "Django 3.2 database improvements"
Pipeline #10297 failed
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 147 additions and 45 deletions
README.rst
+ 1
− 1
View file @ 6a92a2ee
......@@ -31,7 +31,7 @@ Licence
Copyright © 2019 Tom Teichler <tom.teichler@teckids.org>
Copyright © 2019 Hangzhi Yu <yuha@katharineum.de>
Licenced under the EUPL, version 1.2 or later
Licenced under the EUPL, version 1.2 or later, by Teckids e.V. (Bonn, Germany).
Please see the LICENCE.rst file accompanying this distribution for the
full licence text or on the `European Union Public Licence`_ website
......
aleksis/apps/chronos/__init__.py
+ 0
− 2
View file @ 6a92a2ee
......@@ -4,5 +4,3 @@ try:
__version__ = pkg_resources.get_distribution("AlekSIS-App-Chronos").version
except Exception:
__version__ = "unknown"
default_app_config = "aleksis.apps.chronos.apps.ChronosConfig"
aleksis/apps/chronos/migrations/0001_initial.py
+ 34
− 34
View file @ 6a92a2ee
......@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -56,7 +56,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -65,7 +65,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -87,7 +87,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -96,7 +96,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -126,7 +126,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -135,7 +135,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -165,7 +165,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -174,7 +174,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -202,7 +202,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -211,7 +211,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -258,7 +258,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -267,7 +267,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -312,7 +312,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -321,7 +321,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -400,7 +400,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -409,7 +409,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -465,7 +465,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -474,7 +474,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -507,7 +507,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -516,7 +516,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -676,7 +676,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -685,7 +685,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -717,7 +717,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -726,7 +726,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -808,7 +808,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -817,7 +817,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -878,7 +878,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -887,7 +887,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -995,7 +995,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -1004,7 +1004,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......@@ -1039,7 +1039,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -1048,7 +1048,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......
aleksis/apps/chronos/migrations/0002_school_term_validity.py
+ 2
− 2
View file @ 6a92a2ee
......@@ -53,7 +53,7 @@ class Migration(migrations.Migration):
fields=[
(
"id",
models.AutoField(
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
......@@ -62,7 +62,7 @@ class Migration(migrations.Migration):
),
(
"extended_data",
django.contrib.postgres.fields.jsonb.JSONField(
models.JSONField(
default=dict, editable=False
),
),
......
aleksis/apps/chronos/static/css/chronos/timetable_print.css 0 → 100644
+ 32
− 0
View file @ 6a92a2ee
.timetable-plan .row, .timetable-plan .col {
display: flex;
padding: 0rem;
}
.timetable-plan .row {
margin-bottom: 0rem;
}
.lesson-card, .timetable-title-card {
margin: 0;
display: flex;
flex-grow: 1;
min-height: 40px;
box-shadow: none;
border: 1px solid black;
margin-right: -1px;
margin-top: -1px;
border-radius: 0px;
font-size: 11px;
}
.lesson-card .card-content > div {
padding: 1px;
}
.card .card-title {
font-size: 18px;
}
.timetable-title-card .card-content {
padding: 7px;
}
aleksis/apps/chronos/templates/chronos/timetable.html
+ 1
− 2
View file @ 6a92a2ee
......@@ -35,9 +35,8 @@
</h5>
{% endif %}
</div>
{# Show print button only if not on mobile #}
<div class="col s4 m6 l4 xl3 right align-right no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right hide-on-small-and-down" id="print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right hide-on-small-and-down" href="{% url "timetable_print" type.value pk %}" id="print">
<i class="material-icons center">print</i>
</a>
</div>
......
aleksis/apps/chronos/templates/chronos/timetable_print.html 0 → 100644
+ 55
− 0
View file @ 6a92a2ee
{% extends 'core/base_print.html' %}
{% load data_helpers static i18n %}
{% block extra_head %}
<link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}">
<link rel="stylesheet" href="{% static 'css/chronos/timetable_print.css' %}">
{% endblock %}
{% block page_title %}
{% trans "Timetable" %} <i>{{ el.short_name }}</i>
{% endblock %}
{% block content %}
<div class="timetable-plan">
{# Week days #}
<div class="row">
<div class="col s2">
</div>
{% for weekday in weekdays_short %}
<div class="col s2">
<div class="card timetable-title-card">
<div class="card-content">
<span class="card-title">
{{ weekday.name }}
</span>
</div>
</div>
</div>
{% endfor %}
</div>
{% for row in timetable %}
<div class="row">
<div class="col s2">
{% if row.type == "period" %}
{% include "chronos/partials/period_time.html" with period=row.period periods=periods %}
{% endif %}
</div>
{% for col in row.cols %}
{# A lesson #}
<div class="col s2">
{% if row.type == "period" %}
{% include "chronos/partials/elements.html" with elements=col %}
{% else %}
{% include "chronos/partials/supervision.html" with supervision=col %}
{% endif %}
</div>
{% endfor %}
</div>
{% endfor %}
</div>
{% endblock %}
aleksis/apps/chronos/urls.py
+ 6
− 0
View file @ 6a92a2ee
......@@ -16,6 +16,12 @@ urlpatterns = [
views.timetable,
name="timetable_by_week",
),
path(
"timetable/<str:type_>/<int:pk>/print/",
views.timetable,
{"is_print": True},
name="timetable_print",
),
path(
"timetable/<str:type_>/<int:pk>/<str:regular>/", views.timetable, name="timetable_regular",
),
......
aleksis/apps/chronos/util/chronos_helpers.py
+ 2
− 0
View file @ 6a92a2ee
......@@ -17,6 +17,8 @@ def get_el_by_pk(
week: Optional[int] = None,
regular: Optional[str] = None,
prefetch: bool = False,
*args,
**kwargs,
):
if type_ == TimetableType.GROUP.value:
return get_object_or_404(
......
aleksis/apps/chronos/views.py
+ 14
− 4
View file @ 6a92a2ee
......@@ -15,6 +15,7 @@ from rules.contrib.views import permission_required
from aleksis.core.models import Announcement, Group, Person
from aleksis.core.util import messages
from aleksis.core.util.core_helpers import get_site_preferences, has_person
from aleksis.core.util.pdf import render_pdf
from .forms import LessonSubstitutionForm
from .managers import TimetableType
......@@ -124,12 +125,16 @@ def timetable(
year: Optional[int] = None,
week: Optional[int] = None,
regular: Optional[str] = None,
is_print: bool = False,
) -> HttpResponse:
"""View a selected timetable for a person, group or room."""
context = {}
is_smart = regular != "regular"
if is_print:
is_smart = False
el = get_el_by_pk(request, type_, pk, prefetch=True)
if type(el) == HttpResponseNotFound:
......@@ -185,7 +190,13 @@ def timetable(
"timetable_by_week", args=[type_.value, pk, week_next.year, week_next.week]
)
return render(request, "chronos/timetable.html", context)
if is_print:
context["back_url"] = reverse(
"timetable_by_week", args=[type_.value, pk, wanted_week.year, wanted_week.week],
)
return render_pdf(request, "chronos/timetable_print.html", context)
else:
return render(request, "chronos/timetable.html", context)
@permission_required("chronos.view_lessons_day")
......@@ -346,9 +357,8 @@ def substitutions(
wanted_day, "substitutions_by_date"
)
template_name = "chronos/substitutions.html"
return render(request, "chronos/substitutions.html", context)
else:
context["days"] = day_contexts
template_name = "chronos/substitutions_print.html"
return render(request, template_name, context)
return render_pdf(request, "chronos/substitutions_print.html", context)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment