Merge pull request #19 from Schlabonski/member_model

updated member model

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',
+    fields = ['prename', 'lastname', 'email', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group',
-              'gets_newsletter']
+              'gets_newsletter', 'comments']
-    list_display = ('name', 'birth_date', 'gets_newsletter')
+    list_display = ('name', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'gets_newsletter', 'comments')
     list_filter = ('group', 'gets_newsletter')
 
 

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"""