arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-31 12:22:14 +00:00
Code Issues Projects Releases Wiki Activity

Allow multiple event checklists per event

Browse Source 
TODO: Status chip now needs rethinking
This commit is contained in:
FreneticScribbler
2020-09-29 17:59:03 +01:00
parent 0117002b01
commit 813b1dac85
8 changed files with 129 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RIGS/templates/hs_list.html
View File

@@ -1,5 +1,6 @@
{% extends 'base_rigs.html' %}
{% load paginator from filters %}
{% load button from filters %}
{% block title %}H&S Overview{% endblock %}
@@ -11,7 +12,7 @@
<th scope="col">Event</th>
<th scope="col">Dates</th>
<th scope="col">RA</th>
<th scope="col">Checklist</th>
<th scope="col">Checklists</th>
</tr>
</thead>
<tbody>
@@ -26,7 +27,14 @@
{% endif %}
</td>
<td>{% include 'partials/hs_status.html' with event=event object=event.riskassessment view='ra_detail' edit='ra_edit' create='event_ra' review='ra_review' perm=perms.RIGS.review_riskassessment %}</td>
<td>{% include 'partials/hs_status.html' with event=event object=event.eventchecklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}</td>
<td>
{% for checklist in event.checklists.all %}
{% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}
<br>
{% endfor %}
<a href="{% url 'event_ec' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
class="hidden-xs">Create</span></a>
</td>
</tr>
{% empty %}
<tr class="bg-warning text-dark">

5
RIGS/templates/partials/event_status.html
View File

@@ -19,8 +19,9 @@
{% endif %}
<br>
{% if not event.dry_hire %}
{% if event.eventchecklist %}
<span class="badge badge-success">Checklist: <span class="fas fa-check"></span>{%if event.eventchecklist.reviewed_by%}<span class="fas fa-check"></span>{%endif%}</span>
{% if event.hs_done %}
{# TODO Display status of all checklists #}
<span class="badge badge-success">Checklist: <span class="fas fa-check"></span></span>
{% else %}
<span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span>
{% endif %}

11
RIGS/templates/partials/hs_details.html
View File

@@ -1,4 +1,4 @@
<div class="card {% if event.riskassessment and event.eventchecklist %}
<div class="card {% if event.hs_done %}
border-success
{% else %}
border-warning
@@ -8,7 +8,12 @@
<h5>Risk Assessment:</h5>
{% include 'partials/hs_status.html' with event=event object=event.riskassessment view='ra_detail' edit='ra_edit' create='event_ra' %}
<hr>
<h5>Event Checklist:</h5>
{% include 'partials/hs_status.html' with event=event object=event.eventchecklist view='ec_detail' edit='ec_edit' create='event_ec' %}
<h5>Event Checklists:</h5>
{% for checklist in event.checklists.all %}
{% include 'partials/hs_status.html' with event=event object=checklist view='ec_detail' edit='ec_edit' create='event_ec' review='ec_review' perm=perms.RIGS.review_eventchecklist %}
<br/>
{% endfor %}
<a href="{% url 'event_ec' event.pk %}" class="btn btn-info mt-2"><span class="fas fa-paperclip"></span> <span
class="hidden-xs">Create</span></a>
</div>
</div>

5
RIGS/templates/partials/hs_status.html
View File

@@ -1,7 +1,8 @@
{% load button from filters %}
{% if object.pk != None %}
<div class="btn-group">
<a href="{% url view object.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> <span class="hidden-xs"> View</span>
<a href="{% url edit object.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span><span class="hidden-xs"> Edit</span></a>
{% button view object.pk 'view' %}
{% button edit object.pk 'edit' %}
</div>
{% if object.reviewed_by %}
<span class='badge badge-success py-2'>Reviewed by <a href='{% url 'profile_detail' object.reviewed_by.pk %}'>{{object.reviewed_by}}</a> at {{object.reviewed_at}}</span>