From deca8dcb84edc3133842e7ad02e41a267f7fd60e Mon Sep 17 00:00:00 2001 From: Paul Schiffers Date: Sun, 20 Nov 2016 13:00:26 +0100 Subject: [PATCH] updated member model --- jdav_web/members/admin.py | 6 +++--- jdav_web/members/models.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index bf7291c..69561bb 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -18,9 +18,9 @@ from .models import Member, Group, MemberList, MemberOnList # Register your models here. class MemberAdmin(admin.ModelAdmin): - fields = ['prename', 'lastname', 'email', 'birth_date', 'group', - 'gets_newsletter'] - list_display = ('name', 'birth_date', 'gets_newsletter') + fields = ['prename', 'lastname', 'email', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group', + 'gets_newsletter', 'comments'] + list_display = ('name', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'gets_newsletter', 'comments') list_filter = ('group', 'gets_newsletter') diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index d2fcf42..6bfce44 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -28,11 +28,16 @@ class Member(models.Model): """ prename = models.CharField(max_length=20, verbose_name=_('prename')) lastname = models.CharField(max_length=20, verbose_name=_('last name')) + street = models.CharField(max_length=30, verbose_name=_('street'), default='', blank=True) + town = models.CharField(max_length=30, verbose_name=_('town'), default='', blank=True) + phone_number = models.CharField(max_length=12, verbose_name=_('phone number'), default='', blank=True) + phone_number_parents = models.CharField(max_length=12, verbose_name=_('parents phone number'), default='', blank=True) email = models.EmailField(max_length=100, default="") birth_date = models.DateField(_('birth date')) # to determine the age group = models.ManyToManyField(Group) gets_newsletter = models.BooleanField(_('receives newsletter'), default=True) + comments = models.TextField(_('comments'), default='', blank=True) def __str__(self): """String representation"""