Split ApproachForm, full featured display of transport/journey settings.

2018-02-27 15:59:12 +01:00
parent b97869d690
commit 5d8faa615e
13 changed files with 404 additions and 223 deletions
--- a/dav_events/console_scripts/Resources/django.main.settings-dav_events.py
+++ b/dav_events/console_scripts/Resources/django.main.settings-dav_events.py
@@ -49,19 +49,13 @@ FORM_INITIALS = {
            'submountains',
        ),
    },
-    'ApproachForm': {
-        'transport': FieldInitial(
-            'sport==M,country==DE,terrain==submountains',
-            'public',
-            'sport==W,country==DE,terrain==submountains',
-            'public',
-        ),
+    'JourneyForm': {
        'meeting_point': FieldInitial(
-            'sport==M,country==DE,terrain==submountains',
-            'hbf',
-            'sport==W,country==DE,terrain==submountains',
+            'transport==public',
            'hbf',
        ),
+    },
+    'AccommodationForm': {
        'accommodation': FieldInitial('terrain==alpine', 'hut'),
        'meals': FieldInitial('NONE'),
    },