bring over other form inputs that dont seem to need alpine config, fi…

…nish converting staff info, dupe main form logic for now
magfest · Jan 11, 2025 · 063f60a · 063f60a
1 parent a1d7b2d
commit 063f60a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/uber/templates/forms/attendee/admin_staffing_info.html b/uber/templates/forms/attendee/admin_staffing_info.html
@@ -21,18 +21,18 @@
 <div class="row g-sm-3" x-show="staffing">
     <div class="col-12">
         <div class="form-text">Walk-On Volunteer</div>
-        {{ form_macros.form_input(staffing_info.walk_on_volunteer) }}
+        {{ form_macros.alpine_form_input(staffing_info.walk_on_volunteer) }}
     </div>
 </div>
 
 {% if c.PUBLIC_DEPARTMENT_OPTS_WITH_DESC|length > 1 %}
 <div class="row g-sm-3" x-show="staffing">
-    <div class="col-12">{{ form_macros.form_input(staffing_info.requested_depts_ids) }}</div>
+    <div class="col-12">{{ form_macros.alpine_form_input(staffing_info.requested_depts_ids) }}</div>
 </div>
 {% endif %}
 
 <div class="row g-sm-3" x-show="staffing">
-    <div class="col-12">{{ form_macros.form_input(staffing_info.assigned_depts_ids) }}</div>
+    <div class="col-12">{{ form_macros.alpine_form_input(staffing_info.assigned_depts_ids) }}</div>
 </div>
 {% endblock %}
 
@@ -45,7 +45,7 @@
     </div>
     <div class="col-12 col-sm-6">
         <div class="form-text">Received Staff Merch</div>
-        <div class="mb-3">{{ form_macros.form_input(staffing_info.got_staff_merch) }}</div>
+        <div class="mb-3">{{ form_macros.alpine_form_input(staffing_info.got_staff_merch) }}</div>
     </div>
 </div>
 {% endif %}
@@ -55,20 +55,20 @@
 <div class="row g-sm-3" x-show="staffing">
     {% if c.VOLUNTEER_AGREEMENT_ENABLED %}
     <div class="col">
-        {{ form_macros.form_input(staffing_info.agreed_to_volunteer_agreement,
+        {{ form_macros.alpine_form_input(staffing_info.agreed_to_volunteer_agreement,
             hidden_field_text=staffing_info.agreed_to_volunteer_agreement.data|yesno("Yes,No")) }}
     </div>
     {% endif %}
     {% if c.EMERGENCY_PROCEDURES_ENABLED %}
     <div class="col">
-        {{ form_macros.form_input(staffing_info.reviewed_emergency_procedures,
+        {{ form_macros.alpine_form_input(staffing_info.reviewed_emergency_procedures,
             hidden_field_text=staffing_info.reviewed_emergency_procedures.data|yesno("Yes,No")) }}
     </div>
     {% endif %}
     <div class="col">
         <div class="form-text">Staff Crash Space</div>
         <div class="mb-3">
-            {{ form_macros.form_input(staffing_info.hotel_eligible, readonly=not c.HAS_DEVTOOLS_ACCESS) }}
+            {{ form_macros.alpine_form_input(staffing_info.hotel_eligible, readonly=not c.HAS_DEVTOOLS_ACCESS) }}
         </div>
     </div>
 </div>

diff --git a/uber/templates/forms/macros.html b/uber/templates/forms/macros.html
@@ -201,7 +201,7 @@
     </label>
 {% endmacro %}
 
-{% macro alpine_form_input(field, label_text='', help_text='', admin_text='', no_margin=False, alpine_props=dict() ) %}
+{% macro alpine_form_input(field, label_text='', help_text='', admin_text='', no_margin=False, hidden_field_text='', force_hidden=False, alpine_props=dict() ) %}
     {#
     Renders the bootstrap scaffolding needed for a WTForms field based on its widget.
     field (Field): WTForms form field.
@@ -218,7 +218,28 @@
     {% set type = field.meta.get_field_type(field) %}
     {% set label_text = label_text or field.label.text %}
     {% set is_readonly = ('readonly' in kwargs and kwargs['readonly'] == True) or 'readonly' in field.render_kw %}
-    {% if type in ['checkbox','switch'] %}
+    {% if type == 'hidden' or force_hidden %}
+        {% set field_data = field.data|yesno("True,False") if force_hidden and type in ['checkbox','switch'] else field.data %}
+        {% if hidden_field_text %}
+            <div class="form-text">{{ label_text }}</div>
+            <div{% if not no_margin %} class="mb-3"{% endif %}>
+                {% if force_hidden %}
+                    <input type="hidden" name="{{ field.name }}" id="{{ field.id }}"
+                           value="{{ field_data or kwargs['default']|default('') }}"/>
+                {% else %}
+                    {{ field(**custom_kwargs) }}
+                {% endif %}
+                {{ hidden_field_text }}
+            </div>
+        {% else %}
+            {% if force_hidden %}
+                <input type="hidden" name="{{ field.name }}" id="{{ field.id }}"
+                       value="{{ field_data or kwargs['default']|default('') }}"/>
+            {% else %}
+                {{ field(**custom_kwargs) }}
+            {% endif %}
+        {% endif %}
+    {% elif type in ['checkbox','switch'] %}
         <div class="form-check{% if type == 'switch' %} form-switch{% endif %} {% if not no_margin %} mb-3{% endif %}">
             {% if is_readonly %}
                 <input type="hidden" name="{{ field.id }}" value="{{ field.data }}"/>

diff --git a/uber/templates/registration/attendee_data.html b/uber/templates/registration/attendee_data.html
@@ -145,12 +145,10 @@
 
       x-init="$watch('badge_ribbons',
                 (ribbons) => {
-                    console.log(Alpine.raw(ribbons))
-                    if (Alpine.raw(ribbons).includes({{ c.VOLUNTEER_RIBBON }})) { staffing=true }
+                    if (Alpine.raw(ribbons).includes({{ c.VOLUNTEER_RIBBON }})) { staffing = true }
                 });
               $watch('badge_type',
                  (btype) => {
-                    console.log(btype);
                     if( btype == {{ c.STAFF_BADGE }} || btype == {{ c.CONTRACTOR_BADGE }}){ staffing = true }
               })"
 >