Skip to content

Commit 276b093

Browse files
mbillowmbillow
authored
Merge pull request #162 from ComputerScienceHouse/eval-table
Table Views for Evals Pages
2 parents ecdc5b4 + c54caae commit 276b093

File tree

3 files changed

+192
-0
lines changed

3 files changed

+192
-0
lines changed

‎conditional/templates/intro_evals.html

+95
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
{% endblock %}
55
{% block body %}
66
<div class="container main">
7+
<div class="row mobile-hide">
8+
<div class="col-sm-10">
9+
<h3 class="page-title">Intro Evaluations</h3>
10+
</div>
11+
<div class="col-sm-2">
12+
<div class="material-switch align-center">
13+
<div class="switch-label">Table View</div>
14+
<input id="evalToggle" name="evalToggle" type="checkbox" data-module="evalToggle"/>
15+
<label for="evalToggle" class="label-primary"></label>
16+
</div>
17+
</div>
18+
</div>
19+
<div id="eval-blocks">
720
{% if members|length > 0 %}
821
{% for m in members %}
922
<div class="panel panel-default">
@@ -169,8 +182,90 @@ <h4>Other Comments</h4>
169182

170183
</div>
171184
{% endfor %}
185+
</div>
172186
{% else %}
173187
<div class="alert alert-info" role="alert"><span class="glyphicon glyphicon-info-sign white" style="padding-right:5px"></span> There are currently no active intro members.</div>
174188
{% endif %}
189+
190+
<div id="eval-table" style="display:none;">
191+
<div class="panel panel-default">
192+
<div class="panel-body table-fill">
193+
<div class="panel-body table-fill">
194+
<div class="table-responsive">
195+
<table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-sort-column="3" data-sort-order="asc" data-length-changable="true" data-paginated="false">
196+
<thead>
197+
<tr>
198+
<th>Name</th>
199+
<th>Result</th>
200+
<th>Meetings</th>
201+
<th>Signatures Missed</th>
202+
<th>Freshman Project</th>
203+
<th>Technical Seminars</th>
204+
<th>House Meetings Missed</th>
205+
</tr>
206+
</thead>
207+
<tbody>
208+
{% for m in members %}
209+
<tr>
210+
<td>
211+
<img class="eval-user-img" alt="{{m['uid']}}" src="https://profiles.csh.rit.edu/image/{{m['uid']}}" width="30" height="30" /> {{m['name']}} ({{m['uid']}})
212+
</td>
213+
<td>
214+
{% if m['status'] == "Passed" %}
215+
<span class="glyphicon glyphicon-ok green"></span> Passed
216+
{% elif m['status'] == "Pending" %}
217+
<span class="glyphicon glyphicon-hourglass yellow"></span> Pending
218+
{% else %}
219+
<span class="glyphicon glyphicon-remove red"></span> Failed
220+
{% endif %}
221+
</td>
222+
<td>
223+
{% if m['committee_meetings'] < 10 %}
224+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['committee_meetings']}}
225+
{% else %}
226+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['committee_meetings']}}
227+
{% endif %}
228+
</td>
229+
<td>
230+
{% if m['signatures_missed'] == 0 %}
231+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{ m['signatures_missed'] }}
232+
{% elif m['signatures_missed'] > 0 %}
233+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{ m['signatures_missed'] }}
234+
{% else %}
235+
<span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span> Pending
236+
{% endif %}
237+
</td>
238+
<td>
239+
{% if m['freshman_project'] == "Passed" %}
240+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> Passed
241+
{% elif m['freshman_project'] == "Failed" %}
242+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> Failed
243+
{% else %}
244+
<span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span> Pending
245+
{% endif %}
246+
</td>
247+
<td>
248+
{% if m['technical_seminars']|length >= 2 %}
249+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['technical_seminars']|length}}
250+
{% else %}
251+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['technical_seminars']|length}}
252+
{% endif %}
253+
</td>
254+
<td>
255+
{% if m['house_meetings_missed']|length == 0 %}
256+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['house_meetings_missed']|length}}
257+
{% else %}
258+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['house_meetings_missed']|length}}
259+
{% endif %}
260+
</td>
261+
</tr>
262+
{% endfor %}
263+
</tbody>
264+
</table>
265+
</div>
266+
</div>
267+
</div>
268+
</div>
269+
</div>
175270
</div>
176271
{% endblock %}

‎conditional/templates/spring_evals.html

+74
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
{% endblock %}
55
{% block body %}
66
<div class="container main">
7+
<div class="row mobile-hide">
8+
<div class="col-sm-10">
9+
<h3 class="page-title">Spring Evaluations</h3>
10+
</div>
11+
<div class="col-sm-2">
12+
<div class="material-switch align-center">
13+
<div class="switch-label">Table View</div>
14+
<input id="evalToggle" name="evalToggle" type="checkbox" data-module="evalToggle"/>
15+
<label for="evalToggle" class="label-primary"></label>
16+
</div>
17+
</div>
18+
</div>
19+
<div id="eval-blocks">
720
{% for m in members %}
821
<div class="panel panel-default">
922
<div class="panel-body eval-panel">
@@ -163,5 +176,66 @@ <h4>Major Projects</h4>
163176

164177

165178
{% endfor %}
179+
</div>
180+
<div id="eval-table" style="display:none;">
181+
<div class="panel panel-default">
182+
<div class="panel-body table-fill">
183+
<div class="panel-body table-fill">
184+
<div class="table-responsive">
185+
<table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-sort-column="4" data-sort-order="asc" data-length-changable="true" data-paginated="false">
186+
<thead>
187+
<tr>
188+
<th>Name</th>
189+
<th>Result</th>
190+
<th>Meetings</th>
191+
<th>Major Project</th>
192+
<th>House Meetings Missed</th>
193+
</tr>
194+
</thead>
195+
<tbody>
196+
{% for m in members %}
197+
<tr>
198+
<td>
199+
<img class="eval-user-img" alt="{{m['uid']}}" src="https://profiles.csh.rit.edu/image/{{m['uid']}}" width="30" height="30" /> {{m['name']}} ({{m['uid']}})
200+
</td>
201+
<td>
202+
{% if m['status'] == "Passed" %}
203+
<span class="glyphicon glyphicon-ok green"></span> Passed
204+
{% elif m['status'] == "Pending" %}
205+
<span class="glyphicon glyphicon-hourglass yellow"></span> Pending
206+
{% else %}
207+
<span class="glyphicon glyphicon-remove red"></span> Failed
208+
{% endif %}
209+
</td>
210+
<td>
211+
{% if m['committee_meetings'] < 25 %}
212+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['committee_meetings']}}
213+
{% else %}
214+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['committee_meetings']}}
215+
{% endif %}
216+
</td>
217+
<td>
218+
{% if m['major_project_passed'] %}
219+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> Passed
220+
{% else %}
221+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> None
222+
{% endif %}
223+
</td>
224+
<td>
225+
{% if m['house_meetings_missed']|length == 0 %}
226+
<span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['house_meetings_missed']|length}}
227+
{% else %}
228+
<span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> {{m['house_meetings_missed']|length}}
229+
{% endif %}
230+
</td>
231+
</tr>
232+
{% endfor %}
233+
</tbody>
234+
</table>
235+
</div>
236+
</div>
237+
</div>
238+
</div>
239+
</div>
166240
</div>
167241
{% endblock %}

‎frontend/javascript/modules/evalToggle.js

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
export default class EvalToggle {
2+
constructor(toggle) {
3+
this.toggle = toggle;
4+
5+
this.render();
6+
}
7+
8+
render() {
9+
this.toggle.addEventListener('click', () => {
10+
this._toggleTable();
11+
});
12+
}
13+
14+
_toggleTable() {
15+
if (this.toggle.checked) {
16+
$("#eval-blocks").hide();
17+
$("#eval-table").show();
18+
} else {
19+
$("#eval-table").hide();
20+
$("#eval-blocks").show();
21+
}
22+
}
23+
}

0 commit comments

Comments
 (0)