Merge branch 'prepare-release-2.0rc6' into 'release/2.0'

Prepare release 2.0rc6

See merge request !228

CHANGELOG.rst

@@ -6,6 +6,20 @@ 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`_.
 
+`2.0rc6`_ - 2021-08-25
+----------------------
+
+Changed
+~~~~~~~
+
+* Translations for German have been updated. 
+
+Fixed
+~~~~~
+
+* Fix problems with displaying dates for events in the week and lesson view.
+* Unique constraint on lesson documentations and personal notes did not work and caused racey duplicates.
+
 `2.0rc5`_ - 2021-08-12
 ----------------------
 
@@ -181,3 +195,4 @@ Fixed
 .. _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
+.. _2.0rc6: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/2.0rc6

aleksis/apps/alsijil/migrations/0014_fix_unique_lesson_documentation.py

+# Generated by Django 3.2.3 on 2021-08-20 12:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('alsijil', '0013_fix_uniqueness_per_site'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='lessondocumentation',
+            name='unique_documentation_per_object',
+        ),
+        migrations.AddConstraint(
+            model_name='lessondocumentation',
+            constraint=models.UniqueConstraint(fields=('week', 'year', 'lesson_period'), name='unique_documentation_per_lp'),
+        ),
+        migrations.AddConstraint(
+            model_name='lessondocumentation',
+            constraint=models.UniqueConstraint(fields=('week', 'year', 'event'), name='unique_documentation_per_ev'),
+        ),
+        migrations.AddConstraint(
+            model_name='lessondocumentation',
+            constraint=models.UniqueConstraint(fields=('week', 'year', 'extra_lesson'), name='unique_documentation_per_el'),
+        ),
+    ]

aleksis/apps/alsijil/migrations/0015_fix_unique_personal_note.py

+# Generated by Django 3.2.4 on 2021-08-29 13:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('alsijil', '0014_fix_unique_lesson_documentation'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='personalnote',
+            name='unique_personal_note_per_object',
+        ),
+        migrations.AddConstraint(
+            model_name='personalnote',
+            constraint=models.UniqueConstraint(fields=('week', 'year', 'lesson_period', 'person'), name='unique_note_per_lp'),
+        ),
+        migrations.AddConstraint(
+            model_name='personalnote',
+            constraint=models.UniqueConstraint(fields=('week', 'year', 'event', 'person'), name='unique_note_per_ev'),
+        ),
+        migrations.AddConstraint(
+            model_name='personalnote',
+            constraint=models.UniqueConstraint(fields=('week', 'year', 'extra_lesson', 'person'), name='unique_note_per_el'),
+        ),
+    ]

aleksis/apps/alsijil/models.py

@@ -283,8 +283,13 @@ class PersonalNote(RegisterObjectRelatedMixin, ExtensibleModel):
                 check=lesson_related_constraint_q, name="one_relation_only_personal_note"
             ),
             models.UniqueConstraint(
-                fields=("lesson_period", "week", "year", "event", "extra_lesson"),
-                name="unique_personal_note_per_object",
+                fields=("week", "year", "lesson_period", "person"), name="unique_note_per_lp",
+            ),
+            models.UniqueConstraint(
+                fields=("week", "year", "event", "person"), name="unique_note_per_ev",
+            ),
+            models.UniqueConstraint(
+                fields=("week", "year", "extra_lesson", "person"), name="unique_note_per_el",
             ),
         ]
 
@@ -373,8 +378,13 @@ class LessonDocumentation(RegisterObjectRelatedMixin, ExtensibleModel):
                 check=lesson_related_constraint_q, name="one_relation_only_lesson_documentation",
             ),
             models.UniqueConstraint(
-                fields=("lesson_period", "week", "year", "event", "extra_lesson"),
-                name="unique_documentation_per_object",
+                fields=("week", "year", "lesson_period"), name="unique_documentation_per_lp",
+            ),
+            models.UniqueConstraint(
+                fields=("week", "year", "event"), name="unique_documentation_per_ev",
+            ),
+            models.UniqueConstraint(
+                fields=("week", "year", "extra_lesson"), name="unique_documentation_per_el",
             ),
         ]
 

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>

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Alsijil"
-version = "2.0rc5"
+version = "2.0rc6"
 packages = [
     { include = "aleksis" }
 ]