From 8d60de1934906897273d41f1b2399e17967449be Mon Sep 17 00:00:00 2001 From: Victoria Earl Date: Tue, 20 Feb 2024 15:17:34 -0500 Subject: [PATCH] Remove COVID references and update volunteer agreement --- Dockerfile | 1 - magstock/models.py | 2 +- .../reg_workflow/attendee_confirmation.html | 2 +- magstock/templates/regextra.html | 31 ------------------- .../templates/registration/check_in_form.html | 9 ------ .../staffing/volunteer_agreement.html | 3 +- 6 files changed, 3 insertions(+), 45 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a88caa..afa1696 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,5 @@ FROM ghcr.io/magfest/ubersystem:main # install plugins COPY . plugins/magstock/ -RUN git clone --depth 1 --branch main https://github.com/magfest/covid.git plugins/covid RUN /app/env/bin/paver install_deps diff --git a/magstock/models.py b/magstock/models.py index 6027e37..47ed46a 100644 --- a/magstock/models.py +++ b/magstock/models.py @@ -17,7 +17,7 @@ class Attendee: brunch_tickets = Column(Integer, default=0) dinner_tickets = Column(Integer, default=0) meal_restrictions = Column(MultiChoice(c.MEAL_TICKET_RESTRICTION_OPTS)) - camping_type = Column(Choice(c.CAMPING_TYPE_OPTS), default=c.TENT, nullable=True) # TODO: Make non-nullable next year BEFORE standing up servers + camping_type = Column(Choice(c.CAMPING_TYPE_OPTS), default=c.TENT) cabin_type = Column(Choice(c.CABIN_TYPE_OPTS), nullable=True) license_plate = Column(UnicodeText, default='') acknowledged_checkin_policy = Column(Boolean, default=False) diff --git a/magstock/templates/emails/reg_workflow/attendee_confirmation.html b/magstock/templates/emails/reg_workflow/attendee_confirmation.html index 02f1a6a..23dcfe9 100644 --- a/magstock/templates/emails/reg_workflow/attendee_confirmation.html +++ b/magstock/templates/emails/reg_workflow/attendee_confirmation.html @@ -13,7 +13,7 @@

-No registration materials are physically mailed before the event, so you should check in at the registration desk when you arrive at MAGStock. Simply bring a photo ID and proof of vaccination to the registration desk, where you'll be provided with your admission wristband. +No registration materials are physically mailed before the event, so you should check in at the registration desk when you arrive at MAGStock. Simply bring a photo ID to the registration desk, where you'll be provided with your admission wristband. If you pre-ordered merch such as a t-shirt package, you can also pick those up at the registration desk. The location and hours of the registration desk will be e-mailed prior to the event. {% if attendee.donation_swag|list + attendee.addons|list %} diff --git a/magstock/templates/regextra.html b/magstock/templates/regextra.html index 12d403b..38e94fe 100644 --- a/magstock/templates/regextra.html +++ b/magstock/templates/regextra.html @@ -262,25 +262,6 @@

{{ dict[0] }}{% if dict[1] != '0' %} (${{ dict[1] }}){% endif %}

{% endif %} {% if not admin_area %} -
-
- -
-
-
For accessibility-related needs or questions, please contact {{ "accessibility@magstock.org"|email_to_link }}.
@@ -325,15 +306,3 @@

{{ dict[0] }}{% if dict[1] != '0' %} (${{ dict[1] }}){% endif %}

{% endif %} - -{% if admin_area %} -
- -
- -
-
-{% endif %} \ No newline at end of file diff --git a/magstock/templates/registration/check_in_form.html b/magstock/templates/registration/check_in_form.html index 68e96ff..c096fe0 100644 --- a/magstock/templates/registration/check_in_form.html +++ b/magstock/templates/registration/check_in_form.html @@ -34,13 +34,4 @@ -
- -
- -
-
{% endblock checkin_fields %} diff --git a/magstock/templates/staffing/volunteer_agreement.html b/magstock/templates/staffing/volunteer_agreement.html index 0aa9a5f..82355ca 100644 --- a/magstock/templates/staffing/volunteer_agreement.html +++ b/magstock/templates/staffing/volunteer_agreement.html @@ -60,8 +60,7 @@

Performance Problems and Disciplinary Actions

  • Theft (equipment, supplies, money).
  • Possession or use of a weapon.
  • Racial, sexual, or other harassment of anyone involved with the event.
    • -
  • Reckless or deliberate action that endangers the physical or psychological well-being of another person involved -with the event.
    • +
  • Reckless or deliberate action that endangers the physical or psychological well-being of any person involved with the event, including yourself.
  • Reckless or deliberate action that damages MAGFest property or property belonging to MAGFest partners.
  • Reckless or deliberate action which damages the reputation of MAGFest.