diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html index 35d1f56..693e228 100644 --- a/conditional/templates/dashboard.html +++ b/conditional/templates/dashboard.html @@ -44,11 +44,11 @@
{{username}}@csh.rit.edu

Freshman Evaluations {% if freshman['status'] == "Passed" %} - Passed + Passed {% elif freshman['status'] == "Pending" %} - Pending + Pending {% else %} - Failed + Failed {% endif %}

@@ -63,8 +63,8 @@

Freshman Evaluations Signatures Missed {% if freshman['sig_missed'] == 0 %} - None {% else %} - {{freshman['sig_missed']}} {% endif %} + None {% else %} + {{freshman['sig_missed']}} {% endif %} @@ -72,8 +72,8 @@

Freshman Evaluations Directorship Meetings {% if freshman['committee_meetings'] >= 6 %} - {% else %} - {% endif %} {{freshman['committee_meetings']}} / 6 + {% else %} + {% endif %} {{freshman['committee_meetings']}} / 6 @@ -81,8 +81,8 @@

Freshman Evaluations House Meetings Missed {% if freshman['hm_missed'] == 0 %} - None {% else %} - {{ freshman['hm_missed'] }} {% endif %} + None {% else %} + {{ freshman['hm_missed'] }} {% endif %} @@ -111,11 +111,11 @@

Freshman Evaluations

Membership Evaluations {% if spring['status'] == "Passed" %} - Passed + Passed {% elif spring['status'] == "Failed" %} - Failed + Failed {% elif active %} - Pending + Pending {% endif %}

@@ -141,16 +141,16 @@

Membership Evaluations Directorship Meetings {% if spring['committee_meetings'] >= spring['req_meetings'] %} - {% else %} - {% endif %} {{ spring['committee_meetings'] }} / {{ spring['req_meetings'] }} + {% else %} + {% endif %} {{ spring['committee_meetings'] }} / {{ spring['req_meetings'] }} House Meetings Missed {% if spring['hm_missed'] == 0 %} - None {% else %} - {{spring['hm_missed']}} + None {% else %} + {{spring['hm_missed']}} {% endif %} @@ -160,9 +160,9 @@

Membership Evaluations {% if spring['mp_status'] == "Passed" %} - Passed {% elif spring['mp_status'] == "Pending" %} - Pending {% else %} - None {% endif %} + Passed {% elif spring['mp_status'] == "Pending" %} + Pending {% else %} + None {% endif %} @@ -193,9 +193,9 @@

Conditionals

{{c['description']}} {% if c['status'] == "Passed" %} - {% elif c['status'] == "Pending" %} - Pending {% else %} - Failed {% endif %} + {% elif c['status'] == "Pending" %} + Pending {% else %} + Failed {% endif %} {% endfor %} @@ -245,10 +245,10 @@

Major Projects

{% for p in major_projects %}
{% if p['status'] == "Passed" %} -
{{p['name']}}
+
{{p['name']}}
{% elif p['status'] == "Pending" %}
- {{p['name']}} + {{p['name']}} diff --git a/conditional/templates/new_year.html b/conditional/templates/new_year.html index ab1162a..7ea84e1 100644 --- a/conditional/templates/new_year.html +++ b/conditional/templates/new_year.html @@ -7,7 +7,7 @@

Welcome!

Is it that time of year already? Before we get started, please be careful and ready everything before continuing. Some actions taken in the next few steps can be detrimental if followed in the middle of the year. Once you are ready to proceed, click 'Begin' below.

- Begin + Begin
{% endblock %} diff --git a/conditional/templates/spring_eval_slideshow.html b/conditional/templates/spring_eval_slideshow.html index e87c3a5..044b7bf 100644 --- a/conditional/templates/spring_eval_slideshow.html +++ b/conditional/templates/spring_eval_slideshow.html @@ -18,9 +18,9 @@

{{m['name']}}

{% set committee_meetings_passed = m['committee_meetings'] >= m['req_meetings'] %}
{% if committee_meetings_passed %} - + {% else %} - + {% endif %}

{{m['committee_meetings']}}

Meetings

@@ -30,9 +30,9 @@

{{m['committee_meetings']}}

{% set house_meetings_passed = m['house_meetings_missed']|length == 0 %}
{% if house_meetings_passed %} - + {% else %} - + {% endif %}

{{m['house_meetings_missed']|length}}

Absences

@@ -42,9 +42,9 @@

{{m['house_meetings_missed']|length}}

{% set major_projects_passed = m['major_projects_passed_len'] >= 1 %}
{% if major_projects_passed %} - + {% else %} - + {% endif %}

{{m['major_projects_passed_len']}}

Major Projects

diff --git a/conditional/templates/spring_evals.html b/conditional/templates/spring_evals.html index 9157410..8f4e4e8 100644 --- a/conditional/templates/spring_evals.html +++ b/conditional/templates/spring_evals.html @@ -29,11 +29,11 @@

Spring Evaluations

{{m['uid']}} {% if m['status'] == "Passed" %} - + {% elif m['status'] == "Pending" %} - + {% else %} - + {% endif %}
@@ -49,12 +49,12 @@
{{m['uid']}}
{% if m['committee_meetings'] < m['req_meetings'] %}
- Directorship Meetings + Directorship Meetings {{m['committee_meetings']}} / {{m['req_meetings']}}
{% else %}
- Directorship Meetings + Directorship Meetings {{m['committee_meetings']}} / {{m['req_meetings']}}
{% endif %} @@ -63,12 +63,12 @@
{{m['uid']}}
{% if m['major_project_passed'] %}
- Major Project + Major Project Passed
{% else %}
- Major Project + Major Project None
{% endif %} @@ -77,12 +77,12 @@
{{m['uid']}}
{% if m['house_meetings_missed']|length > 0 %}
- House Meetings Missed + House Meetings Missed {{m['house_meetings_missed']|length}}
{% else %}
- House Meetings Missed + House Meetings Missed {{m['house_meetings_missed']|length}}
{% endif %} @@ -158,11 +158,11 @@

Major Projects

{{p['name']}} {% if p['status'] == "Passed" %} - Passed + Passed {% elif p['status'] == "Pending" %} - Pending + Pending {% else %} - Failed + Failed {% endif %} {{p['description']}} @@ -204,32 +204,32 @@

Major Projects

{% if m['status'] == "Passed" %} - Passed + Passed {% elif m['status'] == "Pending" %} - Pending + Pending {% else %} - Failed + Failed {% endif %} {% if m['committee_meetings'] < m['req_meetings'] %} - {{m['committee_meetings']}} + {{m['committee_meetings']}} {% else %} - {{m['committee_meetings']}} + {{m['committee_meetings']}} {% endif %} {% if m['major_project_passed'] %} - Passed + Passed {% else %} - None + None {% endif %} {% if m['house_meetings_missed']|length == 0 %} - {{m['house_meetings_missed']|length}} + {{m['house_meetings_missed']|length}} {% else %} - {{m['house_meetings_missed']|length}} + {{m['house_meetings_missed']|length}} {% endif %}