DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

UPD: added some defaults for choice fields on event model.

Browse Source
This commit is contained in:
heinzel
2018-07-09 16:18:12 +02:00
parent b1c31bf63b
commit 6c9c54fc82
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dav_events/migrations/0022_auto_20180709_1403.py Normal file
View File

@@ -0,0 +1,40 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-07-09 14:03
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dav_events', '0021_create_flags'),
]
operations = [
migrations.AlterField(
model_name='event',
name='accommodation',
field=models.CharField(choices=[(b'NONE', 'Keine (t\xe4gliche Anreise)'), (b'biwi', 'Biwak'), (b'camp', 'Zelt'), (b'campsite', 'Campingplatz'), (b'hut_shelter', 'Winterraum'), (b'hut', 'Alpenvereinsh\xfctte'), (b'hut_dorm', 'Alpenvereinsh\xfctte (Lager)'), (b'hut_room', 'Alpenvereinsh\xfctte (Zimmer)'), (b'hotel', 'Hotel/Pension/Hostel'), (b'OTHER', 'Andere Unterkunft (zus\xe4tzliches Feld)')], default=b'NONE', max_length=25, verbose_name='Unterkunft'),
),
migrations.AlterField(
model_name='event',
name='meals',
field=models.CharField(choices=[(b'NONE', 'Keine Angabe'), (b'self', 'Selbstverpflegung'), (b'hp', 'Halbpension'), (b'vp', 'Vollpension'), (b'OTHER', 'Andere Verpflegung (zus\xe4tzliches Feld)')], default=b'NONE', max_length=25, verbose_name='Verpflegung'),
),
migrations.AlterField(
model_name='event',
name='meeting_point',
field=models.CharField(choices=[(b'NONE', 'Keine Angabe'), (b'dav', 'DAV Sektionszentrum'), (b'hbf', 'Hauptbahnhof Karlsruhe, vor der Buchhandlung'), (b'hbf_south', 'Hauptbahnhof Karlsruhe, S\xfcdausgang'), (b'battert', 'Battertparkplatz, Ebersteinburg'), (b'OTHER', 'Anderer Treffpunkt (zus\xe4tzliches Feld)')], default=b'NONE', max_length=25, verbose_name='Treffpunkt'),
),
migrations.AlterField(
model_name='event',
name='terrain',
field=models.CharField(choices=[(b'gym', 'Kletterhalle'), (b'crag', 'Klettergarten'), (b'flats', 'Flachland'), (b'submountains', 'Mittelgebirge'), (b'alpine', 'Alpin')], default=b'gym', max_length=25, verbose_name='Gel\xe4nde'),
),
migrations.AlterField(
model_name='event',
name='transport',
field=models.CharField(choices=[(b'NONE', 'Keine Angabe'), (b'public', 'Bahn / Bus'), (b'coach', 'Reisebus'), (b'car', 'Fahrgemeinschaften / Stadtmobil'), (b'self', 'Eigenverantwortlich'), (b'OTHER', 'Anderes Verkehrsmittel (zus\xe4tzliches Feld)')], default=b'NONE', max_length=25, verbose_name='Verkehrsmittel'),
),
]

5
dav_events/models/event.py
View File

@@ -99,12 +99,14 @@ class Event(models.Model):
verbose_name=_(u'Land'))
terrain = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.TERRAIN_CHOICES,
default=choices.TERRAIN_CHOICES[0][0],
verbose_name=_(u'Gelände'))
location = models.CharField(max_length=config.LOCATION_MAX_LENGTH,
blank=True,
verbose_name=_(u'Ort oder Gebiet'))
transport = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.TRANSPORT_CHOICES,
default=choices.TRANSPORT_CHOICES[0][0],
verbose_name=_(u'Verkehrsmittel'))
transport_other = models.CharField(max_length=config.TRANSPORT_OTHER_MAX_LENGTH,
blank=True,
@@ -113,6 +115,7 @@ class Event(models.Model):
# JourneyForm
meeting_point = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.MEETING_POINT_CHOICES,
default=choices.MEETING_POINT_CHOICES[0][0],
verbose_name=_(u'Treffpunkt'))
meeting_point_other = models.CharField(max_length=config.MEETING_POINT_OTHER_MAX_LENGTH,
blank=True,
@@ -142,12 +145,14 @@ class Event(models.Model):
accommodation = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.ACCOMMODATION_CHOICES,
default=choices.ACCOMMODATION_CHOICES[0][0],
verbose_name=_(u'Unterkunft'))
accommodation_other = models.CharField(max_length=config.ACCOMMODATION_OTHER_MAX_LENGTH,
blank=True,
verbose_name=_(u'Andere Unterkunft'))
meals = models.CharField(max_length=choices.CHOICE_FIELD_MAX_LENGTH,
choices=choices.MEALS_CHOICES,
default=choices.MEALS_CHOICES[0][0],
verbose_name=_(u'Verpflegung'))
meals_other = models.CharField(max_length=config.MEALS_OTHER_MAX_LENGTH,
blank=True,