Templating improvements to RA/EC stuff

RIGS/templates/event_checklist_detail.html

@@ -225,6 +225,7 @@
         <div class="col-12 text-right">
             <a href="{% url 'ec_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
                 class="hidden-xs">Edit</span></a>
+            {{ object.review_string|safe }}
         </div>
         <div class="col-12 text-right">
             {% include 'partials/last_edited.html' with target="eventchecklist_history" %}

RIGS/templates/event_checklist_list.html

@@ -46,11 +46,7 @@
                         {# Buttons #}
                         <td>
                             <a class="btn btn-primary" href="{% url 'ra_detail' object.pk %}">View</a>
-                            {% if object.reviewed_by %}
-                            Reviewed by <a href="{% url 'profile_detail' object.reviewed_by.pk %}">{{ object.reviewed_by }}</a> at {{ object.reviewed_at }}
-                            {% else %}
-                            <a class="btn btn-success my-2" href="{% url 'ra_review' object.pk %}">Mark Reviewed</a>
-                            {% endif %}
+                            {{ object.review_string|safe }}
                         </td>
                     </tr>
                     {% empty %}

RIGS/templates/event_detail.html

@@ -79,7 +79,7 @@
     {% endif %}
     {% if event.is_rig and event.internal and perms.RIGS.view_event %}
     <div class="col-sm-12 py-3">
-        { include 'partials/auth_details.html' %}
+        {% include 'partials/auth_details.html' %}
     <div>
     {% endif %}
     {% if not request.is_ajax and perms.RIGS.view_event %}

RIGS/templates/hs_list.html

@@ -17,35 +17,16 @@
         <tbody>
         {% for event in object_list %}
         <tr id="event_row">
-            <th scope="row" id="event_number">{{ event.pk }} | {{ event.name }}</th>
+            <th scope="row" id="event_number"><a href="{% url 'event_detail' event.pk %}">{{ event }}</a></th>
             <!--Dates-->
             <td id="event_dates">
-                <div><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></div>
+                <span><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></span>
                 {% if event.end_date and event.end_date != event.start_date %}
-                    <div><strong>{{ event.end_date|date:"D d/m/Y"  }}</strong></div>
-                {% endif %}
-            </td>
-            <td>
-                {% if event.riskassessment %}
-                    <a class="btn btn-primary" href="{% url 'ra_detail' event.riskassessment.pk %}">View</a>
-                    {% if event.riskassessment.reviewed_by %}
-                    Reviewed by <a href="{% url 'profile_detail' event.riskassessment.reviewed_by.pk %}">{{ event.riskassessment.reviewed_by }}</a> at {{ event.riskassessment.reviewed_at }}
-                    {% else %}
-                    <a class="btn btn-success my-2" href="{% url 'ra_review' event.riskassessment.pk %}">Mark Reviewed</a>
-                    {% endif %}
-                {% else %}
-                    <a href="{% url 'event_ra' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
-                    class="hidden-xs">Create Risk Assessment</span></a>
-                {% endif %}
-            </td>
-            <td>
-                {% if event.eventchecklist %}
-                    <a class="btn btn-primary" href="{% url 'ec_detail' event.eventchecklist.pk %}">View</a>
-                {% else %}
-                    <a href="{% url 'event_ec' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
-                    class="hidden-xs">Create Event Checklist</span></a>
+                    <br><span><strong>{{ event.end_date|date:"D d/m/Y"  }}</strong></span>
                 {% endif %}
             </td>
+            <td>{% include 'partials/hs_status.html' with event=event object=event.riskassessment view='ra_detail' edit='ra_edit' create='event_ra' %}</td>
+            <td>{% include 'partials/hs_status.html' with event=event object=event.eventchecklist view='ec_detail' edit='ec_edit' create='event_ec' %}</td>
         </tr>
         {% empty %}
         <tr class="bg-warning text-dark">

RIGS/templates/partials/hs_details.html

@@ -6,23 +6,9 @@
     <div class="card-header">Health &amp; Safety Details</div>
     <div class="card-body">
         <h5>Risk Assessment:</h5>
-        {% if event.riskassessment %}
-            <span class="fas fa-check text-success"></span> Completed <div class="btn-group"><a href="{% url 'ra_detail' event.riskassessment.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> <span
-                class="hidden-xs">View</span><a href="{% url 'ra_edit' event.riskassessment.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span> <span
-                class="hidden-xs">Edit</span></a></div>
-        {% else %}
-            <a href="{% url 'event_ra' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
-                class="hidden-xs">Create Risk Assessment</span></a>
-        {% endif%}
+        {% 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>
-        {% if event.eventchecklist %}
-        <span class="fas fa-check text-success"></span> Completed <div class="btn-group"><a href="{% url 'ec_detail' event.eventchecklist.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> <span
-                class="hidden-xs">View</span><a href="{% url 'ec_edit' event.eventchecklist.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span> <span
-                class="hidden-xs">Edit</span></a></div>
-        {% else %}
-            <a href="{% url 'event_ec' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
-                class="hidden-xs">Create Event Checklist</span></a>
-        {% endif%}
+        {% include 'partials/hs_status.html' with event=event object=event.eventchecklist view='ec_detail' edit='ec_edit' create='event_ec' %}
     </div>
 </div>

RIGS/templates/partials/hs_status.html

@@ -0,0 +1,12 @@
+{% load to_class_name from filters %}
+{% if object.pk != None %}
+{#<span class="badge badge-success my-3"><span class="fas fa-check"></span> Completed</span><br/>#}
+<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>
+</div>
+{{ object.review_string|safe }}
+{% else %}
+<a href="{% url create event.pk %}" class="btn btn-info"><span class="fas fa-paperclip"></span> <span
+            class="hidden-xs">Create</span></a>
+{% endif %}

RIGS/templates/risk_assessment_detail.html

@@ -149,6 +149,7 @@
     <div class="col-12 text-right">
         <a href="{% url 'ra_edit' object.pk %}" class="btn btn-warning my-3"><span class="fas fa-edit"></span> <span
             class="hidden-xs">Edit</span></a>
+        {{ object.review_string|safe }}
     </div>
     <div class="col-12 text-right">
         {% include 'partials/last_edited.html' with target="riskassessment_history" %}

RIGS/templates/risk_assessment_list.html

@@ -84,11 +84,7 @@
                         {# Buttons #}
                         <td>
                             <a class="btn btn-primary" href="{% url 'ra_detail' object.pk %}">View</a>
-                            {% if object.reviewed_by %}
-                            Reviewed by <a href="{% url 'profile_detail' object.reviewed_by.pk %}">{{ object.reviewed_by }}</a> at {{ object.reviewed_at }}
-                            {% else %}
-                            <a class="btn btn-success my-2" href="{% url 'ra_review' object.pk %}">Mark Reviewed</a>
-                            {% endif %}
+                            {{ object.review_string|safe }}
                         </td>
                     </tr>
                     {% empty %}