Skip to content

Commit

Permalink
Remove COVID references and update volunteer agreement
Browse files Browse the repository at this point in the history
  • Loading branch information
kitsuta committed Feb 20, 2024
1 parent 33d1b30 commit 8d60de1
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 45 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion magstock/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<br/> <br/>

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 <a href="{{ c.COVID_POLICIES_URL }}" target="_blank">proof of vaccination</a> 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 %}
Expand Down
31 changes: 0 additions & 31 deletions magstock/templates/regextra.html
Original file line number Diff line number Diff line change
Expand Up @@ -262,25 +262,6 @@ <h4>{{ dict[0] }}{% if dict[1] != '0' %} (${{ dict[1] }}){% endif %}</h4>
{% endif %}

{% if not admin_area %}
<div class="form-group">
<div class="checkbox col-sm-9 col-sm-offset-3">
<label class="checkbox-label">
{{ macros.checkbox(attendee, 'agreed_to_covid_policies', is_readonly=read_only, clientside_bool=clientside_bool, is_required=True) }}
{% if c.COVID_POLICIES_URL %}
<strong>Yes</strong>, I acknowledge that I have read and agree to abide by the
{{ macros.popup_link(c.COVID_POLICIES_URL, c.EVENT_NAME_AND_YEAR ~ " COVID Policies") }}
in their entirety. I understand the <strong>vaccination requirements</strong> for all individuals,
including minors, and I understand that MAGFest, Inc. has a <strong>no-refunds policy</strong>.
I will contact {{ "[email protected]"|email_to_link }} no later than <strong>May 31</strong> if I require an exemption for
medical or other reasons.
{% else %}
<strong>Yes</strong>, I understand that if accepted, I will need to agree to the {{ c.EVENT_NAME_AND_YEAR ~ " COVID Policy" }}
in order to complete my application.{% if c.PRIOR_COVID_POLICIES_URL %} ({{ macros.popup_link(c.PRIOR_COVID_POLICIES_URL, "See last year's policy here") }}){% endif %}
{% endif %}
</label>
</div>
</div>

<div class="form-group">
<div class="col-sm-9 col-sm-offset-3">For accessibility-related needs or questions, please contact {{ "[email protected]"|email_to_link }}.</div>
</div>
Expand Down Expand Up @@ -325,15 +306,3 @@ <h4>{{ dict[0] }}{% if dict[1] != '0' %} (${{ dict[1] }}){% endif %}</h4>
</div>
</div>
{% endif %}

{% if admin_area %}
<div class="form-group">
<label for="covid_ready" class="col-sm-3 control-label optional-field">Ready to Check In</label>
<div class="checkbox col-sm-9">
<label class="checkbox-label">
{{ macros.checkbox(attendee, 'covid_ready') }}
This attendee is cleared to attend {{ c.EVENT_NAME }} under our COVID policies.
</label>
</div>
</div>
{% endif %}
9 changes: 0 additions & 9 deletions magstock/templates/registration/check_in_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,4 @@
<input class="num form-control" id="license_{{ attendee.id }}" name="license_plate" type="text" value="{{ attendee.license_plate }}" size="10" />
</div>
</div>
<div class="form-group">
<label for="covid_ready" class="col-sm-3 control-label">Ready to Check In</label>
<div class="checkbox col-sm-9">
<label class="checkbox-label">
{{ macros.checkbox(attendee, 'covid_ready', is_required=True) }}
This attendee is cleared to attend {{ c.EVENT_NAME }} under our COVID policies.
</label>
</div>
</div>
{% endblock checkin_fields %}
3 changes: 1 addition & 2 deletions magstock/templates/staffing/volunteer_agreement.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ <h1>Performance Problems and Disciplinary Actions</h1>
<li>Theft (equipment, supplies, money).</li>
<li>Possession or use of a weapon.</li>
<li>Racial, sexual, or other harassment of anyone involved with the event.</li>
<li>Reckless or deliberate action that endangers the physical or psychological well-being of another person involved
with the event.</li>
<li>Reckless or deliberate action that endangers the physical or psychological well-being of any person involved with the event, including yourself.</li>
<li>Reckless or deliberate action that damages MAGFest property or property belonging to MAGFest partners.</li>
<li>Reckless or deliberate action which damages the reputation of MAGFest.</li>
</ul>
Expand Down

0 comments on commit 8d60de1

Please sign in to comment.