Merge remote-tracking branch 'origin/master'

aleksis/apps/chronos/settings.py

 from django.utils.translation import gettext_lazy as _
 
 CONSTANCE_CONFIG = {
+    "CHRONOS_USE_PARENT_GROUPS": (
+        False,
+        _(
+            "If an lesson or substitution has only one group"
+            " and this group has parent groups,"
+            " show the parent groups instead of the original group."
+        ),
+    ),
+    "CHRONOS_SHORTEN_GROUPS": (
+        False,
+        _(
+            "If there are more groups than the limit set in CHRONOS_SHORTEN_GROUPS_LIMIT, add text collapsible."
+        ),
+    ),
+    "CHRONOS_SHORTEN_GROUPS_LIMIT": (
+        4,
+        _(
+            "If there are more groups than this limit and CHRONOS_SHORTEN_GROUPS is enabled, add text collapsible."
+        ),
+    ),
     "CHRONOS_SUBSTITUTIONS_PRINT_DAY_NUMBER": (
         2,
         _("Number of days shown on substitutions print view"),
@@ -12,6 +32,9 @@ CONSTANCE_CONFIG = {
 }
 CONSTANCE_CONFIG_FIELDSETS = {
     "Chronos settings": (
+        "CHRONOS_USE_PARENT_GROUPS",
+        "CHRONOS_SHORTEN_GROUPS",
+        "CHRONOS_SHORTEN_GROUPS_LIMIT",
         "CHRONOS_SUBSTITUTIONS_PRINT_DAY_NUMBER",
         "CHRONOS_SUBSTITUTIONS_SHOW_HEADER_BOX",
     ),

aleksis/apps/chronos/static/css/chronos/timetable.css

@@ -35,7 +35,7 @@ li.active > a > .sidenav-badge {
     flex-direction: column;
 }
 
-.lesson-card .card-content div {
+.lesson-card .card-content > div {
     padding: 3px;
     flex: auto;
     width: 100%;

aleksis/apps/chronos/templates/chronos/partials/group.html

+<a href="{% url "timetable" "group" item.pk %}">
+  {{ item.short_name }}{% if not forloop.last %},{% endif %}
+</a>

aleksis/apps/chronos/templates/chronos/partials/groups.html

-{% for group in groups %}
-  <a href="{% url "timetable" "group" group.pk %}">
-    {{ group.short_name }}{% if not forloop.last %},{% endif %}
-  </a>
-{% endfor %}
+{% if groups.count == 1 and groups.0.parent_groups.all and config.CHRONOS_USE_PARENT_GROUPS %}
+  {% include "chronos/partials/groups_part.html" with groups=groups.0.parent_groups.all %}
+{% else %}
+  {% include "chronos/partials/groups_part.html" with groups=groups %}
+{% endif %}

aleksis/apps/chronos/templates/chronos/partials/groups_part.html

+{% if groups.count > config.CHRONOS_SHORTEN_GROUPS_LIMIT and config.CHRONOS_SHORTEN_GROUPS %}
+  {% include "components/text_collapsible.html" with template="chronos/partials/group.html" qs=groups %}
+{% else %}
+  {% for group in groups %}
+    {% include "chronos/partials/group.html" with item=group %}
+  {% endfor %}
+{% endif %}