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

mostly auth stuff.

Browse Source
This commit is contained in:
heinzel
2018-01-19 16:16:39 +01:00
parent b72b5a519f
commit 3f9cc11dbd
9 changed files with 174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dav_events/forms.py
View File

@@ -635,8 +635,8 @@ class RegistrationForm(EventCreateForm):
label=_(u'Anmeldeschluss'),
widget=forms.RadioSelect())
deadline_month = forms.CharField(widget=forms.HiddenInput())
deadline_quarter = forms.CharField(widget=forms.HiddenInput())
deadline_month = forms.DateField(widget=forms.HiddenInput())
deadline_quarter = forms.DateField(widget=forms.HiddenInput())
deadline_other = forms.DateField(required=False,
label=_(u'Anderer Anmeldeschluss'),
@@ -793,6 +793,8 @@ class ChargesForm(EventCreateForm):
first_day = session_data.get('first_day', None)
arrival_previous_day = session_data.get('arrival_previous_day', False)
last_day = session_data.get('last_day', None)
transport = session_data.get('transport', None)
accommodation = session_data.get('accommodation', None)
pre_meeting_1 = session_data.get('pre_meeting_1', None)
pre_meeting_2 = session_data.get('pre_meeting_2', None)
@@ -821,14 +823,20 @@ class ChargesForm(EventCreateForm):
else:
charge_key = 'J'
additional_costs_text = ugettext(u'Fahrtkosten')
additional_costs_text = u''
if transport != 'NONE':
additional_costs_text += ugettext(u'Fahrtkosten')
if last_day:
timedelta = last_day - first_day
ndays = timedelta.days + 1
additional_costs_text += ugettext(u', Unterkunft und Verpflegung')
if accommodation != 'NONE':
if additional_costs_text:
additional_costs_text += u', '
additional_costs_text += ugettext(u'Unterkunft und Verpflegung')
else:
ndays = 1
if pre_meeting_2:
n_pre_meetings = 2
elif pre_meeting_1:
@@ -851,9 +859,6 @@ class ChargesForm(EventCreateForm):
trainer_reward += fees['trainer_day_fee'] / 2.0
charge += fees['participant_day_fee'] / 2.0
if charge > 0:
additional_costs_text = u'%s %s' % (ugettext(u'zzgl.'), additional_costs_text)
self.fields['charge_key'].initial = fees['description'] or charge_key
self.fields['trainer_fee'].initial = fees['trainer_fee']
self.fields['pre_meeting_fee'].initial = fees['pre_meeting_fee']