Merge branch...

Merge branch '184-typeerror-at-app-alsijil-week-not-supported-between-instances-of-str-and-int' into 'master'

Resolve "TypeError at /app/alsijil/week/ – '<' not supported between instances of 'str' and 'int'"

Closes #184

See merge request !226

CHANGELOG.rst

@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+Unreleased
+----------
+
+Fixed
+~~~~~
+
+* Fix problems with displaying dates for events in the week and lesson view.
+
 `2.0rc5`_ - 2021-08-12
 ----------------------
 

aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html

@@ -179,12 +179,11 @@
           {% with absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses extra_marks=prev_lesson.get_extra_marks %}
             {% has_perm "alsijil.view_lessondocumentation_rule" user prev_lesson as can_view_prev_lesson_documentation %}
             {% if prev_doc and can_view_prev_lesson_documentation %}
-              {% weekday_to_date prev_lesson.week prev_lesson.period.weekday as prev_date %}
               <div class="col s12" id="previous-lesson">
                 <div class="card">
                   <div class="card-content">
                     <span class="card-title">
-                      {% blocktrans %}Overview: Previous lesson{% endblocktrans %} ({{ prev_date }},
+                      {% blocktrans %}Overview: Previous lesson{% endblocktrans %} ({{ prev_doc.date_formatted }},
                       {% blocktrans with period=prev_lesson.period.period %}{{ period }}. period{% endblocktrans %})
                     </span>
 

aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html

@@ -353,10 +353,9 @@
               {% for note in person.personal_notes %}
                 <blockquote>
                   {{ note.remarks }}
-                  {% weekday_to_date week note.register_object.period.weekday as note_date %}
                   <em class="right">
                     <a href="{{ note.register_object.alsijil_url }}">
-                      {{ note.date }}, {{ note.register_object.get_subject.name }}
+                      {{ note.date_formatted }}, {{ note.register_object.get_subject.name }}
                     </a>
                   </em>
                 </blockquote>