diff --git a/dav_events/config.py b/dav_events/config.py index 03a30bf..d4c8c39 100644 --- a/dav_events/config.py +++ b/dav_events/config.py @@ -43,80 +43,80 @@ FEE_MATRIX = { 'participant_day_fee': 0, }, 'A': {'description': _(u'A (Mehrtageswanderung Mittelgebirge'), - 'trainer_fee': 20, - 'pre_meeting_fee': 20, + 'trainer_fee': 40, 'trainer_day_fee': 50, 'participant_fee': 10, 'participant_day_fee': 10, + 'pre_meeting_fee': 0, }, 'B': {'description': _(u'B (Alpine Mehrtageswanderung)'), - 'trainer_fee': 40, - 'pre_meeting_fee': 20, + 'trainer_fee': 50, 'trainer_day_fee': 75, 'participant_fee': 10, 'participant_day_fee': 20, + 'pre_meeting_fee': 0, }, 'C': {'description': _(u'C (Tour/Kurs ohne Übernachtung)'), - 'trainer_fee': 10, - 'pre_meeting_fee': 20, + 'trainer_fee': 30, 'trainer_day_fee': 60, 'participant_fee': 10, 'participant_day_fee': 30, + 'pre_meeting_fee': 0, }, 'D': {'description': _(u'D (Tour/Kurs Mittelgebirge)'), - 'trainer_fee': 30, - 'pre_meeting_fee': 20, + 'trainer_fee': 50, 'trainer_day_fee': 75, 'participant_fee': 20, - 'participant_day_fee': 40, + 'participant_day_fee': 25, + 'pre_meeting_fee': 0, }, 'E': {'description': _(u'E (Alpine Klettertour DE/AU)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 80, 'trainer_day_fee': 75, 'participant_fee': 40, 'participant_day_fee': 40, + 'pre_meeting_fee': 0, }, 'F': {'description': _(u'F (Alpine Klettertour CH/FR/IT)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 80, 'trainer_day_fee': 85, 'participant_fee': 40, 'participant_day_fee': 45, + 'pre_meeting_fee': 0, }, 'G': {'description': _(u'G (Alpiner Kurs DE/AU)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 100, 'trainer_day_fee': 75, 'participant_fee': 35, 'participant_day_fee': 30, + 'pre_meeting_fee': 0, }, 'H': {'description': _(u'H (Alpiner Kurs CH/FR/IT/..)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 100, 'trainer_day_fee': 85, 'participant_fee': 35, 'participant_day_fee': 30, + 'pre_meeting_fee': 0, }, 'I': {'description': _(u'I (Alpine MTB/Ski-Tour DE/AU)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 80, 'trainer_day_fee': 75, 'participant_fee': 25, 'participant_day_fee': 25, + 'pre_meeting_fee': 0, }, 'J': {'description': _(u'J (Alpine MTB/Ski-Tour CH/FR/IT/..)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 80, 'trainer_day_fee': 85, 'participant_fee': 25, 'participant_day_fee': 25, + 'pre_meeting_fee': 0, }, 'K': {'description': _(u'K (Ski-Tour/-Kurs mit Liftbenutzung)'), - 'trainer_fee': 60, - 'pre_meeting_fee': 20, + 'trainer_fee': 80, 'trainer_day_fee': 130, 'participant_fee': 40, 'participant_day_fee': 40, + 'pre_meeting_fee': 0, }, } \ No newline at end of file diff --git a/dav_events/forms/events.py b/dav_events/forms/events.py index 52db119..73808e2 100644 --- a/dav_events/forms/events.py +++ b/dav_events/forms/events.py @@ -727,10 +727,10 @@ class ChargesForm(EventCreateForm): self.fields['participant_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'].widget.attrs['title'] = (u'%d € Pauschale' - u' + %d Tage * %d € Tagespauschale' - u' + %d halben Anreisetag * %d € Tagespauschale / 2' - u' + %d Vortreffen * %d € Vortreffenpauschale' + self.fields['trainer_reward'].widget.attrs['title'] = (u'%d € Pauschale \n' + u'+ %d Tage * %d € Tagespauschale \n' + u'+ %d halben Anreisetag * %d € Tagespauschale / 2 \n' + u'+ %d Vortreffen * %d € Vortreffenpauschale' % ( fees['trainer_fee'], ndays, fees['trainer_day_fee'], @@ -740,9 +740,9 @@ class ChargesForm(EventCreateForm): ) self.fields['charge'].initial = charge - self.fields['charge'].widget.attrs['title'] = (u'%d € Pauschale\n' - u' + %d Tage * %d € Tagespauschale
' - u' + %d halben Anreisetag * %d € Tagespauschale / 2' + self.fields['charge'].widget.attrs['title'] = (u'%d € Pauschale \n' + u'+ %d Tage * %d € Tagespauschale \n' + u'+ %d halben Anreisetag * %d € Tagespauschale / 2' % ( fees['participant_fee'], ndays, fees['participant_day_fee'],