From eb2cd6c68cfca9eb3b5f5ac61e614725b6a09c31 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Fri, 25 Jul 2025 18:57:06 +0200 Subject: [PATCH] fix(members): move util function, remove blank space --- jdav_web/members/admin.py | 5 ----- jdav_web/members/models.py | 1 - jdav_web/utils.py | 10 +++++++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 3733a78..f304c7b 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -892,11 +892,6 @@ class GroupAdmin(CommonAdminMixin, admin.ModelAdmin): } return render_tex(f"Gruppen-Checkliste", 'members/group_checklist.tex', context) -def mondays_until_nth(n): - today = datetime.today() - next_monday = today + timedelta(days=(7 - today.weekday()) % 7 or 7) - return [(next_monday + timedelta(weeks=i)).date() for i in range(n + 1)] - class ActivityCategoryAdmin(admin.ModelAdmin): fields = ['name', 'ljp_category', 'description'] diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index d697b04..a7e6d32 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -375,7 +375,6 @@ class Member(Person): @property def ticket_tag(self): """Returning the ticket number stripped of strings and spaces""" - return "{" + ''.join(re.findall(r'\d', self.ticket_no)) + "}" @property diff --git a/jdav_web/utils.py b/jdav_web/utils.py index 32db40b..f097aae 100644 --- a/jdav_web/utils.py +++ b/jdav_web/utils.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, timedelta from django.db import models from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ @@ -80,3 +80,11 @@ def normalize_filename(filename, append_date=True, date=None): filename = filename.replace(' ', '_').replace('&', '').replace('/', '_') # drop umlauts, accents etc. return unicodedata.normalize('NFKD', filename).encode('ASCII', 'ignore').decode() + + +def mondays_until_nth(n): + """ Returns a list of dates for the next n Mondays, starting from the next Monday. + This functions aids in the generation of weekly schedules or reports.""" + today = datetime.today() + next_monday = today + timedelta(days=(7 - today.weekday()) % 7 or 7) + return [(next_monday + timedelta(weeks=i)).date() for i in range(n + 1)]