Merge branch 'master' into 58-migrate-to-materialize-css

aleksis/apps/alsijil/model_extensions.py

 from datetime import date
+from calendarweek import CalendarWeek
 
 from django.db.models import Exists, F, OuterRef
 
 from aleksis.apps.chronos.models import LessonPeriod
-from aleksis.apps.chronos.util import CalendarWeek
 from aleksis.core.models import Group, Person
 
 from .models import PersonalNote

aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html

@@ -5,15 +5,11 @@
 {% block page_title %}{% blocktrans %}Manage personal note filter{% endblocktrans %}{% endblock %}
 
 {% block content %}
-<div class="d-flex justify-content-between">
-    <div class="btn-group" role="group" aria-label="Filter actions">
-      {% if personal_note_filter %}
-        <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="btn btn-danger">
-          <i class="material-icons">trash</i>
-        </a>
-      {% endif %}
-    </div>
-  </div>
+  {% if personal_note_filter %}
+    <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="waves-effect waves-dark btn red">
+      <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblocktrans %}
+    </a>
+  {% endif %}
 
   <form method="post">
     {% csrf_token %}

aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html

@@ -7,8 +7,8 @@
 {% block page_title %}{% blocktrans %}List of all personal note filters{% endblocktrans %}{% endblock %}
 
 {% block content %}
-  <a href="{% url 'create_personal_note_filter' %}" class="waves-effect waves-dark btn">
-    <i class="material-icons">add</i>
+  <a href="{% url 'create_personal_note_filter' %}" class="waves-effect waves-dark green btn">
+    <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblock %}
   </a>
 
   {% render_table personal_note_filters_table %}

aleksis/apps/alsijil/views.py

+from calendarweek import CalendarWeek
 from datetime import date, datetime, timedelta
 from typing import Optional
 
@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _
 from django_tables2 import RequestConfig
 
 from aleksis.apps.chronos.models import LessonPeriod
-from aleksis.apps.chronos.util import CalendarWeek
 from aleksis.core.decorators import admin_required
 from aleksis.core.models import Group, Person, School
 from aleksis.core.util import messages