bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added job role, adapted member, job list_display

Browse Source
This commit is contained in:
Martin Mosbeck
2020-06-09 14:40:30 +00:00
parent e94d19602b
commit f19d264321
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fet2020/members/admin.py
View File

@@ -47,7 +47,7 @@ class MemberRoleFilter(admin.SimpleListFilter):
class JobMemberInline(admin.TabularInline): class JobMemberInline(admin.TabularInline):
list_filter = [ActiveJobFilter] list_filter = [ActiveJobFilter]
model = JobMember model = JobMember
extra = 1 extra = 0
#def get_queryset(self, request): #def get_queryset(self, request):
# qs = super().get_queryset(request) # qs = super().get_queryset(request)
@@ -56,7 +56,7 @@ class JobMemberInline(admin.TabularInline):
class MyMemberAdmin(admin.ModelAdmin): class MyMemberAdmin(admin.ModelAdmin):
form = MyMemberForm form = MyMemberForm
model = Member model = Member
list_display = ['name', 'nickname', 'mailaccount', 'role', 'body', 'image'] list_display = ['name', 'nickname', 'mailaccount', 'role']#, 'body', 'image']
inlines = (JobMemberInline,) inlines = (JobMemberInline,)
search_fields = ['name','nickname','mailaccount'] search_fields = ['name','nickname','mailaccount']
@@ -71,7 +71,7 @@ admin.site.register(Member, MyMemberAdmin)
class MyJobAdmin(admin.ModelAdmin): class MyJobAdmin(admin.ModelAdmin):
form = MyJobForm form = MyJobForm
model = Job model = Job
list_display = ['name', 'body', 'image'] list_display = ['name']#, 'body', 'image']
inlines = (JobMemberInline,) inlines = (JobMemberInline,)
search_fields = ['name'] search_fields = ['name']

14
fet2020/members/models.py
View File

@@ -18,7 +18,10 @@ class Member(models.Model):
nickname = models.CharField(max_length=128) nickname = models.CharField(max_length=128)
mailaccount = 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) body = models.TextField(null=True, blank=True)
image = models.ImageField(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_start = models.DateField('Job Start')
job_end = models.DateField('Job Ende', null=True, blank=True) 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: class Meta:
unique_together = [['member', 'job']] unique_together = [['member', 'job']]