placeholder to get main in

docker-compose.yml

@@ -38,15 +38,19 @@ services:
     command: ['celery-worker']
   db:
     image: postgres
+    ports:
+      - 25432:5432
     environment:
       - POSTGRES_PASSWORD=uber_db
       - POSTGRES_USER=uber_db
       - POSTGRES_DB=uber_db
+    volumes:
+      - ./db/uber_data:/var/lib/postgres/data
   redis:
     image: redis
   rabbitmq:
     ports:
-      - "5672"
+      - 25672:5672
     image: rabbitmq:alpine
     environment:
       - RABBITMQ_DEFAULT_USER=celery

uber/templates/forms/attendee/personal_info.html

@@ -16,13 +16,13 @@
 #}
 <div x-data="{
                 international: {{ personal_info.international.data | javascript_bool }},
+                dealer: {{ (is_prereg_dealer or attendee.is_dealer) | javascript_bool }},
+                noCellphone: {{ personal_info.no_cellphone.data | javascript_bool }},
                 copyAddress: false,
-                get isZipRequired(){ return !this.international && !this.copyAddress && !this.badge_placeholder }, //hmd todo broken and not sure why.
-                canRequireCellphone: {{ (is_prereg_dealer or attendee.is_dealer) | javascript_bool }},
                 copyCellphone: false,
-                noCellphone: {{ personal_info.no_cellphone.data | javascript_bool }},
+                get isZipRequired(){ return !this.international && !this.copyAddress && !this.badge_placeholder }, //hmd todo broken and not sure why.
                 get isCellphoneDisabled() { return this.noCellphone || this.copyCellphone},
-                get isCellphoneRequired() { return (this.staffing || this.canRequireCellPhone) && !this.noCellphone && !this.copyCellphone && !this.badge_placeholder } //badge_placeholder comes from x-data above, can be undefined.
+                get isCellphoneRequired() { return (this.staffing || this.dealer) && !this.noCellphone && !this.copyCellphone && !this.badge_placeholder } //this is also similarly broken.
                 }">
     {% block name %}
     {% set attendee_last_name = attendee.last_name[0] ~ '.' if limited_read else attendee.last_name %}

uber/templates/forms/macros.html

@@ -195,6 +195,7 @@
     {% for key in kwargs %} {{ key }}="{{ kwargs[key] }}"{% endfor %}>
         <span class="form-label">{{ label_text }}</span>
         {% if required_if is not none %}
+            <span>HMD Debug <span x-text="{{ required_if | string }}"></span></span>
             <span class="required-indicator text-danger" x-show="{{ required_if }}"> *</span>
         {% endif %}
     </label>

uber/templates/registration/attendee_data.html

@@ -130,7 +130,7 @@
 {% endif %}
 
 {{ form_macros.form_validation('attendee_form', '../registration/validate_attendee', callback="updateAttendee(submit_button_name)") }}
-<form novalidate method="post" action="../registration/update_attendee" id="attendee_form" x-data="{badge_placeholder:false, staffing: false}">
+<form novalidate method="post" action="../registration/update_attendee" id="attendee_form" x-data="{badge_placeholder: {{ attendee.placeholder | javascript_bool }}, staffing: {{ attendee.staffing | javascript_bool }}}">
   {{ csrf_token() }}
   <input type="hidden" name="id" value="{{ attendee.db_id }}" />
   {% include "forms/attendee/admin_badge_flags.html" %}

uber/templates/registration/form.html

@@ -143,7 +143,7 @@ <h4>{{ attendee.full_name }} currently owes <strong>{{ (receipt.current_amount_o
 
 {{ form_macros.form_validation('attendee-form') }}
 
-<form novalidate method="post" id="attendee-form" action="form" x-data="{badge_placeholder:false, staffing: {{ attendee.staffing | string | lower }}}">
+<form novalidate method="post" id="attendee-form" action="form" x-data="{badge_placeholder: {{ attendee.placeholder | javascript_bool }}, staffing: {{ attendee.staffing | javascript_bool }}}">
 {{ csrf_token() }}
 <input type="hidden" name="id" value="{{ attendee.db_id }}" />
 <input type="hidden" name="return_to" value="{{ return_to }}" />