diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html index 7b8a2b346..610864950 100644 --- a/app/templates/events/createEvent.html +++ b/app/templates/events/createEvent.html @@ -58,6 +58,7 @@ {% else %}

{{page_title}}

+
{% endif %} @@ -310,10 +311,13 @@

{{page_title}}

{% endif %} -
+
-
+
+ {% if not event %} + Back + {% endif %} {% if event %} @@ -326,7 +330,7 @@

{{page_title}}

{% endif %} - +
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html index 13fafda69..689e497dd 100644 --- a/app/templates/main/userProfile.html +++ b/app/templates/main/userProfile.html @@ -522,14 +522,20 @@
Notes
{# Bonner Requirements #}
Requirement Progress
-
    +
      {% for req in bonnerRequirements %} -
    • {{req.name}} - {% if req.completed %} - - {% else %} - - {% endif %} +
    • + + {{req.name}} + {% if not req.isRequired %} + (Optional) + {% endif %} + + {% if req.completed %} + Completed + {% else %} + Incompleted + {% endif %}
    • {% endfor %}
    @@ -663,6 +669,13 @@
    End Date: &nbs +{% if volunteer != g.current_user %} +
    + Back +
    +{% endif %} + +
{% endblock %} + diff --git a/database/test_data.py b/database/test_data.py index 847bc2a4d..598774616 100644 --- a/database/test_data.py +++ b/database/test_data.py @@ -1314,6 +1314,7 @@ ] EventParticipant.insert_many(eventParticipants).on_conflict_replace().execute() + eventRsvp = [ { "user":"mupotsal",