Add access info to member database

Author: dbrgn

interna/front/templates/front/members.html

@@ -39,6 +39,8 @@ <h3 class="display-inline-block">Aktivmitglieder ({{ active_memberships|length }
             <th>Natel</th>
             <th>Wohnort</th>
             <th>Github</th>
+            <th>Schlüssel</th>
+            <th>Safe-Zugang</th>
             <th>CCC</th>
             <th>Mitglied seit</th>
         </thead>
@@ -52,6 +54,8 @@ <h3 class="display-inline-block">Aktivmitglieder ({{ active_memberships|length }
                         <td>{{ member.phone }}</td>
                         <td>{{ member.city }}</td>
                         <td>{% if member.github %}<a href="https://github.com/{{ member.github }}">{{ member.github }}</a>{% endif %}</td>
+                        <td>{{ member.key_number|default:"-" }}</td>
+                        <td>{{ member.get_key_safe_display|default:"-" }}</td>
                         <td>{{ membership.ccc|yesno:"Ja,Nein" }}</td>
                         <td>{{ membership.start|date:"Y-m-d" }}</td>
                     </tr>

interna/memberdb/admin.py

@@ -4,9 +4,9 @@
 
 
 class MemberAdmin(admin.ModelAdmin):
-    list_display = ('name', 'email', 'city', 'github')
-    search_fields = ('name', 'pk', 'email', 'phone', 'city', 'github')
-    list_filter = ('city',)
+    list_display = ('name', 'email', 'city', 'github', 'key_number', 'key_safe')
+    search_fields = ('name', 'pk', 'email', 'phone', 'city', 'github', 'key_number', 'key_safe')
+    list_filter = ('city', 'key_safe')
 
 
 class MembershipAdmin(admin.ModelAdmin):

interna/memberdb/fixtures/testdata.json

@@ -6,7 +6,8 @@
     "name": "Donald Knuth",
     "email": "knuth@example.com",
     "phone": "+41 79 000 11 22",
-    "city": "Stanford"
+    "city": "Stanford",
+    "key_safe": "app"
   }
 },
 {
@@ -16,7 +17,9 @@
     "name": "Ada Lovelace",
     "email": "ada@example.com",
     "phone": "+41 78 000 33 44",
-    "city": "London"
+    "city": "London",
+    "key_number": "13",
+    "key_safe": "code"
   }
 },
 {

interna/memberdb/migrations/0005_member_key_number_member_key_safe.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.18 on 2025-01-22 12:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("memberdb", "0004_remove_member_twitter"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="member",
+            name="key_number",
+            field=models.CharField(
+                blank=True, help_text="Schlüsselnummer", max_length=100
+            ),
+        ),
+        migrations.AddField(
+            model_name="member",
+            name="key_safe",
+            field=models.CharField(
+                blank=True,
+                choices=[("app", "App"), ("code", "Code")],
+                help_text="Art des Schlüsselsafe-Zugriffs",
+                max_length=100,
+            ),
+        ),
+    ]

interna/memberdb/models.py

@@ -7,6 +7,10 @@
 
 class Member(models.Model):
     """A member of the association."""
+    class SafeAccessType(models.TextChoices):
+        APP = 'app', 'App'
+        CODE = 'code', 'Code'
+
     id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=100)
     email = models.EmailField(unique=True)
@@ -15,6 +19,11 @@ class Member(models.Model):
         help_text='Wohnort')
     github = models.CharField(max_length=32, blank=True,
         help_text='Github Benutzername')
+    key_number = models.CharField(max_length=100, blank=True,
+        help_text='Schlüsselnummer')
+    key_safe = models.CharField(max_length=100, blank=True,
+        choices=SafeAccessType.choices,
+        help_text='Art des Schlüsselsafe-Zugriffs')
 
     class Meta:
         ordering = ('name', 'id')