1. Made location optional, 2. Added multicountry select option, 3.
Improved form labels, help texts and templates.
This commit is contained in:
@@ -29,24 +29,7 @@ class EventListExportForm(forms.Form):
|
||||
_(u'Format: tt.mm.jjjj'),
|
||||
_(u'Kann frei gelassen werden')
|
||||
),
|
||||
widget = DateWidget(attrs={'id': 'id_begin_widget',
|
||||
'placeholder': _(u'Kann freigelassen werden')},
|
||||
usel10n=True,
|
||||
options={
|
||||
# 'format': 'dd.mm.yyyy',
|
||||
# 'weekStart': 1,
|
||||
'startView': 3,
|
||||
'clearBtn': True,
|
||||
'pickerPosition': 'bottom-left',
|
||||
},
|
||||
bootstrap_version=3))
|
||||
end = forms.DateField(required=False,
|
||||
label=_(u'Zeitraum - Ende'),
|
||||
help_text=u'%s - %s' % (
|
||||
_(u'Format: tt.mm.jjjj'),
|
||||
_(u'Kann frei gelassen werden')
|
||||
),
|
||||
widget = DateWidget(attrs={'id': 'id_end_widget',
|
||||
widget=DateWidget(attrs={'id': 'id_begin_widget',
|
||||
'placeholder': _(u'Kann freigelassen werden')},
|
||||
usel10n=True,
|
||||
options={
|
||||
@@ -57,6 +40,23 @@ class EventListExportForm(forms.Form):
|
||||
'pickerPosition': 'bottom-left',
|
||||
},
|
||||
bootstrap_version=3))
|
||||
end = forms.DateField(required=False,
|
||||
label=_(u'Zeitraum - Ende'),
|
||||
help_text=u'%s - %s' % (
|
||||
_(u'Format: tt.mm.jjjj'),
|
||||
_(u'Kann frei gelassen werden')
|
||||
),
|
||||
widget=DateWidget(attrs={'id': 'id_end_widget',
|
||||
'placeholder': _(u'Kann freigelassen werden')},
|
||||
usel10n=True,
|
||||
options={
|
||||
# 'format': 'dd.mm.yyyy',
|
||||
# 'weekStart': 1,
|
||||
'startView': 3,
|
||||
'clearBtn': True,
|
||||
'pickerPosition': 'bottom-left',
|
||||
},
|
||||
bootstrap_version=3))
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(EventListExportForm, self).__init__(*args, **kwargs)
|
||||
@@ -232,32 +232,48 @@ class LocationForm(EventCreateForm):
|
||||
help_text=_(u'Relevant für die Vorauswahl weiterer Felder.'),
|
||||
)
|
||||
|
||||
location = forms.CharField(max_length=config.LOCATION_MAX_LENGTH,
|
||||
location = forms.CharField(required=False,
|
||||
max_length=config.LOCATION_MAX_LENGTH,
|
||||
label=_(u'Ort'),
|
||||
help_text=_(u'z.B. Orts- und Fels- bzw. Bergname, evtl. auch Region,'
|
||||
u' so dass man mindestens eine grobe Vorstellung bekommt,'
|
||||
u' wo das ganze stattfindet.'),
|
||||
widget=forms.TextInput(attrs={'placeholder': u'Karlsruhe'}))
|
||||
help_text=u'%s - %s' % (
|
||||
_(u'Orts- und Fels- bzw. Bergname, evtl. auch Gebirgsgruppe bzw. Region,'
|
||||
u' so dass man mindestens eine grobe Vorstellung bekommt,'
|
||||
u' wo das ganze stattfindet.'),
|
||||
_(u'Kann in Ausnahmefällen (z.B. Streckenwanderung) freigelassen werden')
|
||||
),
|
||||
widget=forms.TextInput(
|
||||
attrs={'placeholder': _(u'Kann in Ausnahmefällen frei gelassen werden')}
|
||||
))
|
||||
|
||||
def _proceed_session_data(self, session_data):
|
||||
super(LocationForm, self)._proceed_session_data(session_data)
|
||||
|
||||
sport = session_data.get('sport', None)
|
||||
last_day = session_data.get('last_day', None)
|
||||
if sport == 'B':
|
||||
self.fields['terrain'].initial = 'alpine'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'Ramsau, Berchtesgadener Alpen'
|
||||
self.fields['country'].initial = 'FR'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Chamonix, Mont-Blanc-Gruppe'
|
||||
elif sport == 'K':
|
||||
self.fields['terrain'].initial = 'crag'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'Battert, Baden-Baden'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Battert, Baden-Baden'
|
||||
elif sport == 'M':
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'Pfälzerwald'
|
||||
self.fields['terrain'].initial = 'submountains'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Pfälzerwald'
|
||||
elif sport == 'S' and last_day:
|
||||
self.fields['terrain'].initial = 'alpine'
|
||||
self.fields['country'].initial = 'AT'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Obergurgl, Ötztaler Alpen'
|
||||
elif sport == 'S':
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'Todtnau, Schwarzwald'
|
||||
self.fields['terrain'].initial = 'submountains'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Todtnau, Schwarzwald'
|
||||
elif sport == 'W' and last_day:
|
||||
self.fields['terrain'].initial = 'alpine'
|
||||
self.fields['country'].initial = 'AT'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Ötztaler Alpen'
|
||||
elif sport == 'W':
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'Maikammer, Pfalz'
|
||||
|
||||
if app_config.settings.forms_development_init:
|
||||
self.fields['location'].initial = self.fields['location'].widget.attrs['placeholder']
|
||||
self.fields['terrain'].initial = 'submountains'
|
||||
self.fields['location'].widget.attrs['placeholder'] = u'z.B. Maikammer, Pfalz'
|
||||
|
||||
|
||||
class ApproachForm(EventCreateForm):
|
||||
@@ -643,10 +659,10 @@ class TrainerForm(EventCreateForm):
|
||||
def _proceed_session_data(self, session_data):
|
||||
super(TrainerForm, self)._proceed_session_data(session_data)
|
||||
|
||||
self.fields['trainer_firstname'].widget.attrs['placeholder'] = _(u'Jens')
|
||||
self.fields['trainer_familyname'].widget.attrs['placeholder'] = _(u'Kleineheismann')
|
||||
self.fields['trainer_email'].widget.attrs['placeholder'] = _(u'heinzel@alpenverein-karlsruhe.de')
|
||||
self.fields['trainer_phone'].widget.attrs['placeholder'] = _(u'0150 150 15 01')
|
||||
self.fields['trainer_firstname'].widget.attrs['placeholder'] = _(u'Vorname')
|
||||
self.fields['trainer_familyname'].widget.attrs['placeholder'] = _(u'Nachname')
|
||||
self.fields['trainer_email'].widget.attrs['placeholder'] = _(u'E-Mail-Adresse')
|
||||
self.fields['trainer_phone'].widget.attrs['placeholder'] = _(u'z.B. 0150 150 15 01')
|
||||
self.fields['trainer_2_fullname'].widget.attrs['placeholder'] = _(u'Kann freigelassen werden')
|
||||
self.fields['trainer_2_email'].widget.attrs['placeholder'] = u'--'
|
||||
self.fields['trainer_2_phone'].widget.attrs['placeholder'] = u'--'
|
||||
@@ -659,9 +675,9 @@ class TrainerForm(EventCreateForm):
|
||||
self.fields['trainer_familyname'].initial = self._request.user.last_name
|
||||
self.fields['trainer_email'].initial = self._request.user.email
|
||||
elif app_config.settings.forms_development_init:
|
||||
self.fields['trainer_firstname'].initial = self.fields['trainer_firstname'].widget.attrs['placeholder']
|
||||
self.fields['trainer_familyname'].initial = self.fields['trainer_familyname'].widget.attrs['placeholder']
|
||||
self.fields['trainer_email'].initial = self.fields['trainer_email'].widget.attrs['placeholder']
|
||||
self.fields['trainer_firstname'].initial = _(u'Jens')
|
||||
self.fields['trainer_familyname'].initial = _(u'Kleineheismann')
|
||||
self.fields['trainer_email'].initial = _(u'heinzel@alpenverein-karlsruhe.de')
|
||||
|
||||
|
||||
class ChargesForm(EventCreateForm):
|
||||
|
||||
Reference in New Issue
Block a user