Skip to content

Commit 99fdca6

Browse files
authored
Show crew list on event checklist view (#613)
* Split crew list into partial * Use new crew list partial on event checklist
1 parent 245a92f commit 99fdca6

File tree

3 files changed

+55
-39
lines changed

3 files changed

+55
-39
lines changed

RIGS/templates/event_detail.html

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
22

33
{% load markdown_tags %}
4-
{% load button from filters %}
54
{% load static %}
65

76
{% block content %}
@@ -57,43 +56,9 @@ <h4>Notes</h4>
5756
</div>
5857
</div>
5958
</div>
60-
{% if event.can_check_in %}
61-
<div class="col-sm-12">
62-
<div class="card mt-3">
63-
<div class="card-header">Crew Record</div>
64-
<div class="table-responsive">
65-
<table class="table table-sm">
66-
<thead>
67-
<tr>
68-
<th scope="col">Name</th>
69-
<th scope="col">Vehicle</th>
70-
<th scope="col">Start Time</th>
71-
<th scope="col">Role</th>
72-
<th scope="col">End Time</th>
73-
<th scope="col">{% if request.user.pk is event.mic.pk %}<a href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span class="fas fa-plus"></span> Add</a>{% endif %}</th>
74-
</tr>
75-
</thead>
76-
<tbody id="crewmembers">
77-
{% for crew in object.crew.all %}
78-
<tr>
79-
<td>{{crew.person}}</td>
80-
<td>{{crew.vehicle|default:"None"}}</td>
81-
<td>{{crew.time}}</td>
82-
<td>{{crew.role}}</td>
83-
<td>{% if crew.end_time %}{{crew.end_time}}{% else %}<span class="text-success fas fa-clock" data-toggle="tooltip" title="This person is currently checked into this event"></span>{% endif %}</td>
84-
<td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}</td>
85-
</tr>
86-
{% empty %}
87-
<tr>
88-
<td colspan="6" class="text-center bg-warning">Apparently this event happened by magic...</td>
89-
</tr>
90-
{% endfor %}
91-
</tbody>
92-
</table>
93-
</div>
94-
</div>
95-
{% endif %}
96-
</div>
59+
60+
{% include 'partials/crew_list.html' %}
61+
9762
{% if not request.is_ajax and perms.RIGS.view_event %}
9863
<div class="col-sm-12 text-right">
9964
{% include 'partials/event_detail_buttons.html' %}

RIGS/templates/hs/event_checklist_detail.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,11 @@
6969
</div>
7070
</div>
7171
</div>
72+
73+
{% include 'partials/crew_list.html' with event=object.event %}
7274
</div>
73-
<div class="col-12 text-right">
75+
76+
<div class="col-12 text-right mt-4">
7477
{% button 'edit' url='ec_edit' pk=object.pk %}
7578
{% button 'view' url='event_detail' pk=object.pk text="Event" %}
7679
<a href="{% url 'event_pt' object.event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{% load button from filters %}
2+
3+
{% if event.can_check_in %}
4+
<div class="col-sm-12">
5+
<div class="card mt-3">
6+
<div class="card-header">Crew Record</div>
7+
<div class="table-responsive">
8+
<table class="table table-sm">
9+
<thead>
10+
<tr>
11+
<th scope="col">Name</th>
12+
<th scope="col">Vehicle</th>
13+
<th scope="col">Start Time</th>
14+
<th scope="col">Role</th>
15+
<th scope="col">End Time</th>
16+
<th scope="col">{% if request.user.pk is event.mic.pk %}<a
17+
href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span
18+
class="fas fa-plus"></span> Add</a>{% endif %}</th>
19+
</tr>
20+
</thead>
21+
<tbody id="crewmembers">
22+
{% for crew in event.crew.all %}
23+
<tr>
24+
<td>{{crew.person}}</td>
25+
<td>{{crew.vehicle|default:"None"}}</td>
26+
<td>{{crew.time}}</td>
27+
<td>{{crew.role}}</td>
28+
<td>{% if crew.end_time %}
29+
{{crew.end_time}}
30+
{% else %}
31+
<span class="text-success fas fa-clock" data-toggle="tooltip"
32+
title="This person is currently checked into this event"></span>{% endif %}
33+
</td>
34+
<td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk ==
35+
request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{%
36+
endif %}{% endif %}</td>
37+
</tr>
38+
{% empty %}
39+
<tr>
40+
<td colspan="6" class="text-center bg-warning">Apparently this event happened by magic...</td>
41+
</tr>
42+
{% endfor %}
43+
</tbody>
44+
</table>
45+
</div>
46+
</div>
47+
</div>
48+
{% endif %}

0 commit comments

Comments
 (0)