Merge branch 'master' into 179-lesson-documentations-are-not-unique-ticket-75177

CHANGELOG.rst

@@ -12,6 +12,14 @@ Unreleased
 Fixed
 ~~~~~
 
+* Fix problems with displaying dates for events in the week and lesson view.
+
+`2.0rc5`_ - 2021-08-12
+----------------------
+
+Fixed
+~~~~~
+
 * The _Delete personal note_ action didn't work due to wrong usage of ``bulk_update``.
 * Groups and persons were shown multiple times in some forms due to filtering by permissions.
 * Unique constraint on lesson documentations did not work and caused racey duplicates.
@@ -181,3 +189,4 @@ Fixed
 .. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc2
 .. _2.0rc3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc3
 .. _2.0rc4: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc4
+.. _2.0rc5: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc5

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>