Merge remote-tracking branch 'origin/master'

dav_events/choices.py

@@ -76,6 +76,7 @@ LEVEL_CHOICES = ChoiceSet([
     ('beginner', _(u'Anfänger')),
     ('advanced', _(u'Fortgeschrittene')),
     ('family', _(u'Familien')),
+    ('senior', _(u'Senioren'))
 ])
 
 MEALS_CHOICES = ChoiceSet([

dav_events/models/participant.py

@@ -56,6 +56,10 @@ class AbstractParticipant(models.Model):
     privacy_policy_accepted = models.BooleanField(default=False,
                                                   verbose_name=_('Einwilligung zur Datenspeicherung'))
 
+    participation_conditions_accepted = models.BooleanField(default=False,
+                                                            verbose_name=_('Einwilligung der Teilnahmebedingungen'))
+
+
     paid = models.BooleanField('Teilnehmerbeitrag bezahlt', default=False)
 
     purge_at = models.DateTimeField()

dav_registration/forms.py

@@ -51,7 +51,7 @@ class RegistrationForm(forms.ModelForm):
                         ' Das finden wir gut,'
                         ' aber bitte melde dich besser mal per E-Mail bei uns.'),
                 params={'max_age': max_age},
-                code='to_old',
+                code='too_old',
             )
         return val
 
@@ -79,6 +79,16 @@ class RegistrationForm(forms.ModelForm):
             )
         return val
 
+    def clean_participation_conditions_accepted(self):
+        val = self.cleaned_data.get('participation_conditions_accepted')
+        if not val:
+            raise forms.ValidationError(
+                ugettext('Um an dieser Veranstaltung teilnehmen zu können,'
+                         ' musst du die Teilnahmebedingungen akzeptieren.'),
+                code='participation_conditions_not_accepted',
+            )
+        return val
+
     def clean(self):
         super().clean()
         dav_member = self.cleaned_data.get('dav_member')

dav_registration/models.py

@@ -84,6 +84,8 @@ class Registration(models.Model):
                                                   verbose_name=_('Einwilligung zur Datenspeicherung'))
     purge_at = models.DateTimeField(_('Zeitpunkt der Datenlöschung'))
 
+    participation_conditions_accepted = models.BooleanField(default=False, verbose_name=_('Einwilligung der Teilnahmebedingungen'))
+
     answered_obsolete = models.BooleanField(default=False, verbose_name=_('Durch Tourleitung beantwortet'))
 
     def approx_age(self):

dav_registration/templates/dav_registration/event_list.html

@@ -9,6 +9,7 @@
         <button id="btn-filter-All" type="button" class="btn btn-xs btn-green">Alle Touren</button>
         <button id="btn-filter-B" type="button" class="btn btn-xs btn-sport-B btn-white">Bergsteigen</button>
         <button id="btn-filter-family" type="button" class="btn btn-xs btn-level-family btn-white">Familien</button>
+        <button id="btn-filter-senior" type="button" class="btn btn-xs btn-level-senior btn-white">Senioren</button>
         <button id="btn-filter-K" type="button" class="btn btn-xs btn-sport-K btn-white">Klettern</button>
         <button id="btn-filter-M" type="button" class="btn btn-xs btn-sport-M btn-white">Mountainbike</button>
         <button id="btn-filter-S" type="button" class="btn btn-xs btn-sport-S btn-white">Ski</button>
@@ -127,7 +128,7 @@
     <script type="text/javascript">
         function filter_table(table, filter) {
             const sport_choices = ["B", "K", "M", "S", "W"];
-            const level_choices = ["beginner", "advanced", "family"];
+            const level_choices = ["beginner", "advanced", "family", "senior"];
             var choices = sport_choices.concat(level_choices);
             var filter_cleaned = [];
             var filter_expr;
@@ -200,6 +201,9 @@
             $("#btn-filter-family").on("click", function() {
                 toggle_filter(table, filter, "family");
             } );
+            $("#btn-filter-senior").on("click", function() {
+                toggle_filter(table, filter, "senior");
+            } );
             $("#searchfield").on( "keyup change", function() {
                 table.column(0).search( this.value ).draw();
             } );

dav_registration/templates/dav_registration/registration_form.html

@@ -182,6 +182,23 @@
                     Der/die Tourenleiter/in wird dir also persönlich per E-Mail zu- oder absagen.
                 </small></p>
             </div>
+            {% if form.participation_conditions_accepted.errors %}
+            <div class="has-error">
+            {% endif %}
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="participation_conditions_accepted" {% if form.participation_conditions_accepted.value %}checked="checked"{% endif %}>
+                    {% trans 'Ich habe den oben erläuterten Teilnahmevorbehalt und die <a href="https://www.alpenverein-karlsruhe.de/programm/teilnahmebedingungen" target="_blank" rel="noreferrer noopener">Teilnahmebedingungen</a> gelesen und akzeptiert.' %}
+                </label>
+            </div>
+            {% if form.participation_conditions_accepted.errors %}
+            <div class="help-block">
+                {% for error in form.participation_conditions_accepted.errors %}
+                <p>{{ error }}</p>
+                {% endfor %}
+            </div>
+            </div>
+            {% endif %}
         </div>
     </div>
     <div class="row">&nbsp;</div>