Skip to content
Snippets Groups Projects
Verified Commit 4610498b authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Drop usage of weekday_to_date as it doesn't work with events out of the box

parent 34a4f392
No related branches found
No related tags found
1 merge request!226Resolve "TypeError at /app/alsijil/week/ – '<' not supported between instances of 'str' and 'int'"
Pipeline #28350 passed with warnings
......@@ -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
----------------------
......
......@@ -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>
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment