Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions conditional/templates/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ <h5 class="email">{{username}}@csh.rit.edu</h5>
<div class="panel-heading">
<h3 class="panel-title">Freshman Evaluations
{% if freshman['status'] == "Passed" %}
<span class="pull-right"><i class="bi bi-check-circle green"></i> Passed</span>
<span class="pull-right"><i class="bi bi-check-circle-fill green"></i> Passed</span>
{% elif freshman['status'] == "Pending" %}
<span class="pull-right"><i class="bi bi-hourglass yellow"></i> Pending</span>
<span class="pull-right"><i class="bi bi-hourglass-split yellow"></i> Pending</span>
{% else %}
<span class="pull-right"><i class="bi bi-x-circle red"></i> Failed</span>
<span class="pull-right"><i class="bi bi-x-circle-fill red"></i> Failed</span>
{% endif %}
</h3>
</div>
Expand All @@ -63,26 +63,26 @@ <h3 class="panel-title">Freshman Evaluations
<td class="title">Signatures Missed</td>
<td><span class="pull-right">
{% if freshman['sig_missed'] == 0 %}
<i class="bi bi-check-circle green"></i> None {% else %}
<i class="bi bi-x-circle red"></i> {{freshman['sig_missed']}} {% endif %}
<i class="bi bi-check-circle-fill green"></i> None {% else %}
<i class="bi bi-x-circle-fill red"></i> {{freshman['sig_missed']}} {% endif %}
</span>
</td>
</tr>
<tr>
<td class="title">Directorship Meetings</td>
<td><span class="pull-right">
{% if freshman['committee_meetings'] >= 6 %}
<i class="bi bi-check-circle green"></i> {% else %}
<i class="bi bi-x-circle red"></i> {% endif %} {{freshman['committee_meetings']}} / 6
<i class="bi bi-check-circle-fill green"></i> {% else %}
<i class="bi bi-x-circle-fill red"></i> {% endif %} {{freshman['committee_meetings']}} / 6
</span>
</td>
</tr>
<tr>
<td class="title">House Meetings Missed</td>
<td><span class="pull-right">
{% if freshman['hm_missed'] == 0 %}
<i class="bi bi-check-circle green"></i> None {% else %}
<i class="bi bi-x-circle red"></i> {{ freshman['hm_missed'] }} {% endif %}
<i class="bi bi-check-circle-fill green"></i> None {% else %}
<i class="bi bi-x-circle-fill red"></i> {{ freshman['hm_missed'] }} {% endif %}
</span>
</td>
</tr>
Expand Down Expand Up @@ -111,11 +111,11 @@ <h3 class="panel-title">Freshman Evaluations
<div class="panel-heading">
<h3 class="panel-title">Membership Evaluations
{% if spring['status'] == "Passed" %}
<span class="pull-right"><i class="bi bi-check-circle green"></i> Passed</span>
<span class="pull-right"><i class="bi bi-check-circle-fill green"></i> Passed</span>
{% elif spring['status'] == "Failed" %}
<span class="pull-right"><i class="bi bi-x-circle red"></i> Failed</span>
<span class="pull-right"><i class="bi bi-x-circle-fill red"></i> Failed</span>
{% elif active %}
<span class="pull-right"><i class="bi bi-hourglass yellow"></i> Pending</span>
<span class="pull-right"><i class="bi bi-hourglass-split yellow"></i> Pending</span>
{% endif %}
</h3>
</div>
Expand All @@ -141,16 +141,16 @@ <h3 class="panel-title">Membership Evaluations
<td class="title">Directorship Meetings</td>
<td><span class="pull-right">
{% if spring['committee_meetings'] >= spring['req_meetings'] %}
<i class="bi bi-check-circle green"></i> {% else %}
<i class="bi bi-x-circle red"></i> {% endif %} {{ spring['committee_meetings'] }} / {{ spring['req_meetings'] }}</span>
<i class="bi bi-check-circle-fill green"></i> {% else %}
<i class="bi bi-x-circle-fill red"></i> {% endif %} {{ spring['committee_meetings'] }} / {{ spring['req_meetings'] }}</span>
</td>
</tr>
<tr>
<td class="title">House Meetings Missed</td>
<td><span class="pull-right">
{% if spring['hm_missed'] == 0 %}
<i class="bi bi-check-circle green"></i> None {% else %}
<i class="bi bi-x-circle red"></i> {{spring['hm_missed']}}</span>
<i class="bi bi-check-circle-fill green"></i> None {% else %}
<i class="bi bi-x-circle-fill red"></i> {{spring['hm_missed']}}</span>
{% endif %}
</span>
</td>
Expand All @@ -160,9 +160,9 @@ <h3 class="panel-title">Membership Evaluations
<td>
<span class="pull-right">
{% if spring['mp_status'] == "Passed" %}
<i class="bi bi-check-circle green"></i> Passed {% elif spring['mp_status'] == "Pending" %}
<i class="bi bi-hourglass yellow"></i> Pending {% else %}
<i class="bi bi-x-circle red"></i> None {% endif %}
<i class="bi bi-check-circle-fill green"></i> Passed {% elif spring['mp_status'] == "Pending" %}
<i class="bi bi-hourglass-split yellow"></i> Pending {% else %}
<i class="bi bi-x-circle-fill red"></i> None {% endif %}
</span>
</td>
</tr>
Expand Down Expand Up @@ -193,9 +193,9 @@ <h3 class="panel-title">Conditionals</h3>
<td>{{c['description']}}</td>
<td>
{% if c['status'] == "Passed" %}
<i style="padding-left:15px; padding-top:15px;" class="bi bi-check-circle green"></i> {% elif c['status'] == "Pending" %}
<i class="bi bi-hourglass yellow"></i> <span class="mobile-hide">Pending</span> {% else %}
<i class="bi bi-x-circle red"></i> <span class="mobile-hide">Failed</span> {% endif %}
<i style="padding-left:15px; padding-top:15px;" class="bi bi-check-circle-fill green"></i> {% elif c['status'] == "Pending" %}
<i class="bi bi-hourglass-split yellow"></i> <span class="mobile-hide">Pending</span> {% else %}
<i class="bi bi-x-circle-fill red"></i> <span class="mobile-hide">Failed</span> {% endif %}
</td>
</tr>
{% endfor %}
Expand Down Expand Up @@ -245,10 +245,10 @@ <h3 class="panel-title">Major Projects</h3>
{% for p in major_projects %}
<div class="mp-container">
{% if p['status'] == "Passed" %}
<div class="title"><i class="bi bi-check-circle green"></i> {{p['name']}}</div>
<div class="title"><i class="bi bi-check-circle-fill green"></i> {{p['name']}}</div>
{% elif p['status'] == "Pending" %}
<div class="title">
<i class="bi bi-hourglass yellow"></i> {{p['name']}}
<i class="bi bi-hourglass-split yellow"></i> {{p['name']}}
<button class="btn-xs btn-danger pull-right" data-module="majorProjectStatus" data-id="{{p['id']}}">
<i class="bi bi-trash3"></i>
Delete
Expand Down
16 changes: 8 additions & 8 deletions conditional/templates/intro_eval_slideshow.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ <h1 class="member-name">{{m['name']}}</h1>
{% set packet_passed = m['signatures_missed'] == 0 %}
<div class="item{% if packet_passed %} passed{% endif %}" >
{% if packet_passed %}
<i class="bi bi-check-circle passed" aria-hidden="true"></i>
<i class="bi bi-check-circle-fill passed" aria-hidden="true"></i>
{% else %}
<i class="bi bi-x-circle" aria-hidden="true"></i>
<i class="bi bi-x-circle-fill" aria-hidden="true"></i>
{% endif %}
<h3>{{m['signatures_missed']}}</h3>
<p>Signatures Missed</p>
Expand All @@ -31,9 +31,9 @@ <h3>{{m['signatures_missed']}}</h3>
{% set committee_meetings_passed = m['committee_meetings'] >= 6 %}
<div class="item{% if committee_meetings_passed %} passed{% endif %}" >
{% if committee_meetings_passed %}
<i class="bi bi-check-circle passed" aria-hidden="true"></i>
<i class="bi bi-check-circle-fill passed" aria-hidden="true"></i>
{% else %}
<i class="bi bi-x-circle" aria-hidden="true"></i>
<i class="bi bi-x-circle-fill" aria-hidden="true"></i>
{% endif %}
<h3>{{m['committee_meetings']}}</h3>
<p>Meetings</p>
Expand All @@ -43,9 +43,9 @@ <h3>{{m['committee_meetings']}}</h3>
{% set house_meetings_passed = m['house_meetings_missed']|length == 0 %}
<div class="item{% if house_meetings_passed %} passed{% endif %}">
{% if house_meetings_passed %}
<i class="bi bi-check-circle passed" aria-hidden="true"></i>
<i class="bi bi-check-circle-fill passed" aria-hidden="true"></i>
{% else %}
<i class="bi bi-x-circle" aria-hidden="true"></i>
<i class="bi bi-x-circle-fill" aria-hidden="true"></i>
{% endif %}
<h3>{{m['house_meetings_missed']|length}}</h3>
<p>Absences</p>
Expand All @@ -55,9 +55,9 @@ <h3>{{m['house_meetings_missed']|length}}</h3>
{% set technical_seminars_passed = m['technical_seminars']|length >= 2 %}
<div class="item{% if technical_seminars_passed %} passed{% endif %}">
{% if technical_seminars_passed %}
<i class="bi bi-check-circle passed" aria-hidden="true"></i>
<i class="bi bi-check-circle-fill passed" aria-hidden="true"></i>
{% else %}
<i class="bi bi-x-circle" aria-hidden="true"></i>
<i class="bi bi-x-circle-fill" aria-hidden="true"></i>
{% endif %}
<h3>{{m['technical_seminars']|length}}</h3>
<p>Seminars</p>
Expand Down
Loading