diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py index e4780a2917fc1a84711d0cce13d030229d3b56ea..b648b3f7b173224b6786f5ffef1aabad199837c8 100644 --- a/aleksis/apps/alsijil/models.py +++ b/aleksis/apps/alsijil/models.py @@ -106,21 +106,21 @@ class LessonDocumentation(ExtensibleModel): verbose_name=_("Group note"), max_length=200, blank=True ) - def _take_over_data(self): - """Take over data to the next lesson, if exists and data are not already set. + def _carry_over_data(self): + """Carry over data to the next lesson, if exists and data are not already set. - Can be deactivated using site preference ``alsijil__take_over_double``. + Can be deactivated using site preference ``alsijil__carry_over``. """ - if get_site_preferences()["alsijil__take_over_double"] and ( + if get_site_preferences()["alsijil__carry_over"] and ( self.topic or self.homework or self.group_note ): try: - second_lesson = LessonPeriod.objects.get( + second_period = LessonPeriod.objects.get( lesson=self.lesson_period.lesson, period__weekday=self.lesson_period.period.weekday, period__period=self.lesson_period.period.period + 1, ) - lesson_documentation = second_lesson.get_or_create_lesson_documentation( + lesson_documentation = second_period.get_or_create_lesson_documentation( CalendarWeek( week=self.week, year=self.lesson_period.lesson.get_year(self.week), @@ -144,11 +144,11 @@ class LessonDocumentation(ExtensibleModel): if changed: lesson_documentation.save() except LessonPeriod.DoesNotExist: - # Do nothing if it's a single lesson + # Do nothing if it's a single period pass def save(self, *args, **kwargs): - self._take_over_data() + self._carry_over_data() super().save(*args, **kwargs) class Meta: diff --git a/aleksis/apps/alsijil/preferences.py b/aleksis/apps/alsijil/preferences.py index 5fb4cf083bad76578adf67aef217c3374556b7c9..e9d3d2d2c0eaca9c2d7838ab79594f860f4dc1c0 100644 --- a/aleksis/apps/alsijil/preferences.py +++ b/aleksis/apps/alsijil/preferences.py @@ -17,13 +17,13 @@ class BlockPersonalNotesForCancelled(BooleanPreference): @site_preferences_registry.register -class TakeOverDataForDoubleLessons(BooleanPreference): +class CarryOverDataToNextPeriods(BooleanPreference): section = alsijil - name = "take_over_double" + name = "carry_over" default = True verbose_name = _( - "Take over data from first lesson for second lesson in double lessons" + "Carry over data from first lesson period to the following lesson periods in lessons over multiple periods" ) help_text = _( - "This will take over data only if the data in the second lesson are empty." + "This will carry over data only if the data in the following periods are empty." )