Skip to content
Draft
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
24 changes: 14 additions & 10 deletions server/templates/macros.html.j2
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
{% endif %}
</div>
{% endfor %}

{% for seat in room.movable_seats_by_attribute[attr] %}
{% if seat.id and seat.id == highlight_seat_id %}
<span><strong>(YOUR WILL USE A SEAT FROM THIS CATEGORY)</strong></span>
Expand Down Expand Up @@ -102,20 +101,22 @@
{% if loop.first %}
<div class="seat-label" style="left:{{ x + 30 }}px;top:{{ y }}px">{{ seat.name }}</div>
{% endif %}
{% if staff and seat.assignment and not remove_link %}
<a href="{{ url_for('student', exam_student=(exam, seat.assignment.student)) }}">
{% endif %}
{% if seat.id and seat.id == highlight_seat_id %}
{% if seat.id and seat.id == highlight_seat_id %}
{% set class = 's seat highlight' %}
{% elif staff and seat.assignment %}
{% set class = 's seat occupied' %}
{% else %}
{% set class = 's seat' %}
{% endif %}
<div id="{{ seat.id }}" class="{{ class }}" style="left:{{ x }}px;top:{{ y }}px"></div>
{% if staff and seat.assignment and not remove_link %}
</a>
{% endif %}
{% if staff and seat.assignment and not remove_link %}
<a href="{{ url_for('student', exam_student=(exam, seat.assignment.student)) }}" target="_blank">
{% elif staff %}
<a href="{{ url_for('student_single_seat', seat_id=seat.id) }}" target="_blank">
{% endif %}
<div id="{{ seat.id }}" class="{{ class }}" style="left:{{ x }}px;top:{{ y }}px"></div>
{% if staff %}
</a>
{% endif %}
<div class="seat-tooltip mdl-tooltip mdl-tooltip--large" for="{{ seat.id }}">
{{ seat.name }}
{% if show_attributes %}
Expand All @@ -128,7 +129,7 @@
<br>
<img class="photo" src="{{ url_for('student_photo', exam_student=(room.exam, seat.assignment.student)) }}" alt="photo for: {{ seat.assignment.student.name }}"/>
<br>{{ seat.assignment.student.sid }}
{% endif %}
{% endif %} -m
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this -m intentional?

</div>
{% if loop.last %}
<div class="seat-label" style="left:{{ x - 50 }}px;top:{{ y }}px">{{ seat.name }}</div>
Expand All @@ -138,6 +139,9 @@
</div>
</div>
<h6>Back</h6>
{% if staff %}
<h6>Click on any assigned seat (blue) to view student details. Clicking on an unoccupied seat will lead you to a shareable link for that seat.</h6>
{% endif %}
{% endif %}
</div>
{% endif %}
Expand Down
Loading