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

Updated fees. Fixed minor display glitch.

Browse Source
This commit is contained in:
heinzel
2018-01-25 09:59:07 +01:00
parent d3898430cf
commit 993ea08d89
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
dav_events/config.py
View File

@@ -43,80 +43,80 @@ FEE_MATRIX = {
'participant_day_fee': 0, 'participant_day_fee': 0,
}, },
'A': {'description': _(u'A (Mehrtageswanderung Mittelgebirge'), 'A': {'description': _(u'A (Mehrtageswanderung Mittelgebirge'),
'trainer_fee': 20, 'trainer_fee': 40,
'pre_meeting_fee': 20,
'trainer_day_fee': 50, 'trainer_day_fee': 50,
'participant_fee': 10, 'participant_fee': 10,
'participant_day_fee': 10, 'participant_day_fee': 10,
'pre_meeting_fee': 0,
}, },
'B': {'description': _(u'B (Alpine Mehrtageswanderung)'), 'B': {'description': _(u'B (Alpine Mehrtageswanderung)'),
'trainer_fee': 40, 'trainer_fee': 50,
'pre_meeting_fee': 20,
'trainer_day_fee': 75, 'trainer_day_fee': 75,
'participant_fee': 10, 'participant_fee': 10,
'participant_day_fee': 20, 'participant_day_fee': 20,
'pre_meeting_fee': 0,
}, },
'C': {'description': _(u'C (Tour/Kurs ohne Übernachtung)'), 'C': {'description': _(u'C (Tour/Kurs ohne Übernachtung)'),
'trainer_fee': 10, 'trainer_fee': 30,
'pre_meeting_fee': 20,
'trainer_day_fee': 60, 'trainer_day_fee': 60,
'participant_fee': 10, 'participant_fee': 10,
'participant_day_fee': 30, 'participant_day_fee': 30,
'pre_meeting_fee': 0,
}, },
'D': {'description': _(u'D (Tour/Kurs Mittelgebirge)'), 'D': {'description': _(u'D (Tour/Kurs Mittelgebirge)'),
'trainer_fee': 30, 'trainer_fee': 50,
'pre_meeting_fee': 20,
'trainer_day_fee': 75, 'trainer_day_fee': 75,
'participant_fee': 20, 'participant_fee': 20,
'participant_day_fee': 40, 'participant_day_fee': 25,
'pre_meeting_fee': 0,
}, },
'E': {'description': _(u'E (Alpine Klettertour DE/AU)'), 'E': {'description': _(u'E (Alpine Klettertour DE/AU)'),
'trainer_fee': 60, 'trainer_fee': 80,
'pre_meeting_fee': 20,
'trainer_day_fee': 75, 'trainer_day_fee': 75,
'participant_fee': 40, 'participant_fee': 40,
'participant_day_fee': 40, 'participant_day_fee': 40,
'pre_meeting_fee': 0,
}, },
'F': {'description': _(u'F (Alpine Klettertour CH/FR/IT)'), 'F': {'description': _(u'F (Alpine Klettertour CH/FR/IT)'),
'trainer_fee': 60, 'trainer_fee': 80,
'pre_meeting_fee': 20,
'trainer_day_fee': 85, 'trainer_day_fee': 85,
'participant_fee': 40, 'participant_fee': 40,
'participant_day_fee': 45, 'participant_day_fee': 45,
'pre_meeting_fee': 0,
}, },
'G': {'description': _(u'G (Alpiner Kurs DE/AU)'), 'G': {'description': _(u'G (Alpiner Kurs DE/AU)'),
'trainer_fee': 60, 'trainer_fee': 100,
'pre_meeting_fee': 20,
'trainer_day_fee': 75, 'trainer_day_fee': 75,
'participant_fee': 35, 'participant_fee': 35,
'participant_day_fee': 30, 'participant_day_fee': 30,
'pre_meeting_fee': 0,
}, },
'H': {'description': _(u'H (Alpiner Kurs CH/FR/IT/..)'), 'H': {'description': _(u'H (Alpiner Kurs CH/FR/IT/..)'),
'trainer_fee': 60, 'trainer_fee': 100,
'pre_meeting_fee': 20,
'trainer_day_fee': 85, 'trainer_day_fee': 85,
'participant_fee': 35, 'participant_fee': 35,
'participant_day_fee': 30, 'participant_day_fee': 30,
'pre_meeting_fee': 0,
}, },
'I': {'description': _(u'I (Alpine MTB/Ski-Tour DE/AU)'), 'I': {'description': _(u'I (Alpine MTB/Ski-Tour DE/AU)'),
'trainer_fee': 60, 'trainer_fee': 80,
'pre_meeting_fee': 20,
'trainer_day_fee': 75, 'trainer_day_fee': 75,
'participant_fee': 25, 'participant_fee': 25,
'participant_day_fee': 25, 'participant_day_fee': 25,
'pre_meeting_fee': 0,
}, },
'J': {'description': _(u'J (Alpine MTB/Ski-Tour CH/FR/IT/..)'), 'J': {'description': _(u'J (Alpine MTB/Ski-Tour CH/FR/IT/..)'),
'trainer_fee': 60, 'trainer_fee': 80,
'pre_meeting_fee': 20,
'trainer_day_fee': 85, 'trainer_day_fee': 85,
'participant_fee': 25, 'participant_fee': 25,
'participant_day_fee': 25, 'participant_day_fee': 25,
'pre_meeting_fee': 0,
}, },
'K': {'description': _(u'K (Ski-Tour/-Kurs mit Liftbenutzung)'), 'K': {'description': _(u'K (Ski-Tour/-Kurs mit Liftbenutzung)'),
'trainer_fee': 60, 'trainer_fee': 80,
'pre_meeting_fee': 20,
'trainer_day_fee': 130, 'trainer_day_fee': 130,
'participant_fee': 40, 'participant_fee': 40,
'participant_day_fee': 40, 'participant_day_fee': 40,
'pre_meeting_fee': 0,
}, },
} }

14
dav_events/forms/events.py
View File

@@ -727,10 +727,10 @@ class ChargesForm(EventCreateForm):
self.fields['participant_fee'].initial = fees['participant_day_fee'] self.fields['participant_fee'].initial = fees['participant_day_fee']
self.fields['participant_day_fee'].initial = fees['participant_day_fee'] self.fields['participant_day_fee'].initial = fees['participant_day_fee']
self.fields['trainer_reward'].initial = trainer_reward self.fields['trainer_reward'].initial = trainer_reward
self.fields['trainer_reward'].widget.attrs['title'] = (u'%d € Pauschale' self.fields['trainer_reward'].widget.attrs['title'] = (u'%d € Pauschale \n'
u' + %d Tage * %d € Tagespauschale' u'+ %d Tage * %d € Tagespauschale \n'
u' + %d halben Anreisetag * %d € Tagespauschale / 2' u'+ %d halben Anreisetag * %d € Tagespauschale / 2 \n'
u' + %d Vortreffen * %d € Vortreffenpauschale' u'+ %d Vortreffen * %d € Vortreffenpauschale'
% ( % (
fees['trainer_fee'], fees['trainer_fee'],
ndays, fees['trainer_day_fee'], ndays, fees['trainer_day_fee'],
@@ -740,9 +740,9 @@ class ChargesForm(EventCreateForm):
) )
self.fields['charge'].initial = charge self.fields['charge'].initial = charge
self.fields['charge'].widget.attrs['title'] = (u'%d € Pauschale\n' self.fields['charge'].widget.attrs['title'] = (u'%d € Pauschale \n'
u' + %d Tage * %d € Tagespauschale<br />' u'+ %d Tage * %d € Tagespauschale \n'
u' + %d halben Anreisetag * %d € Tagespauschale / 2' u'+ %d halben Anreisetag * %d € Tagespauschale / 2'
% ( % (
fees['participant_fee'], fees['participant_fee'],
ndays, fees['participant_day_fee'], ndays, fees['participant_day_fee'],