From 817aca3115513474f25673f7329846e825e49706 Mon Sep 17 00:00:00 2001
From: mariusrklein <47218379+mariusrklein@users.noreply.github.com>
Date: Sun, 27 Apr 2025 12:59:09 +0200
Subject: [PATCH] added badge no barcodes

---
 jdav_web/members/admin.py                              | 2 +-
 jdav_web/members/models.py                             | 6 ++++++
 jdav_web/members/templates/members/group_checklist.tex | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 87f5504..d94c7bf 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -878,7 +878,7 @@ class GroupAdmin(CommonAdminMixin, admin.ModelAdmin):
             return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
 
         ensure_media_dir()
-        n_weeks = 17 # TODO: als variable in settings.toml?
+        n_weeks = 12 # TODO: als variable in settings.toml?
 
         context = {
             'groups': self.model.objects.filter(show_website=True), 
diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py
index 863d1cf..918befc 100644
--- a/jdav_web/members/models.py
+++ b/jdav_web/members/models.py
@@ -371,6 +371,12 @@ class Member(Person):
     def place(self):
         """Returning the whole place (plz + town)"""
         return "{0} {1}".format(self.plz, self.town)
+    
+    @property
+    def dav_badge_no_tag(self):
+        """Returning the badge number stripped of strings and spaces"""
+        
+        return "{" + ''.join(re.findall(r'\d', self.dav_badge_no)) + "}"
 
     @property
     def iban_valid(self):
diff --git a/jdav_web/members/templates/members/group_checklist.tex b/jdav_web/members/templates/members/group_checklist.tex
index e736077..8275b35 100644
--- a/jdav_web/members/templates/members/group_checklist.tex
+++ b/jdav_web/members/templates/members/group_checklist.tex
@@ -18,6 +18,7 @@
 \usepackage{array}
 \usepackage{tabularx}
 \usepackage{rotating}
+\usepackage[code=Code39,X=.24mm,ratio=2.25,H=0.4cm]{makebarcode}
 
 
 \newcommand{\picpos}[4]{
@@ -82,7 +83,7 @@ Punktekarten werden von Kasse mit einem Kreis ($\otimes$) markiert.\\
     {% with m=group.sorted_members|index:j %}
     \midrule
         {{ j|plus:1 }}  & \begin{compacttext} 
-        {% if m in group.leiters.all %}{{ m.name|esc_all }} \textbf{(JL)} {% else %} {{ m.name|esc_all }}  {% endif %}  
+        {% if m in group.leiters.all %}{{ m.name|esc_all }} \textbf{(JL)} {% else %} {{ m.name|esc_all }}  {% endif %}  {% if m.dav_badge_no_tag|length > 2 %}\barcode{{ m.dav_badge_no_tag }}{% endif %}  
     \end{compacttext} {% for i in range %} & {% endfor %}\\
     {% endwith %}
     {% endfor %}