From 8c45e77016cbe9c49366070582c398b92ddf8c1a Mon Sep 17 00:00:00 2001
From: hdaws <hayley.dawson@proton.me>
Date: Sat, 11 Jan 2025 14:09:56 -0500
Subject: [PATCH] placeholder to get main in

---
 .idea/magfest.iml                                | 6 ++++--
 .idea/misc.xml                                   | 5 ++++-
 docker-compose.yml                               | 6 +++++-
 uber/templates/forms/attendee/personal_info.html | 8 ++++----
 uber/templates/forms/macros.html                 | 1 +
 uber/templates/registration/attendee_data.html   | 2 +-
 uber/templates/registration/form.html            | 2 +-
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.idea/magfest.iml b/.idea/magfest.iml
index 326b66cdd..b9bfa7653 100644
--- a/.idea/magfest.iml
+++ b/.idea/magfest.iml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.4.2 (C:\Python34\python.exe)" jdkType="Python SDK" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jquery" level="project" />
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 53c3df04c..2e885756c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.4.2 (C:\Python34\python.exe)" project-jdk-type="Python SDK" />
+  <component name="Black">
+    <option name="sdkName" value="Python 3.9 (ubersystem)" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (ubersystem)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 044de6343..78ed6f45b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,15 +37,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
diff --git a/uber/templates/forms/attendee/personal_info.html b/uber/templates/forms/attendee/personal_info.html
index c9029a953..c92cedfcb 100644
--- a/uber/templates/forms/attendee/personal_info.html
+++ b/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 %}
diff --git a/uber/templates/forms/macros.html b/uber/templates/forms/macros.html
index e52740f2a..62633f2cc 100644
--- a/uber/templates/forms/macros.html
+++ b/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>
diff --git a/uber/templates/registration/attendee_data.html b/uber/templates/registration/attendee_data.html
index ac02aa0df..ae1297367 100644
--- a/uber/templates/registration/attendee_data.html
+++ b/uber/templates/registration/attendee_data.html
@@ -135,7 +135,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" %}
diff --git a/uber/templates/registration/form.html b/uber/templates/registration/form.html
index 4fb237017..aeee106e2 100644
--- a/uber/templates/registration/form.html
+++ b/uber/templates/registration/form.html
@@ -172,7 +172,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 }}" />