Merge branch 'fix/school-term-valditiy-and-cropping' into 'master'

Implement school term and validity range, remove photo cropping

See merge request !62

aleksis/apps/alsijil/forms.py

@@ -47,9 +47,7 @@ class SelectForm(forms.Form):
     layout = Layout(Row("group", "teacher"))
 
     group = forms.ModelChoiceField(
-        queryset=Group.objects.annotate(lessons_count=Count("lessons")).filter(
-            lessons_count__gt=0
-        ),
+        queryset=None,
         label=_("Group"),
         required=False,
         widget=Select2Widget,
@@ -81,6 +79,12 @@ class SelectForm(forms.Form):
         data["instance"] = instance
         return data
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["group"].queryset = Group.objects.for_current_school_term_or_all().annotate(lessons_count=Count("lessons")).filter(
+            lessons_count__gt=0
+        )
+
 
 PersonalNoteFormSet = forms.modelformset_factory(
     PersonalNote, form=PersonalNoteForm, max_num=0, extra=0

aleksis/apps/alsijil/models.py

@@ -35,7 +35,7 @@ class PersonalNote(ExtensibleModel):
         verbose_name_plural = _("Personal notes")
         unique_together = [["lesson_period", "week", "person"]]
         ordering = [
-            "lesson_period__lesson__date_start",
+            "lesson_period__lesson__validity__date_start",
             "week",
             "lesson_period__period__weekday",
             "lesson_period__period__period",
@@ -63,7 +63,7 @@ class LessonDocumentation(ExtensibleModel):
         verbose_name_plural = _("Lesson documentations")
         unique_together = [["lesson_period", "week"]]
         ordering = [
-            "lesson_period__lesson__date_start",
+            "lesson_period__lesson__validity__date_start",
             "week",
             "lesson_period__period__weekday",
             "lesson_period__period__period",

aleksis/apps/alsijil/templates/alsijil/print/full_register.html

 {% extends "core/base_print.html" %}
 
-{% load static i18n cropping data_helpers week_helpers %}
+{% load static i18n data_helpers week_helpers %}
 
 {% block page_title %}
   {% trans "Class register:" %} {{ group.name }}
@@ -169,8 +169,7 @@
       <tr>
         <td rowspan="6" class="person-img">
           {% if person.photo %}
-            <img src="{% cropped_thumbnail person 'photo_cropping' max_size='300x400' %}"
-                 alt="{{ person.first_name }} {{ person.last_name }}"/>
+            <img src="{{ person.photo.url }}" alt="{{ person.first_name }} {{ person.last_name }}"/>
           {% else %}
             <img src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}"/>
           {% endif %}

aleksis/apps/alsijil/views.py

@@ -276,7 +276,7 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
         for week in weeks:
             day = week[lesson_period.period.weekday]
 
-            if lesson_period.lesson.date_start <= day <= lesson_period.lesson.date_end:
+            if lesson_period.lesson.validity.date_start <= day <= lesson_period.lesson.validity.date_end:
                 documentations = list(
                     filter(
                         lambda d: d.week == week.week,