Added registration_howto.

This commit is contained in:
2018-02-19 15:46:24 +01:00
parent 7641079925
commit 1d574ddf85
8 changed files with 81 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
- Anzeige Bahnfahrt
- ApproachForm aufteilen
- Anmeldungstext
- Anmeldehinweis editierbar für trainer?
- Publish Status?
- Save as Draft
- Copy Event

View File

@@ -688,10 +688,20 @@ class RegistrationForm(EventCreateForm):
},
bootstrap_version=3))
registration_howto = forms.CharField(disabled=True,
required=False,
label=_(u'Anmeldungshinweis'),
widget=forms.Textarea(attrs={'rows': 2}),
)
def _proceed_session_data(self, session_data):
super(RegistrationForm, self)._proceed_session_data(session_data)
sport = session_data.get('sport', None)
terrain = session_data.get('terrain', None)
first_day = session_data.get('first_day', None)
trainer_fullname = u'%s %s' % (session_data.get('trainer_firstname'), session_data.get('trainer_familyname'))
trainer_email = session_data.get('trainer_email')
trainer_2_fullname = session_data.get('trainer_2_fullname', None)
trainer_3_fullname = session_data.get('trainer_3_fullname', None)
@@ -728,6 +738,39 @@ class RegistrationForm(EventCreateForm):
new_choices.append((key, desc))
self.fields['deadline'].choices = new_choices
registration_howto = _(u'Anmeldung mit Vor- und Nachname, E-Mail-Adresse, Telefonnummer (Mobil)'
u'%(additional)s bei %(name)s (%(emailaddr)s).')
additional = u''
if sport == 'B':
additional = u'%s %s' % (_(u', Notfall-Kontakt, DAV-Mitgliedsnummer'),
_(u'sowie Beschreibung der eigenen Bergerfahrung'))
elif sport == 'K' and terrain == 'alpine':
additional = u'%s %s' % (_(u', Notfall-Kontakt, DAV-Mitgliedsnummer'),
_(u'sowie Beschreibung der eigenen Fels- bzw. Bergerfahrung'))
elif sport == 'K':
additional = u'%s %s' % (_(u', DAV-Mitgliedsnummer'),
_(u'sowie Beschreibung der eigenen Klettererfahrung'))
elif sport == 'M' and terrain == 'alpine':
additional = u'%s %s' % (_(u', Notfall-Kontakt, DAV-Mitgliedsnummer'),
_(u'sowie kurzer Beschreibung der eigenen MTB-Erfahrung'))
elif sport == 'M':
additional = u'%s %s' % (_(u', DAV-Mitgliedsnummer'),
_(u'sowie kurzer Beschreibung der eigenen MTB-Erfahrung'))
elif sport == 'S':
additional = u'%s %s' % (_(u', Notfall-Kontakt, DAV-Mitgliedsnummer'),
_(u'sowie Beschreibung der eigenen Skitouren- und Bergerfahrung'))
elif terrain == 'alpine':
additional = _(u', Notfall-Kontakt und DAV-Mitgliedsnummer')
else:
registration_howto = None
if registration_howto:
self.fields['registration_howto'].initial = registration_howto % {'name': trainer_fullname,
'emailaddr': trainer_email,
'additional': additional}
else:
self.fields['registration_howto'].widget = forms.HiddenInput()
class ChargesForm(EventCreateForm):
_form_title = _(u'Kosten')

View File

@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.9 on 2018-02-19 14:18
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dav_events', '0011_auto_20180219_1225'),
]
operations = [
migrations.AddField(
model_name='event',
name='registration_howto',
field=models.TextField(blank=True),
),
]

View File

@@ -128,6 +128,7 @@ class Event(models.Model):
max_participants = models.IntegerField(default=0)
deadline = models.DateField(blank=True,
null=True)
registration_howto = models.TextField(blank=True)
# TrainerForm
trainer_firstname = models.CharField(max_length=config.TRAINER_NAME_MAX_LENGTH,
@@ -340,6 +341,7 @@ class Event(models.Model):
'trainer_3_fullname': self.trainer_3_fullname,
'trainer_3_email': self.trainer_3_email,
'trainer_3_phone': self.trainer_3_phone,
'registration_howto': self.registration_howto,
}
return context

View File

@@ -50,4 +50,6 @@ Die Veranstaltung wurde zur Veröffentlichung frei gegeben.
{% endif %}{% if deadline %}<strong>{% trans 'Anmeldeschluss' %}:</strong> {{ deadline|date:'l, d. F Y' }}<br />
{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}<strong>{% trans 'Ausbildungsteam' %}:</strong>{% else %}<strong>{% trans 'Team' %}:</strong>{% endif %} {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}, {{ trainer_2_fullname }}{% if trainer_2_email or trainer_2_phone %} ({% if trainer_2_email %}<a href="mailto:{{ trainer_2_email }}">{{ trainer_2_email }}</a>{% endif %}{% if trainer_2_email and trainer_2_phone %}, {% endif %}{% if trainer_2_phone %}{{ trainer_2_phone }}{% endif %}){% endif %}{% if trainer_3_fullname %}, {{ trainer_3_fullname }}{% if trainer_3_email or trainer_3_phone %} ({% if trainer_3_email %}<a href="mailto:{{ trainer_3_email }}">{{ trainer_3_email }}</a>{% endif %}{% if trainer_3_email and trainer_3_phone %}, {% endif %}{% if trainer_3_phone %}{{ trainer_3_phone }}{% endif %}){% endif %}{% endif %}<br />
{% endif %}{% if trainer_familyname %}<strong>{% trans 'Leitung' %}:</strong> {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %} {{ trainer_phone }}{% endif %}){% endif %}
{% endif %}{% if registration_howto %}
<p>{{ registration_howto }}</p>
{% endif %}

View File

@@ -163,4 +163,9 @@
{% endif %}
{% endif %}
</div>
{% if registration_howto %}
<div class="panel-footer">
<p>{{ registration_howto }}</p>
</div>
{% endif %}
</div>

View File

@@ -43,4 +43,6 @@
{% endif %}{% if deadline %}{% trans 'Anmeldeschluss' %}: {{ deadline|date:'l, d. F Y' }}
{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}{% trans 'Ausbildungsteam' %}:{% else %}{% trans 'Team' %}:{% endif %} {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}{{ trainer_email }}{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}, {{ trainer_2_fullname }}{% if trainer_2_email or trainer_2_phone %} ({% if trainer_2_email %}{{ trainer_2_email }}{% endif %}{% if trainer_2_email and trainer_2_phone %}, {% endif %}{% if trainer_2_phone %}{{ trainer_2_phone }}{% endif %}){% endif %}{% if trainer_3_fullname %}, {{ trainer_3_fullname }}{% if trainer_3_email or trainer_3_phone %} ({% if trainer_3_email %}{{ trainer_3_email }}{% endif %}{% if trainer_3_email and trainer_3_phone %}, {% endif %}{% if trainer_3_phone %}{{ trainer_3_phone }}{% endif %}){% endif %}{% endif %}
{% endif %}{% if trainer_familyname %}{% trans 'Leitung' %}: {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}{{ trainer_email }}{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}
{% endif %}{% if registration_howto %}
{{ registration_howto }}
{% endif %}

View File

@@ -28,4 +28,10 @@
</div>
</div>
<div class="row">&nbsp;</div>
<div class="row">
<div class="col-sm-12">
{% bootstrap_field form.registration_howto %}
</div>
</div>
<div class="row">&nbsp;</div>
{% endblock form-fields-visible %}