Compare revisions

Jonathan Weth · Nik | Klampfradler · Jonathan Weth · Nik | Klampfradler · Jonathan Weth · Jonathan Weth
--- a/aleksis/apps/alsijil/migrations/0001_initial.py
+++ b/aleksis/apps/alsijil/migrations/0001_initial.py
 # Generated by Django 3.0.6 on 2020-05-29 10:29

-import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
 import django.db.models.deletion
 from django.db import migrations, models
@@ -33,7 +32,7 @@ class Migration(migrations.Migration):
                ),
                (
                    "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                        default=dict, editable=False
                    ),
                ),
@@ -92,7 +91,7 @@ class Migration(migrations.Migration):
                ),
                (
                    "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                        default=dict, editable=False
                    ),
                ),
@@ -140,7 +139,7 @@ class Migration(migrations.Migration):
                ],
                "unique_together": {("lesson_period", "week", "person")},
            },
-            managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+            managers=[],
        ),
        migrations.CreateModel(
            name="LessonDocumentation",
@@ -156,7 +155,7 @@ class Migration(migrations.Migration):
                ),
                (
                    "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                        default=dict, editable=False
                    ),
                ),
@@ -202,6 +201,6 @@ class Migration(migrations.Migration):
                ],
                "unique_together": {("lesson_period", "week")},
            },
-            managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+            managers=[],
        ),
    ]
--- a/aleksis/apps/alsijil/migrations/0002_excuse_type.py
+++ b/aleksis/apps/alsijil/migrations/0002_excuse_type.py
 # Generated by Django 3.0.8 on 2020-07-10 10:46

-import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
 import django.db.models.deletion
 from django.db import migrations, models
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
                ),
                (
                    "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                        default=dict, editable=False
                    ),
                ),

--- a/aleksis/apps/alsijil/migrations/0003_extra_mark.py
+++ b/aleksis/apps/alsijil/migrations/0003_extra_mark.py
 # Generated by Django 3.0.8 on 2020-07-12 12:43

-import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
 import django.db.models.deletion
 from django.db import migrations, models
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
                ),
                (
                    "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                        default=dict, editable=False
                    ),
                ),

--- a/aleksis/apps/alsijil/migrations/0008_global_permissions.py
+++ b/aleksis/apps/alsijil/migrations/0008_global_permissions.py
@@ -18,7 +18,6 @@ class Migration(migrations.Migration):
                ('extended_data', models.JSONField(default=dict, editable=False)),
            ],
            options={
-                "default_permissions": (),
                'permissions': (('view_week', 'Can view week overview'), ('register_absence', 'Can register absence'), ('list_personal_note_filters', 'Can list all personal note filters')),
                'managed': False,
            },

--- a/aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py
+++ b/aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py
@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
        migrations.AlterField(
            model_name='lessondocumentation',
            name='year',
-            field=models.IntegerField(blank=True, default=aleksis.apps.chronos.util.date.get_current_year, null=True, verbose_name='Year'),
+            field=models.IntegerField(blank=True, null=True, verbose_name='Year'),
        ),
        migrations.AlterField(
            model_name='personalnote',
@@ -70,7 +70,7 @@ class Migration(migrations.Migration):
        migrations.AlterField(
            model_name='personalnote',
            name='year',
-            field=models.IntegerField(blank=True, default=aleksis.apps.chronos.util.date.get_current_year, null=True, verbose_name='Year'),
+            field=models.IntegerField(blank=True, null=True, verbose_name='Year'),
        ),
        migrations.AlterUniqueTogether(
            name='lessondocumentation',

--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -14,8 +14,8 @@
    <div class="row no-margin">
      <div class="col s12 no-padding">
        {# Back to week view #}
-        {% if lesson_documentation %}
-          <a href="{% url "week_view_by_week" lesson_documentation.calendar_week.year lesson_documentation.calendar_week.week "group" register_object.get_groups.all.0.pk %}"
+        {% if back_to_week_url %}
+          <a href="{{ back_to_week_url }}"
             class="btn primary-color waves-light waves-effect alsijil-top-button">
            <i class="material-icons left">chevron_left</i> {% trans "Back to week view" %}
          </a>

--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
@@ -120,7 +120,7 @@
                          </td>
                          <td class="tr-link">
                            <a class="tr-link"
-                               href="{{ register_object.alsijil_url }}">
+                               href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                              {% if register_object.period %}
                                {{ register_object.period.period }}.
                              {% else %}
@@ -131,7 +131,7 @@
                          {% if not group %}
                            <td>
                              <a class="tr-link"
-                                 href="{{ register_object.alsijil_url }}">
+                                 href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                                {% if register_object.lesson %}
                                  {{ register_object.lesson.group_names }}
                                {% else %}
@@ -142,7 +142,7 @@
                          {% endif %}
                          <td>
                            <a class="tr-link"
-                               href="{{ register_object.alsijil_url }}">
+                               href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                              {% if register_object.get_subject %}
                                {{ register_object.get_subject.name }}
                              {% elif register_object.subject %}
@@ -154,25 +154,25 @@
                          </td>
                          <td>
                            <a class="tr-link"
-                               href="{{ register_object.alsijil_url }}">
+                               href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                                {{ register_object.teacher_names }}
                            </a>
                          </td>
                          <td>
                            <a class="tr-link"
-                               href="{{ register_object.alsijil_url }}">
+                               href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                              {% firstof register_object.get_lesson_documentation.topic "–" %}
                            </a>
                          </td>
                          <td>
                            <a class="tr-link"
-                               href="{{ register_object.alsijil_url }}">
+                               href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                              {% firstof register_object.get_lesson_documentation.homework "–" %}
                            </a>
                          </td>
                          <td>
                            <a class="tr-link"
-                               href="{{ register_object.alsijil_url }}">
+                               href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                              {% firstof register_object.get_lesson_documentation.group_note "–" %}
                            </a>
                          </td>
@@ -195,7 +195,7 @@
                        {% has_perm "alsijil.view_lessondocumentation" user register_object as can_view_lesson_documentation %}
                        {% if can_view_lesson_documentation %}
                          <a class="collection-item avatar"
-                             href="{{ register_object.alsijil_url }}">
+                             href="{{ register_object.alsijil_url }}?back={{ back_url }}">
                            {% include "alsijil/partials/lesson_status_icon.html" with register_object=register_object css_class="materialize-circle" color_suffix=" " %}
                            <table class="hide-on-med-and-down">
                              <tr>
@@ -278,7 +278,7 @@
                                  </li>
                                {% endif %}
                                <li class="collection-item">
-                                    {{ register_object.teacher_names }}
+                                  {{ register_object.teacher_names }}
                                </li>
                                <li class="collection-item">
                                  {{ register_object.get_lesson_documentation.topic }}

--- a/aleksis/apps/alsijil/util/alsijil_helpers.py
+++ b/aleksis/apps/alsijil/util/alsijil_helpers.py
@@ -168,8 +168,9 @@ def _generate_dicts_for_lesson_periods(
    """Generate a list of dicts for use with ``RegisterObjectTable``."""
    if not holiday_days:
        holiday_days = []
-    date_start = lesson_periods.first().lesson.validity.date_start
-    date_end = lesson_periods.last().lesson.validity.date_end
+    lesson_periods = list(lesson_periods)
+    date_start = lesson_periods[0].lesson.validity.date_start
+    date_end = lesson_periods[-1].lesson.validity.date_end
    if (
        filter_dict["filter_date"]
        and filter_dict.get("date_start") > date_start
@@ -288,6 +289,7 @@ def _generate_dicts_for_events_and_extra_lessons(
            period = f"{register_object.period.period}."
            period_sort = register_object.period.period
        else:
+            register_object.annotate_day(register_object.date_end)
            day = (
                f"{date_format(register_object.date_start)}"
                f"–{date_format(register_object.date_end)}"

--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -12,6 +12,7 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
+from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.translation import ugettext as _
 from django.views import View
 from django.views.decorators.cache import never_cache
@@ -274,6 +275,22 @@ def register_object(
                    None, queryset=persons_qs, prefix="personal_notes"
                )

+        back_url = request.GET.get("back", "")
+        back_url_is_safe = url_has_allowed_host_and_scheme(
+            url=back_url, allowed_hosts={request.get_host()}, require_https=request.is_secure(),
+        )
+        if back_url_is_safe:
+            context["back_to_week_url"] = back_url
+        else:
+            context["back_to_week_url"] = reverse(
+                "week_view_by_week",
+                args=[
+                    lesson_documentation.calendar_week.year,
+                    lesson_documentation.calendar_week.week,
+                    "group",
+                    register_object.get_groups().all()[0].pk,
+                ],
+            )
        context["lesson_documentation"] = lesson_documentation
        context["lesson_documentation_form"] = lesson_documentation_form
        context["personal_note_formset"] = personal_note_formset

--- a/poetry.lock
+++ b/poetry.lock
No results found