digitales
/
kompass
4
1
Fork 1
Code Issues 45 Pull Requests 2 Packages Projects Releases Wiki Activity

add postcode

Browse Source
v1-0-stable
Christian Merten 8 years ago
parent 7233bd92df
commit 99de797737
3 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File

5
jdav_web/members/admin.py
Unescape Escape View File

@ -62,7 +62,8 @@ class RegistrationFilter(admin.SimpleListFilter):
# Register your models here.
class MemberAdmin(admin.ModelAdmin):
fields = ['prename', 'lastname', 'email', 'email_parents', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group',
fields = ['prename', 'lastname', 'email', 'email_parents', 'street', 'plz',
'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group',
'gets_newsletter', 'registered', 'registration_form', 'comments']
list_display = ('name', 'birth_date', 'get_group', 'gets_newsletter',
'registered', 'created', 'comments')
@ -162,7 +163,7 @@ class MemberListAdmin(admin.ModelAdmin):
line = '{0} {1} & {2}, {3} & {4} & {5} \\\\ \n'.format(
memberonlist.member.prename,
memberonlist.member.lastname, memberonlist.member.street,
memberonlist.member.town, memberonlist.member.phone_number,
memberonlist.member.place, memberonlist.member.phone_number,
memberonlist.member.email)
f.write(esc_underscore(line))

80
jdav_web/members/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-11 12:34+0200\n"
"POT-Creation-Date: 2017-10-11 14:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin.py:25 models.py:67
#: admin.py:25 models.py:69
msgid "Registration complete"
msgstr "Anmeldung vollständig"
@ -34,23 +34,23 @@ msgstr "Nein"
msgid "All"
msgstr "Alle"
#: admin.py:98
#: admin.py:100
msgid "Difficulty"
msgstr "Schwierigkeit"
#: admin.py:102
#: admin.py:104
msgid "Tour type"
msgstr "Art der Tour"
#: admin.py:239
#: admin.py:242
msgid "Convert to PDF"
msgstr "Kriseninterventionsliste erstellen"
#: admin.py:345
#: admin.py:348
msgid "Generate overview"
msgstr "Hinweise für Jugendleiter erstellen"
#: apps.py:7 models.py:105
#: apps.py:7 models.py:107
msgid "members"
msgstr "Teilnehmer"
@ -62,7 +62,7 @@ msgstr "Name"
msgid "Description"
msgstr "Beschreibung"
#: models.py:23 models.py:121 templates/members/change_member.html:9
#: models.py:23 models.py:123 templates/members/change_member.html:9
msgid "Activity"
msgstr "Aktivität"
@ -78,7 +78,7 @@ msgstr "Name"
msgid "minimum age (years)"
msgstr "Mindestalter (Jahre)"
#: models.py:41 models.py:60
#: models.py:41 models.py:62
msgid "group"
msgstr "Gruppe"
@ -99,122 +99,126 @@ msgid "street"
msgstr "Straße"
#: models.py:53
msgid "Postcode"
msgstr "PLZ"
#: models.py:55
msgid "town"
msgstr "Stadt"
#: models.py:54
#: models.py:56
msgid "phone number"
msgstr "Telefonnummer"
#: models.py:55
#: models.py:57
msgid "parents phone number"
msgstr "Telefonnummer der Eltern"
#: models.py:58
#: models.py:60
msgid "Parents' Email"
msgstr "Email der Eltern"
#: models.py:59
#: models.py:61
msgid "birth date"
msgstr "Geburtsdatum"
#: models.py:61
#: models.py:63
msgid "receives newsletter"
msgstr "Erhält den Newsletter"
#: models.py:65
#: models.py:67
msgid "comments"
msgstr "Kommentare"
#: models.py:66
#: models.py:68
msgid "created"
msgstr "erstellt"
#: models.py:68
#: models.py:70
msgid "registration form"
msgstr "Anmeldeformular"
#: models.py:101 models.py:185
#: models.py:103 models.py:187
msgid "Group"
msgstr "Gruppe"
#: models.py:104
#: models.py:106
msgid "member"
msgstr "Teilnehmer"
#: models.py:123
#: models.py:125
msgid "Place"
msgstr "Ort"
#: models.py:124
#: models.py:126
msgid "Destination (optional)"
msgstr "Ziel (optional)"
#: models.py:126 models.py:181
#: models.py:128 models.py:183
msgid "Date"
msgstr "Datum"
#: models.py:127
#: models.py:129
msgid "End (optional)"
msgstr "Ende"
#: models.py:129
#: models.py:131
msgid "Groups"
msgstr "Gruppen"
#: models.py:137
#: models.py:139
msgid "Categories"
msgstr "Kategorien"
#: models.py:138
#: models.py:140
msgid "easy"
msgstr "leicht"
#: models.py:138
#: models.py:140
msgid "medium"
msgstr "mittel"
#: models.py:138
#: models.py:140
msgid "hard"
msgstr "schwer"
#: models.py:147
#: models.py:149
msgid "Memberlist"
msgstr "Teilnehmerliste"
#: models.py:148
#: models.py:150
msgid "Memberlists"
msgstr "Teilnehmerlisten"
#: models.py:163 models.py:171 models.py:216 models.py:223
#: models.py:165 models.py:173 models.py:218 models.py:225
msgid "Member"
msgstr "Teilnehmer"
#: models.py:165
#: models.py:167
msgid "Comment"
msgstr "Kommentar"
#: models.py:172 models.py:224
#: models.py:174 models.py:226
msgid "Members"
msgstr "Teilnehmer"
#: models.py:182
#: models.py:184
msgid "Location"
msgstr "Ort"
#: models.py:183
#: models.py:185
msgid "Topic"
msgstr "Thema"
#: models.py:207
#: models.py:209
msgid "Jugendleiter"
msgstr "Jugendleiter"
#: models.py:210
#: models.py:212
msgid "Klettertreff"
msgstr "Klettertreff"
#: models.py:211
#: models.py:213
msgid "Klettertreffs"
msgstr "Klettertreffs"

7
jdav_web/members/models.py
Unescape Escape View File

@ -50,6 +50,8 @@ 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)
plz = models.CharField(max_length=10, verbose_name=_('Postcode'),
default='', blank=True)
town = models.CharField(max_length=30, verbose_name=_('town'), default='', blank=True)
phone_number = models.CharField(max_length=18, verbose_name=_('phone number'), default='', blank=True)
phone_number_parents = models.CharField(max_length=18, verbose_name=_('parents phone number'), default='', blank=True)
@ -93,6 +95,11 @@ class Member(models.Model):
"""Returning whole name (prename + lastname)"""
return "{0} {1}".format(self.prename, self.lastname)
@property
def place(self):
"""Returning the whole place (plz + town)"""
return "{0} {1}".format(self.plz, self.town)
def get_group(self):
"""Returns a string of groups in which the member is."""
groupstring = ''.join(g.name + ',\n' for g in self.group.all())

Write Preview
Loading…
Cancel
Save