Merge branch 'master' into 90-change-weekselect-js-to-js-template-strings

.gitignore

@@ -53,3 +53,6 @@ db.sqlite3
 
 # Sphinx
 docs/_build/
+
+# Test
+.tox/

aleksis/apps/chronos/locale/de_DE/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-05-04 15:42+0200\n"
-"PO-Revision-Date: 2020-05-04 14:31+0000\n"
+"PO-Revision-Date: 2020-07-26 14:09+0000\n"
 "Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
 "Language-Team: German <https://translate.edugit.org/projects/aleksis/"
 "aleksis-app-chronos/de/>\n"
@@ -81,7 +81,7 @@ msgstr "Kurzname"
 
 #: models.py:150 models.py:166 models.py:532 models.py:547
 msgid "Long name"
-msgstr "Langer Name"
+msgstr "Langname"
 
 #: models.py:152
 msgid "Foreground colour"

aleksis/apps/chronos/managers.py

@@ -169,9 +169,9 @@ class LessonDataQuerySet(models.QuerySet, WeekQuerySetMixin):
         """Filter for all lessons within a calendar week."""
         return self.within_dates(
             wanted_week[0]
-            + timedelta(days=1) * (F(self._period_path + "period__weekday") - 1),
+            + timedelta(days=1) * (F(self._period_path + "period__weekday")),
             wanted_week[0]
-            + timedelta(days=1) * (F(self._period_path + "period__weekday") - 1),
+            + timedelta(days=1) * (F(self._period_path + "period__weekday")),
         ).annotate_week(wanted_week)
 
     def on_day(self, day: date):
@@ -203,9 +203,6 @@ class LessonDataQuerySet(models.QuerySet, WeekQuerySetMixin):
         """Filter for all lessons a participant (student) attends."""
         return self.filter(
             Q(**{self._period_path + "lesson__groups__members": person})
-            | Q(
-                **{self._period_path + "lesson__groups__parent_groups__members": person}
-            )
         )
 
     def filter_group(self, group: Union[Group, int]):
@@ -268,7 +265,7 @@ class LessonDataQuerySet(models.QuerySet, WeekQuerySetMixin):
         elif type_ == TimetableType.GROUP:
             # Student
 
-            return self.filter(lesson__groups__members=person)
+            return self.filter_participant(person)
 
         else:
             # If no student or teacher

aleksis/apps/chronos/migrations/0003_school_term_validity_fixes.py

 # Generated by Django 3.0.7 on 2020-06-30 10:46
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('chronos', '0002_school_term_validity'),
+        ("chronos", "0002_school_term_validity"),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='break',
-            name='school_term',
-        ),
+        migrations.RemoveField(model_name="break", name="school_term",),
         migrations.AddField(
-            model_name='break',
-            name='validity',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.ValidityRange', verbose_name='Linked validity range'),
+            model_name="break",
+            name="validity",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="+",
+                to="chronos.ValidityRange",
+                verbose_name="Linked validity range",
+            ),
         ),
         migrations.AlterUniqueTogether(
-            name='timeperiod',
-            unique_together={('weekday', 'period', 'validity')},
+            name="timeperiod", unique_together={("weekday", "period", "validity")},
         ),
     ]

aleksis/apps/chronos/preferences.py

@@ -3,10 +3,7 @@ from django.utils.translation import gettext as _
 from dynamic_preferences.preferences import Section
 from dynamic_preferences.types import BooleanPreference, IntegerPreference
 
-from aleksis.core.registries import (
-    person_preferences_registry,
-    site_preferences_registry,
-)
+from aleksis.core.registries import person_preferences_registry, site_preferences_registry
 
 chronos = Section("chronos", verbose_name=_("Chronos"))
 

aleksis/apps/chronos/templates/chronos/timetable.html

@@ -87,9 +87,11 @@
               <span class="card-title">
                 {{ weekday.name }}
               </span>
-              {{ weekday.date }}
-              {% if weekday.holiday %}
-                <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
+              {% if smart %}
+                {{ weekday.date }}
+                {% if weekday.holiday %}
+                  <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
+                {% endif %}
               {% endif %}
             </div>
           </div>
@@ -104,9 +106,11 @@
               <span class="card-title">
                 {{ weekday.name }}
               </span>
-              {{ weekday.date }}
-              {% if weekday.holiday %}
-                <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
+              {% if smart %}
+                {{ weekday.date }}
+                {% if weekday.holiday %}
+                  <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
+                {% endif %}
               {% endif %}
             </div>
           </div>
@@ -145,10 +149,12 @@
           <span class="card-title">
             {{ weekday.name }}
           </span>
-          {{ weekday.date }}
-          {% if weekday.holiday %}
-            <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
-          {% endif %}
+          {% if smart %}
+                {{ weekday.date }}
+                {% if weekday.holiday %}
+                  <br/>{% include "chronos/partials/holiday.html" with holiday=weekday.holiday %}
+                {% endif %}
+              {% endif %}
         </div>
       </div>
       {% for row in timetable %}

aleksis/apps/chronos/templatetags/week_helpers.py

@@ -4,11 +4,7 @@ from typing import Optional, Union
 from django import template
 from django.db.models.query import QuerySet
 
-from aleksis.apps.chronos.util.date import (
-    CalendarWeek,
-    week_period_to_date,
-    week_weekday_to_date,
-)
+from aleksis.apps.chronos.util.date import CalendarWeek, week_period_to_date, week_weekday_to_date
 
 register = template.Library()