Drop form and field extensions

aleksis/apps/chronos/form_extensions.py

-from django.utils.translation import gettext as _
-
-from material import Fieldset
-
-from aleksis.core.forms import AnnouncementForm, EditGroupForm
-
-AnnouncementForm.add_node_to_layout(Fieldset(_("Options for timetables"), "show_in_timetables"))
-EditGroupForm.add_node_to_layout(Fieldset(_("Optional data for timetables"), "subject_id"))

aleksis/apps/chronos/model_extensions.py

@@ -4,14 +4,13 @@ from typing import Optional, Union
 from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
 
-from jsonstore import BooleanField
 from reversion.models import Revision
 
 from aleksis.core.models import Announcement, Group, Person
 from aleksis.core.util.core_helpers import get_site_preferences
 
 from .managers import TimetableType
-from .models import Lesson, LessonPeriod, Subject
+from .models import Lesson, LessonPeriod
 from .util.change_tracker import timetable_data_changed
 from .util.notifications import send_notifications_for_object
 
@@ -134,15 +133,10 @@ def previous_lesson(self, lesson_period: "LessonPeriod", day: date) -> Union["Le
 
 def for_timetables(cls):
     """Return all announcements that should be shown in timetable views."""
-    return cls.objects.filter(show_in_timetables=True)
+    return cls.objects.all()
 
 
 Announcement.class_method(for_timetables)
-Announcement.field(
-    show_in_timetables=BooleanField(verbose_name=_("Show announcement in timetable views?"))
-)
-
-Group.foreign_key("subject", Subject, related_name="groups")
 
 # Dynamically add extra permissions to Group and Person models in core
 # Note: requires migrate afterwards

aleksis/apps/chronos/util/chronos_helpers.py

@@ -200,9 +200,7 @@ def get_substitutions_context_data(
         subs = build_substitutions_list(day)
         day_contexts[day]["substitutions"] = subs
 
-        day_contexts[day]["announcements"] = (
-            Announcement.for_timetables().on_date(day).filter(show_in_timetables=True)
-        )
+        day_contexts[day]["announcements"] = Announcement.for_timetables().on_date(day)
 
         if show_header_box:
             subs = LessonSubstitution.objects.on_day(day).order_by(