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

Merge branch 'abrechnung_2019'

Browse Source
This commit is contained in:
heinzel
2019-06-28 15:48:49 +02:00
parent 700cec49d0 2069c1b8ed
commit 4c079b398f
4 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dav_events/django_project_config/settings-dav_events.py
View File

@@ -175,15 +175,17 @@ MATRIX_CONFIG = {
'trainer_day_fee': 0,
'participant_fee': 0,
'participant_day_fee': 0,
'pubtrans_bonus': 0,
'min_participants': 0,
'max_participants': 0,
},
'A': {'description': _(u'A (Mehrtageswanderung Mittelgebirge'),
'A': {'description': _(u'A (Mehrtageswanderung Mittelgebirge)'),
'trainer_fee': 40,
'trainer_day_fee': 50,
'participant_fee': 10,
'participant_day_fee': 10,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 20,
'min_participants': 5,
'max_participants': 8,
},
@@ -192,7 +194,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 75,
'participant_fee': 10,
'participant_day_fee': 20,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 6,
},
@@ -201,7 +204,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 60,
'participant_fee': 10,
'participant_day_fee': 30,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 0,
'min_participants': 3,
'max_participants': 5,
},
@@ -210,7 +214,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 75,
'participant_fee': 20,
'participant_day_fee': 25,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 5,
},
@@ -219,7 +224,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 75,
'participant_fee': 40,
'participant_day_fee': 40,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 2,
'max_participants': 3,
},
@@ -228,7 +234,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 85,
'participant_fee': 40,
'participant_day_fee': 45,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 2,
'max_participants': 3,
},
@@ -237,7 +244,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 75,
'participant_fee': 35,
'participant_day_fee': 30,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 4,
},
@@ -246,7 +254,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 85,
'participant_fee': 35,
'participant_day_fee': 30,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 4,
},
@@ -255,7 +264,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 75,
'participant_fee': 25,
'participant_day_fee': 25,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 6,
},
@@ -264,7 +274,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 85,
'participant_fee': 25,
'participant_day_fee': 25,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 6,
},
@@ -273,7 +284,8 @@ MATRIX_CONFIG = {
'trainer_day_fee': 130,
'participant_fee': 40,
'participant_day_fee': 40,
'pre_meeting_fee': 0,
'pre_meeting_fee': 20,
'pubtrans_bonus': 30,
'min_participants': 3,
'max_participants': 4,
},

58
dav_events/forms/events.py
View File

@@ -779,9 +779,6 @@ class ChargesForm(EventCreateForm):
trainer_fee = forms.FloatField(disabled=True,
label=_(u'Pauschale Trainer*in'),
)
pre_meeting_fee = forms.FloatField(disabled=True,
label=_(u'Pauschale Vortreffen'),
)
trainer_day_fee = forms.FloatField(disabled=True,
label=_(u'Tagespauschale Trainer*in'),
)
@@ -789,12 +786,20 @@ class ChargesForm(EventCreateForm):
label=_(u'Pauschale Teilnehmer*in'),
)
participant_day_fee = forms.FloatField(disabled=True,
label=_(u'Tagepauschale Teilnehmer*in'),
label=_(u'Tagespauschale Teilnehmer*in'),
)
trainer_reward = forms.FloatField(disabled=True,
label=_(u'Aufwandsentschädigung Trainer*in'),
pre_meeting_fee = forms.FloatField(disabled=True,
label=_(u'Pauschale pro Vortreffen'),
)
pubtrans_bonus = forms.FloatField(disabled=True,
label=_(u'Bonus bei Benutzung öffentlicher Verkehrsmittel'),
)
trainer1_reward = forms.FloatField(disabled=True,
label=_(u'Aufwandsentschädigung Tourenleiter*in'),
)
trainer23_reward = forms.FloatField(disabled=True,
label=_(u'Aufwandsentschädigung Assistenz'),
)
charge = forms.FloatField(min_value=0,
label=_(u'Teilnahmegebühr in Euro'))
@@ -854,30 +859,26 @@ class ChargesForm(EventCreateForm):
matrix_config['participant_fee']
+ ndays * matrix_config['participant_day_fee']
)
if arrival_previous_day:
trainer_reward += matrix_config['trainer_day_fee'] / 2.0
charge += matrix_config['participant_day_fee'] / 2.0
self.fields['charge_key'].initial = matrix_config['description'] or matrix_key
self.fields['trainer_fee'].initial = matrix_config['trainer_fee']
self.fields['pre_meeting_fee'].initial = matrix_config['pre_meeting_fee']
self.fields['trainer_day_fee'].initial = matrix_config['trainer_day_fee']
self.fields['participant_fee'].initial = matrix_config['participant_day_fee']
self.fields['participant_fee'].initial = matrix_config['participant_fee']
self.fields['participant_day_fee'].initial = matrix_config['participant_day_fee']
self.fields['trainer_reward'].initial = trainer_reward
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'
% (
matrix_config['trainer_fee'],
ndays, matrix_config['trainer_day_fee'],
int(arrival_previous_day), matrix_config['trainer_day_fee'],
n_pre_meetings, matrix_config['pre_meeting_fee']
)
)
self.fields['pre_meeting_fee'].initial = matrix_config['pre_meeting_fee']
self.fields['pubtrans_bonus'].initial = matrix_config['pubtrans_bonus']
self.fields['charge'].initial = charge
self.fields['trainer1_reward'].initial = trainer_reward
self.fields['trainer23_reward'].initial = trainer_reward * 0.95
self.fields['pubtrans_bonus'].widget.attrs['title'] = ugettext(u'Der Bonus wird nachträglich'
u' auf Meldung der Tourenleitung'
u' verrechnet und ist noch nicht'
u' in den hier dargestellten Zahlen enthalten.')
self.fields['charge'].widget.attrs['title'] = (u'%d € Pauschale \n'
u'+ %d Tage * %d € Tagespauschale \n'
u'+ %d halben Anreisetag * %d € Tagespauschale / 2'
@@ -887,6 +888,19 @@ class ChargesForm(EventCreateForm):
int(arrival_previous_day), matrix_config['participant_day_fee'],
)
)
self.fields['trainer1_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'
% (
matrix_config['trainer_fee'],
ndays, matrix_config['trainer_day_fee'],
int(arrival_previous_day), matrix_config['trainer_day_fee'],
n_pre_meetings, matrix_config['pre_meeting_fee']
)
)
self.fields['trainer23_reward'].widget.attrs['title'] = ugettext(u'95% der Aufwandsentschädigung'
u' Tourenleiter*in')
self.fields['additional_costs'].widget.attrs['placeholder'] = ugettext(u'Kann freigelassen werden')
self.fields['additional_costs'].initial = additional_costs_text

18
dav_events/templates/dav_events/event_create/ChargesForm.html
View File

@@ -14,7 +14,7 @@
{% bootstrap_field form.trainer_fee %}
</div>
<div class="col-sm-4">
{% bootstrap_field form.trainer_day_fee %}
{% bootstrap_field form.participant_fee %}
</div>
</div>
<div class="row">
@@ -22,7 +22,7 @@
{% bootstrap_field form.pre_meeting_fee %}
</div>
<div class="col-sm-4">
{% bootstrap_field form.participant_fee %}
{% bootstrap_field form.trainer_day_fee %}
</div>
<div class="col-sm-4">
{% bootstrap_field form.participant_day_fee %}
@@ -30,15 +30,23 @@
</div>
</div>
</div>
<div class="row">
<div class="col-sm-8">
{% bootstrap_field form.pubtrans_bonus %}
</div>
</div>
<div class="row">
<div class="col-sm-12">
<label></label>
<div class="row">
<div class="col-sm-6">
<div class="col-sm-4">
{% bootstrap_field form.charge %}
</div>
<div class="col-sm-6">
{% bootstrap_field form.trainer_reward %}
<div class="col-sm-4">
{% bootstrap_field form.trainer1_reward %}
</div>
<div class="col-sm-4">
{% bootstrap_field form.trainer23_reward %}
</div>
</div>
</div>

6
dav_events/templates/dav_events/event_create/TrainerForm.html
View File

@@ -5,7 +5,7 @@
{% block form-fields-visible %}
<div class="row">
<div class="col-sm-12">
<label>{% trans 'Tourenleiter' %}</label>
<label>{% trans 'Tourenleiter*in' %}</label>
<div class="row">
<div class="col-sm-2">
{% bootstrap_field form.trainer_firstname %}
@@ -25,7 +25,7 @@
<div class="row">&nbsp;</div>
<div class="row">
<div class="col-sm-12">
<label>2. {% trans 'Trainer' %}</label>
<label>2. {% trans 'Trainer*in' %}</label>
<div class="row">
<div class="col-sm-5">
{% bootstrap_field form.trainer_2_fullname %}
@@ -41,7 +41,7 @@
</div>
<div class="row">
<div class="col-sm-12">
<label>3. {% trans 'Trainer' %}</label>
<label>3. {% trans 'Trainer*in' %}</label>
<div class="row">
<div class="col-sm-5">
{% bootstrap_field form.trainer_3_fullname %}