Skip to content

Commit b2ad0b6

Browse files
mmcinnestaylormmcinnestaylor
authored
Merge pull request #16 from FSU-ACM/release
Contest admin interface + docs site updates
2 parents 0fedbe3 + ca2edd7 commit b2ad0b6

File tree

3 files changed

+74
-65
lines changed

3 files changed

+74
-65
lines changed

‎docs/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,4 @@ We welcome contributions to the project! Check out the [Contributor's Guide](htt
9090
9191
- [Marlan McInnes-Taylor](https://github.com/mmcinnestaylor) *Creator*
9292
- [Daniel Riley](https://github.com/danielmriley)
93+
- [Preston Horne](https://github.com/prestonmhorne)

‎src/contestadmin/templates/contestadmin/dashboard.html

+42-38
Original file line numberDiff line numberDiff line change
@@ -206,46 +206,50 @@ <h1 class="text-center">Contest Dashboard</h1>
206206
<!-- Discord Control deck end -->
207207

208208
<!-- Volunteer Summary card -->
209-
<div class="card mt-4 mb-3 border-secondary">
210-
<div class="card-header font-weight-bold bg-secondary text-white">
211-
<i class="fa-solid fa-handshake-simple fa-fw"></i> Volunteers
212-
</div>
213-
<div class="card-body overflow-auto">
214-
<div class="row justify-content-center">
215-
<div class="col-12">
216-
<div class="table-responsive">
217-
<table class="table table-sm">
218-
<thead class="thead-light">
219-
<tr>
220-
<th scope="col">Role</th>
221-
<th scope="col">Name</th>
222-
<th scope="col" class="text-center">Checked-in</th>
223-
<th scope="col" class="text-center">Added Courses</th>
224-
225-
</tr>
226-
</thead>
227-
<tbody>
228-
{% for volunteer in volunteers %}
229-
<tr>
230-
<td>{{ volunteer.get_role }}</td>
231-
232-
<td>{{ volunteer.user.get_full_name }}</td>
209+
<div id="accordionVolunteer">
210+
<div class="card mt-4 mb-3 border-secondary">
211+
<div class="card-header font-weight-bold bg-secondary text-white" data-toggle="collapse" data-target="#collapseVolunteer" aria-expanded="true" aria-controls="collapseVolunteer" style="cursor: pointer;">
212+
<i class="fa-solid fa-handshake-simple fa-fw"></i> Volunteers
213+
</div>
214+
<div id="collapseVolunteer" class="collapse" data-parent="#accordionVolunteer">
215+
<div class="card-body overflow-auto">
216+
<div class="row justify-content-center">
217+
<div class="col-12">
218+
<div class="table-responsive">
219+
<table class="table table-sm">
220+
<thead class="thead-light">
221+
<tr>
222+
<th scope="col">Role</th>
223+
<th scope="col">Name</th>
224+
<th scope="col" class="text-center">Checked-in</th>
225+
<th scope="col" class="text-center">Added Courses</th>
226+
227+
</tr>
228+
</thead>
229+
<tbody>
230+
{% for volunteer in volunteers %}
231+
<tr>
232+
<td>{{ volunteer.get_role }}</td>
233+
234+
<td>{{ volunteer.user.get_full_name }}</td>
233235

234-
{% if volunteer.checked_in %}
235-
<td class="text-center">Yes</td>
236-
{% else %}
237-
<td class="text-center">No</td>
238-
{% endif %}
236+
{% if volunteer.checked_in %}
237+
<td class="text-center">Yes</td>
238+
{% else %}
239+
<td class="text-center">No</td>
240+
{% endif %}
239241

240-
{% if volunteer.has_courses %}
241-
<td class="text-center">Yes</td>
242-
{% else %}
243-
<td class="text-center">No</td>
244-
{% endif %}
245-
</tr>
246-
{% endfor %}
247-
</tbody>
248-
</table>
242+
{% if volunteer.has_courses %}
243+
<td class="text-center">Yes</td>
244+
{% else %}
245+
<td class="text-center">No</td>
246+
{% endif %}
247+
</tr>
248+
{% endfor %}
249+
</tbody>
250+
</table>
251+
</div>
252+
</div>
249253
</div>
250254
</div>
251255
</div>

‎src/contestadmin/templates/contestadmin/statistics_dashboard.html

+31-27
Original file line numberDiff line numberDiff line change
@@ -127,34 +127,38 @@ <h1 class="text-center">Contest Statistics</h1>
127127
<!-- LFG Stats Card deck end -->
128128

129129
<!-- Course Summary card -->
130-
<div class="card mt-4 mb-3 border-secondary">
131-
<div class="card-header font-weight-bold bg-secondary text-white">
130+
<div id="accordionCourse">
131+
<div class="card mt-4 mb-3 border-secondary">
132+
<div class="card-header font-weight-bold bg-secondary text-white" data-toggle="collapse" data-target="#collapseCourse" aria-expanded="true" aria-controls="collapseCourse" style="cursor: pointer;">
132133
<i class="fa-solid fa-list-ul fa-fw"></i> Courses
133-
</div>
134-
<div class="card-body overflow-auto">
135-
<div class="row justify-content-center">
136-
<div class="col-12">
137-
<div class="table-responsive">
138-
<table class="table table-sm">
139-
<thead class="thead-light">
140-
<tr>
141-
<th scope="col">Code</th>
142-
<th scope="col">Name</th>
143-
<th scope="col">Instructor</th>
144-
<th scope="col" class="text-center">Students</th>
145-
</tr>
146-
</thead>
147-
<tbody>
148-
{% for course in courses %}
149-
<tr>
150-
<td>{{ course.code }}</td>
151-
<td>{{ course.name }}</td>
152-
<td>{{ course.instructor.last_name }}</td>
153-
<td class="text-center">{{ course.num_registered }}</td>
154-
</tr>
155-
{% endfor %}
156-
</tbody>
157-
</table>
134+
</div>
135+
<div id="collapseCourse" class="collapse" data-parent="#accordionCourse">
136+
<div class="card-body overflow-auto">
137+
<div class="row justify-content-center">
138+
<div class="col-12">
139+
<div class="table-responsive">
140+
<table class="table table-sm">
141+
<thead class="thead-light">
142+
<tr>
143+
<th scope="col">Code</th>
144+
<th scope="col">Name</th>
145+
<th scope="col">Instructor</th>
146+
<th scope="col" class="text-center">Students</th>
147+
</tr>
148+
</thead>
149+
<tbody>
150+
{% for course in courses %}
151+
<tr>
152+
<td>{{ course.code }}</td>
153+
<td>{{ course.name }}</td>
154+
<td>{{ course.instructor.last_name }}</td>
155+
<td class="text-center">{{ course.num_registered }}</td>
156+
</tr>
157+
{% endfor %}
158+
</tbody>
159+
</table>
160+
</div>
161+
</div>
158162
</div>
159163
</div>
160164
</div>

0 commit comments

Comments
 (0)