From 15071c7debb7ff8e180b8a9b2927ab3e61368cec Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Tue, 19 Nov 2019 23:45:06 +0100
Subject: [PATCH] Rewrite code to set remark.
---
biscuit/apps/alsijil/model_extensions.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/biscuit/apps/alsijil/model_extensions.py b/biscuit/apps/alsijil/model_extensions.py
index 728d14640..d0470109f 100644
--- a/biscuit/apps/alsijil/model_extensions.py
+++ b/biscuit/apps/alsijil/model_extensions.py
@@ -36,17 +36,23 @@ def mark_absent(self, day: date, starting_period: Optional[int] = 0, absent=True
# Create and update all personal notes for the discovered lesson periods
for lesson_period in lesson_periods:
- PersonalNote.objects.update_or_create(
+ personal_note, created = PersonalNote.objects.update_or_create(
person=self,
lesson_period=lesson_period,
week=wanted_week.week,
defaults={
'absent': absent,
- 'excused': excused,
- 'remarks': F('remarks') + remarks
+ 'excused': excused
}
)
+ if remarks:
+ if personal_note.remarks:
+ personal_note.remarks += '; %s' % remarks
+ else:
+ personal_note.remarks = remarks
+ personal_note.save()
+
@LessonPeriod.method
def get_personal_notes(self, wanted_week: CalendarWeek):
--
GitLab