Add new fields to admin forms

You couldn't save anyone as an admin due to these fields being missing. Whoops.
magfest · Mar 21, 2024 · f5aceb4 · f5aceb4
1 parent 370ca4e
commit f5aceb4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/magstock/forms.py b/magstock/forms.py
@@ -9,7 +9,7 @@
 from pockets.autolog import log
 
 from uber.config import c
-from uber.forms import (AddressForm, NumberInputGroup, MagForm, IntSelect, SwitchInput, HiddenIntField, SelectAvailableField, CustomValidation)
+from uber.forms import (MagForm, HiddenBoolField, HiddenIntField, SelectAvailableField, CustomValidation)
 from uber.custom_tags import popup_link, format_currency, pluralize, table_prices, email_to_link
 
 
@@ -50,6 +50,11 @@ def camping_type_desc(self):
             '<a href="https://magstock.org/camping-info/" target="_blank">on our website</a>.')
 
 
+@MagForm.form_mixin
+class AdminBadgeExtras:
+    camping_type = SelectField('Camping Type', coerce=int, choices=c.CAMPING_TYPE_OPTS)
+
+
 @MagForm.form_mixin
 class Consents:
     acknowledged_checkin_policy = BooleanField(
@@ -85,6 +90,13 @@ def get_optional_fields(self, attendee, is_admin=False):
         return optional_fields
 
 
+@MagForm.form_mixin
+class AdminConsents:
+    acknowledged_checkin_policy = HiddenBoolField()
+    waiver_consent = HiddenBoolField()
+    waiver_date = DateField('Date of Signature')
+
+
 @MagForm.form_mixin
 class PreregOtherInfo:
     first_name = HiddenField('First Name')

diff --git a/magstock/templates/forms/attendee/admin_badge_extras.html b/magstock/templates/forms/attendee/admin_badge_extras.html
@@ -0,0 +1,12 @@
+{% extends 'uber/templates/forms/attendee/admin_badge_extras.html' %}
+
+{% block add_ons %}
+{{ form_macros.toggle_fields_js(badge_extras.camping_type, [badge_extras.cabin_type], on_values=["267506057"], toggle_required=True, 
+                                    closest_hide_selector='.form-floating') }}
+<div class="row g-sm-3">
+    <div class="col-12 col-sm-6">{{ form_macros.form_input(badge_extras.camping_type) }}</div>
+    <div class="col-12 col-sm-6">{{ form_macros.form_input(badge_extras.cabin_type) }}</div>
+</div>
+
+{{ super() }}
+{% endblock %}
diff --git a/magstock/templates/forms/attendee/admin_consents.html b/magstock/templates/forms/attendee/admin_consents.html
@@ -0,0 +1,12 @@
+{% extends 'uber/templates/forms/attendee/admin_consents.html' %}
+
+{% block required %}
+{{ super() }}
+{{ consents.acknowledged_checkin_policy }}
+{{ consents.waiver_consent }}
+
+<div class="row g-sm-3">
+    <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_signature, readonly=True) }}</div>
+    <div class="col-12 col-sm-6">{{ form_macros.form_input(consents.waiver_date, readonly=True) }}</div>
+</div>
+{% endblock %}
diff --git a/magstock/templates/forms/attendee/consents.html b/magstock/templates/forms/attendee/consents.html
@@ -3,7 +3,7 @@
 {% block required %}
 {{ super() }}
 
-{% if not attendee.is_new and attendee.badge_status != c.PENDING_STATUS %}
+{% if 'transfer_badge' in c.PAGE_PATH or (not attendee.is_new and attendee.badge_status != c.PENDING_STATUS) %}
 <div class="row g-sm-3">
     <div class="col-12">{{ form_macros.form_input(consents.acknowledged_checkin_policy) }}</div>
 </div>

diff --git a/magstock/templates/forms/attendee/personal_info.html b/magstock/templates/forms/attendee/personal_info.html
@@ -1,7 +1,7 @@
 {% extends 'uber/templates/forms/attendee/personal_info.html' %}
 
 {% block address %}
-{% if attendee.badge_type == c.PSEUDO_DEALER_BADGE %}
+{% if attendee.badge_type == c.PSEUDO_DEALER_BADGE or 'transfer_badge' in c.PAGE_PATH %}
 {# Hack to get around WTForms requiring a selection for choice fields #}
 <input type="hidden" name="cabin_type" value="0" />
 {% endif %}