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.pk:
             if self.is_rig:
                 return str("N%05d" % self.pk)
             else:
                 return self.pk
+        else:
+            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 %}
+                {{ event.venue }}
-                        <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
-                            {{ object.venue }}
-                        </a>
-                    {% endif %}
                 </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':

assets/templates/partials/purchasedetails_form.html

@@ -8,12 +8,27 @@
     {% if create or edit or duplicate %}
     <div class="form-group" id="purchased-from-group">
       <label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
+      <div class="row">
+          <div class="col">
               <select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
                 {% if object.purchased_from %}
                 <option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
                 {% endif %}
               </select>
           </div>
+          <div class="col align-right">
+            <div class="btn-group">
+                <a href="{% url 'supplier_create' %}" class="btn btn-success modal-href"
+                   data-target="#{{ form.purchased_from.id_for_label }}">
+                    <span class="fas fa-plus"></span>
+                </a>
+                <a {% if form.supplier.value %}href="{% url 'supplier_update' form.purchased_from.value %}"{% endif %} class="btn btn-warning modal-href" id="{{ form.purchased_from.id_for_label }}-update" data-target="#{{ form.purchased_from.id_for_label }}">
+                    <span class="fas fa-edit"></span>
+                </a>
+            </div>
+          </div>
+      </div>
+    </div>
 
     <div class="form-group">
       <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>

assets/tests/pages.py

@@ -70,7 +70,7 @@ class AssetList(BasePage):
 
 
 class AssetForm(FormPage):
-    _purchased_from_select_locator = (By.CSS_SELECTOR, 'div#purchased-from-group>div.bootstrap-select')
+    _purchased_from_select_locator = (By.XPATH, '//div[@id="purchased-from-group"]/div/div/div')
     _parent_select_locator = (By.CSS_SELECTOR, 'div#parent-group>div.bootstrap-select')
     form_items = {
         'asset_id': (regions.TextBox, (By.ID, 'id_asset_id')),

gulpfile.js

@@ -3,7 +3,7 @@
 var gulp = require('gulp');
 
 const terser = require('gulp-uglify');
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require('node-sass'));
 const flatten = require('gulp-flatten');
 const autoprefixer = require('autoprefixer')
 const postcss = require('gulp-postcss')
@@ -15,8 +15,6 @@ const cssnano = require('cssnano');
 const con = require('gulp-concat');
 const gulpif = require('gulp-if');
 
-sass.compiler = require('node-sass');
-
 function fonts(done) {
     return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*')
         .pipe(gulp.dest('pipeline/built_assets/fonts'))

package.json

@@ -5,35 +5,36 @@
   "author": "Tom Price",
   "license": "Custom",
   "dependencies": {
-    "@forevolve/bootstrap-dark": "^1.0.0-alpha.1075",
+    "@forevolve/bootstrap-dark": "^2.1.0",
-    "@fortawesome/fontawesome-free": "^5.15.2",
+    "@fortawesome/fontawesome-free": "^5.15.4",
     "ajax-bootstrap-select": "^1.4.5",
-    "autocompleter": "^6.0.3",
+    "autocompleter": "^6.1.2",
-    "autoprefixer": "^9.8.0",
+    "autoprefixer": "^10.4.0",
     "bootstrap": "^4.5.2",
     "bootstrap-select": "^1.13.17",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.8",
-    "cssnano": "^4.1.10",
+    "cssnano": "^5.0.13",
     "flatpickr": "^4.6.6",
-    "fullcalendar": "^5.3.2",
+    "fullcalendar": "^5.10.1",
     "gulp": "^4.0.2",
     "gulp-concat": "^2.6.1",
     "gulp-flatten": "^0.4.0",
     "gulp-if": "^3.0.0",
-    "gulp-postcss": "^8.0.0",
+    "gulp-postcss": "^9.0.1",
-    "gulp-sass": "^4.1.0",
+    "gulp-sass": "^5.0.0",
-    "gulp-sourcemaps": "^2.6.5",
+    "gulp-sourcemaps": "^3.0.0",
     "gulp-uglify": "^3.0.2",
-    "html5sortable": "^0.10.0",
+    "html5sortable": "^0.13.3",
-    "jquery": "^3.5.1",
+    "jquery": "^3.6.0",
-    "konami": "^1.6.2",
+    "konami": "^1.6.3",
     "moment": "^2.27.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^7.0.0",
     "popper.js": "^1.16.1",
-    "uglify-js": "^3.12.6"
+    "postcss": "^8.4.5",
+    "uglify-js": "^3.14.5"
   },
   "devDependencies": {
-    "browser-sync": "^2.26.12"
+    "browser-sync": "^2.27.7"
   },
   "scripts": {
     "gulp": "gulp",

templates/base.html

@@ -33,7 +33,7 @@
 {% block navbar %}
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
   <div class="container">
-      <a class="navbar-brand" style="position: absolute; left:0.5em; top: 2px;" href="{% if request.user.is_authenticated %}https://members.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
+      <a class="navbar-brand" style="position: absolute; left:0.5em; top: 2px;" href="{% if request.user.is_authenticated %}https://rigs.nottinghamtec.co.uk{%else%}https://nottinghamtec.co.uk{%endif%}">
         <img src="{% static 'imgs/logo.webp' %}" width="40" height="40" alt="TEC's Logo: Serif 'TEC' vertically next to a blue box with the words 'PA and Lighting', surrounded by graduated rings" id="logo">
       </a>
       {% block titleheader %}

templates/partials/button.html

@@ -2,6 +2,8 @@
 <button type="submit" class="btn {{ class }}" title="{{ text }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></button>
 {% elif pk %}
 <a href="{% url target pk %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%} {% if text == 'Print' %}target="_blank"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
+{% elif copy %}
+<button class="btn btn-secondary btn-sm mr-1" data-clipboard-target="{{id}}" data-content="Copied to clipboard!"><span class="fas fa-copy"></span></button>
 {% else %}
 <a href="{% url target %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
 {% endif %}

users/templates/profile_detail.html

@@ -95,11 +95,11 @@
                             <dd class="col-8">
                                 {% if user.api_key %}
                                     <code id="api-key">{{user.api_key}}</code>
-                                    <button class="btn btn-secondary align-middle" data-clipboard-target="#api-key" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>
+                                    <button class="btn btn-secondary align-middle pr-1 btn-sm" data-clipboard-target="#api-key" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>
                                 {% else %}
                                     <span id="api-key">No API Key Generated</span>
                                 {% endif %}
-                                <a href="{% url 'reset_api_key' %}" class="btn btn-secondary align-middle">
+                                <a href="{% url 'reset_api_key' %}" class="btn btn-secondary align-middle pr-1">
                                     {% if user.api_key %}Reset API Key{% else %}Generate API Key{% endif %}
                                     <span class="fas fa-redo"></span>
                                 </a>
@@ -133,7 +133,7 @@
                             <dd class="col-8">
                                 {% if user.api_key %}
                                     <code id="cal-url" data-url="http{{ request.is_secure|yesno:"s,"}}://{{ request.get_host }}{% url 'ics_calendar' api_pk=user.pk api_key=user.api_key %}"></code>
-                                    <button class="btn btn-secondary align-middle" data-clipboard-target="#cal-url" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>
+                                    <button class="btn btn-secondary align-middle btn-sm pr-1" data-clipboard-target="#cal-url" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>
                                     <br>
                                     <small><a id="gcal-link" data-url="https://support.google.com/calendar/answer/37100" href="">Click here</a> for instructions on adding to google calendar.<br/>
                                         To sync from Google Calendar to mobile device, visit <a href="https://www.google.com/calendar/syncselect" target="_blank">this page</a> on your device and tick "RIGS Calendar".</small>