Merge branch 'master' into training

# Conflicts:
#	templates/base.html

RIGS/models.py

@@ -347,10 +347,13 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def display_id(self):
-        if self.is_rig:
-            return str("N%05d" % self.pk)
+        if self.pk:
+            if self.is_rig:
+                return str("N%05d" % self.pk)
+            else:
+                return self.pk
         else:
-            return self.pk
+            return "????"
 
     # Calculated values
     """

RIGS/rigboard.py

@@ -151,6 +151,7 @@ class EventDuplicate(EventUpdate):
         # Clear checked in by if it's a dry hire
         if new.dry_hire is True:
             new.checked_in_by = None
+            new.collector = None
 
         # Remove all the authorisation information from the new event
         new.auth_request_to = ''

RIGS/templates/event_checklist_detail.html

@@ -114,7 +114,7 @@
 <div class="card  mb-3">
     <div class="card-header">Power {% include 'partials/event_size.html' with object=object.event.riskassessment %}</div>
     <div class="card-body">
-        {% if event.riskassessment.event_size == 0 %}
+        {% if object.event.riskassessment.event_size == 0 %}
         <dl class="row">
             <dt class="col-10">{{ object|help_text:'rcds'|safe }}</dt>
             <dd class="col-2">

RIGS/templates/eventauthorisation_request.html

@@ -1,24 +1,48 @@
 {% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
+{% load static %}
+{% load button from filters %}
 
 {% block title %}Request Authorisation{% endblock %}
 
+{% block js %}
+    <script src="{% static 'js/tooltip.js' %}"></script>
+    <script src="{% static 'js/popover.js' %}"></script>
+    <script src="{% static 'js/clipboard.min.js' %}"></script>
+    <script>
+        var clipboard = new ClipboardJS('.btn');
+
+        clipboard.on('success', function(e) {
+            $(e.trigger).popover('show');
+            window.setTimeout(function () {$(e.trigger).popover('hide')}, 3000);
+            e.clearSelection();
+        });
+    </script>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col-sm-12">
-            <div class="alert alert-warning">
+            <div class="alert alert-warning pb-0">
                 <h1>Send authorisation request email.</h1>
-                <p>Pressing send will email the address provided. Please triple check everything before continuing.</p>
+                <p>Pressing send will email the address provided. <strong>Please triple check everything before continuing.</strong></p>
             </div>
 
-            <div class="alert alert-info">
+            <div class="alert alert-info pb-0">
+                {% if object.person.email or object.organisation.email %}
                 <dl class="dl-horizontal">
+                    {% if object.person.email %}
                     <dt>Person Email</dt>
-                    <dd>{{ object.person.email }}</dd>
-
+                    <dd><span id="person-email">{{ object.person.email }}</span>{% button 'copy' id='#person-email' %}</dd>
+                    {% endif %}
+                    {% if object.organisation.email %}
                     <dt>Organisation Email</dt>
-                    <dd>{{ object.organisation.email }}</dd>
+                    <dd><span id="org-email">{{ object.organisation.email }}</span>{% button 'copy' id='#org-email' %}</dd>
+                    {% endif %}
                 </dl>
+                {% else %}
+                <p>No email addresses saved to the client &#3232;_&#3232;</p>
+                {% endif %}
             </div>
             <form action="{{ form.action|default:request.path }}" method="POST" id="auth-request-form">
                 {% csrf_token %}

RIGS/templates/partials/client_eventdetails.html

@@ -46,15 +46,12 @@
         <div class="card-header">Event Info</div>
         <div class="card-body">
             <dl class="row">
+                {% if event.venue %}
                 <dt class="col-sm-5">Event Venue</dt>
                 <dd class="col-sm-7">
-                    {% if object.venue %}
-                        <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                            {{ object.venue }}
-                        </a>
-                    {% endif %}
+                {{ event.venue }}
                 </dd>
-
+                {% endif %}
                 <dt class="col-sm-5">Status</dt>
                 <dd class="col-sm-7">{{ event.get_status_display }}</dd>
 

RIGS/templates/partials/item_table.html

@@ -23,7 +23,7 @@
 		</thead>
 		<tbody id="item-table-body">
 			{% for item in object.items.all %}
-				{% include 'item_row.html' %}
+				{% include 'partials/item_row.html' %}
 			{% endfor %}
 		</tbody>
         {% if auth or perms.RIGS.view_event %}

RIGS/templatetags/filters.py

@@ -212,6 +212,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
         clazz += " btn-primary "
         icon = "fa-plus"
         text = "New"
+    elif type == 'copy':
+        return {'copy': True, 'id': id, 'style': style}
     elif type == 'search':
         return {'submit': True, 'class': 'btn-info', 'icon': 'fa-search', 'text': 'Search', 'id': id, 'style': style}
     elif type == 'submit':