diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html index 96296546..e70050da 100644 --- a/RIGS/templates/event_detail.html +++ b/RIGS/templates/event_detail.html @@ -1,7 +1,6 @@ {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %} {% load markdown_tags %} -{% load button from filters %} {% load static %} {% block content %} @@ -57,43 +56,9 @@

Notes

- {% if event.can_check_in %} -
-
-
Crew Record
-
- - - - - - - - - - - - - {% for crew in object.crew.all %} - - - - - - - - - {% empty %} - - - - {% endfor %} - -
NameVehicleStart TimeRoleEnd Time{% if request.user.pk is event.mic.pk %} Add{% endif %}
{{crew.person}}{{crew.vehicle|default:"None"}}{{crew.time}}{{crew.role}}{% if crew.end_time %}{{crew.end_time}}{% else %}{% endif %}{% 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%}
Apparently this event happened by magic...
-
-
- {% endif %} -
+ + {% include 'partials/crew_list.html' %} + {% if not request.is_ajax and perms.RIGS.view_event %}
{% include 'partials/event_detail_buttons.html' %} diff --git a/RIGS/templates/hs/event_checklist_detail.html b/RIGS/templates/hs/event_checklist_detail.html index 82e20020..21a37c03 100644 --- a/RIGS/templates/hs/event_checklist_detail.html +++ b/RIGS/templates/hs/event_checklist_detail.html @@ -69,8 +69,11 @@
+ + {% include 'partials/crew_list.html' with event=object.event %} -
+ +
{% button 'edit' url='ec_edit' pk=object.pk %} {% button 'view' url='event_detail' pk=object.pk text="Event" %} +
+
Crew Record
+
+ + + + + + + + + + + + + {% for crew in event.crew.all %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
NameVehicleStart TimeRoleEnd Time{% if request.user.pk is event.mic.pk %} Add{% endif %}
{{crew.person}}{{crew.vehicle|default:"None"}}{{crew.time}}{{crew.role}}{% if crew.end_time %} + {{crew.end_time}} + {% else %} + {% endif %} + {% 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 %}
Apparently this event happened by magic...
+
+
+
+{% endif %}