From f19d264321f306dbca4e01297509ff6a26b87b1a Mon Sep 17 00:00:00 2001
From: Moses <moses@fet.at>
Date: Tue, 9 Jun 2020 14:40:30 +0000
Subject: [PATCH] Added job role, adapted member, job list_display

---
 fet2020/members/admin.py  |  6 +++---
 fet2020/members/models.py | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/fet2020/members/admin.py b/fet2020/members/admin.py
index ba1835e6..4bad63d2 100644
--- a/fet2020/members/admin.py
+++ b/fet2020/members/admin.py
@@ -47,7 +47,7 @@ class MemberRoleFilter(admin.SimpleListFilter):
 class JobMemberInline(admin.TabularInline):
     list_filter = [ActiveJobFilter]
     model = JobMember
-    extra = 1
+    extra = 0
 
     #def get_queryset(self, request):
     #    qs = super().get_queryset(request)
@@ -56,7 +56,7 @@ class JobMemberInline(admin.TabularInline):
 class MyMemberAdmin(admin.ModelAdmin):
     form = MyMemberForm
     model = Member
-    list_display = ['name', 'nickname', 'mailaccount', 'role', 'body', 'image']
+    list_display = ['name', 'nickname', 'mailaccount', 'role']#, 'body', 'image']
     inlines = (JobMemberInline,)
 
     search_fields = ['name','nickname','mailaccount']
@@ -71,7 +71,7 @@ admin.site.register(Member, MyMemberAdmin)
 class MyJobAdmin(admin.ModelAdmin):
     form = MyJobForm
     model = Job
-    list_display = ['name', 'body', 'image']
+    list_display = ['name']#, 'body', 'image']
     inlines = (JobMemberInline,)
 
     search_fields = ['name']
diff --git a/fet2020/members/models.py b/fet2020/members/models.py
index cdba9a08..35791aa2 100644
--- a/fet2020/members/models.py
+++ b/fet2020/members/models.py
@@ -18,7 +18,10 @@ class Member(models.Model):
     nickname = models.CharField(max_length=128)
     mailaccount = models.CharField(max_length=128)
 
-    role = models.CharField(max_length=1, choices=[('A', _('Active')), ('P', _('Pension'))], default='A')
+    role = models.CharField(max_length=1, choices=
+        [('A', _('Active')),
+         ('P', _('Pension'))],
+        default='A')
 
     body = models.TextField(null=True, blank=True)
     image = models.ImageField(null=True, blank=True)
@@ -65,6 +68,15 @@ class JobMember(models.Model):
     job_start = models.DateField('Job Start')
     job_end = models.DateField('Job Ende', null=True, blank=True)
 
+    job_role = models.CharField(max_length=2,choices=
+        [('1V', _('VorsitzendeR')),
+         ('2V', _('stv VorsitzendeR')),
+         ('3V', _('2. stv VorsitzendeR')),
+         ('M', _('Mitglied')),
+         ('E', _('Ersatzmitglied')),
+         ('V', _('VerantwortlicheR'))],
+        default='M')
+
     class Meta:
         unique_together = [['member', 'job']]