Update to heroku-18 stack

.gitignore

@@ -44,7 +44,6 @@ htmlcov/
 .tox/
 .coverage
 .cache
-.pytest_cache
 nosetests.xml
 coverage.xml
 
@@ -108,4 +107,3 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
-.vscode/

Procfile

@@ -1,2 +1 @@
-release: python manage.py migrate
 web: gunicorn PyRIGS.wsgi --log-file -

PyRIGS/decorators.py

@@ -6,34 +6,6 @@ from django.urls import reverse
 from RIGS import models
 
 
-def get_oembed(login_url, request, oembed_view, kwargs):
-    context = {}
-    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
-    context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
-    resp = render(request, 'login_redirect.html', context=context)
-    return resp
-
-
-def has_oembed(oembed_view, login_url=None):
-    if not login_url:
-        from django.conf import settings
-        login_url = settings.LOGIN_URL
-
-    def _dec(view_func):
-        def _checklogin(request, *args, **kwargs):
-            if request.user.is_authenticated:
-                return view_func(request, *args, **kwargs)
-            else:
-                if oembed_view is not None:
-                    return get_oembed(login_url, request, oembed_view, kwargs)
-                else:
-                    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
-        _checklogin.__doc__ = view_func.__doc__
-        _checklogin.__dict__ = view_func.__dict__
-        return _checklogin
-    return _dec
-
-
 def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
     """
     Decorator for views that checks that the user passes the given test.
@@ -53,7 +25,11 @@ def user_passes_test_with_403(test_func, login_url=None, oembed_view=None):
                 return view_func(request, *args, **kwargs)
             elif not request.user.is_authenticated:
                 if oembed_view is not None:
-                    return get_oembed(login_url, request, oembed_view, kwargs)
+                    context = {}
+                    context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
+                    context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
+                    resp = render(request, 'login_redirect.html', context=context)
+                    return resp
                 else:
                     return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
             else:

PyRIGS/settings.py

@@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 import os
 import raven
 import secrets
-import datetime
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -45,9 +44,9 @@ if not DEBUG:
 
 INTERNAL_IPS = ['127.0.0.1']
 
-ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
-if DEBUG:
-    ADMINS.append(('Testing Superuser', 'superuser@example.com'))
+ADMINS = (
+    ('Tom Price', 'tomtom5152@gmail.com')
+)
 
 # Application definition
 
@@ -59,7 +58,6 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'RIGS',
-    'assets',
 
     'debug_toolbar',
     'registration',
@@ -183,8 +181,6 @@ if not DEBUG or EMAILER_TEST:
 else:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-EMAIL_COOLDOWN = datetime.timedelta(minutes=15)
-
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 

PyRIGS/tests/base.py

@@ -1,36 +0,0 @@
-from django.test import LiveServerTestCase
-from selenium import webdriver
-from RIGS import models as rigsmodels
-from . import pages
-import os
-
-
-def create_browser():
-    options = webdriver.ChromeOptions()
-    options.add_argument("--window-size=1920,1080")
-    if os.environ.get('CI', False):
-        options.add_argument("--headless")
-        options.add_argument("--no-sandbox")
-    driver = webdriver.Chrome(chrome_options=options)
-    return driver
-
-
-class BaseTest(LiveServerTestCase):
-    def setUp(self):
-        super().setUpClass()
-        self.driver = create_browser()
-
-    def tearDown(self):
-        super().tearDown()
-        self.driver.quit()
-
-
-class AutoLoginTest(BaseTest):
-    def setUp(self):
-        super().setUp()
-        self.profile = rigsmodels.Profile(
-            username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
-        self.profile.set_password("EventTestPassword")
-        self.profile.save()
-        loginPage = pages.LoginPage(self.driver, self.live_server_url).open()
-        loginPage.login("EventTest", "EventTestPassword")

PyRIGS/tests/pages.py

@@ -1,86 +0,0 @@
-from pypom import Page, Region
-from selenium.webdriver.common.by import By
-from selenium.webdriver import Chrome
-from selenium.common.exceptions import NoSuchElementException
-
-
-class BasePage(Page):
-    form_items = {}
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def __getattr__(self, name):
-        if name in self.form_items:
-            element = self.form_items[name]
-            form_element = element[0](self, self.find_element(*element[1]))
-            return form_element.value
-        else:
-            return super().__getattribute__(name)
-
-    def __setattr__(self, name, value):
-        if name in self.form_items:
-            element = self.form_items[name]
-            form_element = element[0](self, self.find_element(*element[1]))
-            form_element.set_value(value)
-        else:
-            self.__dict__[name] = value
-
-
-class FormPage(BasePage):
-    _errors_selector = (By.CLASS_NAME, "alert-danger")
-
-    def remove_all_required(self):
-        self.driver.execute_script("Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
-        self.driver.execute_script("Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
-
-    @property
-    def errors(self):
-        try:
-            error_page = self.ErrorPage(self, self.find_element(*self._errors_selector))
-            return error_page.errors
-        except NoSuchElementException:
-            return None
-
-    class ErrorPage(Region):
-        _error_item_selector = (By.CSS_SELECTOR, "dl>span")
-
-        class ErrorItem(Region):
-            _field_selector = (By.CSS_SELECTOR, "dt")
-            _error_selector = (By.CSS_SELECTOR, "dd>ul>li")
-
-            @property
-            def field_name(self):
-                return self.find_element(*self._field_selector).text
-
-            @property
-            def errors(self):
-                return [x.text for x in self.find_elements(*self._error_selector)]
-
-        @property
-        def errors(self):
-            error_items = [self.ErrorItem(self, x) for x in self.find_elements(*self._error_item_selector)]
-            errors = {}
-            for error in error_items:
-                errors[error.field_name] = error.errors
-            return errors
-
-
-class LoginPage(BasePage):
-    URL_TEMPLATE = '/user/login'
-
-    _username_locator = (By.ID, 'id_username')
-    _password_locator = (By.ID, 'id_password')
-    _submit_locator = (By.ID, 'id_submit')
-    _error_locator = (By.CSS_SELECTOR, '.errorlist>li')
-
-    def login(self, username, password):
-        username_element = self.find_element(*self._username_locator)
-        username_element.clear()
-        username_element.send_keys(username)
-
-        password_element = self.find_element(*self._password_locator)
-        password_element.clear()
-        password_element.send_keys(password)
-
-        self.find_element(*self._submit_locator).click()

PyRIGS/tests/regions.py

@@ -1,133 +0,0 @@
-from pypom import Region
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.select import Select
-import datetime
-
-
-def parse_bool_from_string(string):
-    # Used to convert from attribute strings to boolean values, written after I found this:
-    # >>> bool("false")
-    # True
-    if string == "true":
-        return True
-    else:
-        return False
-
-
-class BootstrapSelectElement(Region):
-    _main_button_locator = (By.CSS_SELECTOR, 'button.dropdown-toggle')
-    _option_box_locator = (By.CSS_SELECTOR, 'ul.dropdown-menu')
-    _option_locator = (By.CSS_SELECTOR, 'ul.dropdown-menu.inner>li>a[role=option]')
-    _select_all_locator = (By.CLASS_NAME, 'bs-select-all')
-    _deselect_all_locator = (By.CLASS_NAME, 'bs-deselect-all')
-    _search_locator = (By.CSS_SELECTOR, '.bs-searchbox>input')
-    _status_locator = (By.CLASS_NAME, 'status')
-
-    @property
-    def is_open(self):
-        return parse_bool_from_string(self.find_element(*self._main_button_locator).get_attribute("aria-expanded"))
-
-    def toggle(self):
-        original_state = self.is_open
-        return self.find_element(*self._main_button_locator).click()
-        option_box = self.find_element(*self._option_box_locator)
-        if original_state:
-            self.wait.until(expected_conditions.invisibility_of_element_located(option_box))
-        else:
-            self.wait.until(expected_conditions.visibility_of_element_located(option_box))
-
-    def open(self):
-        if not self.is_open:
-            self.toggle()
-
-    def close(self):
-        if self.is_open:
-            self.toggle()
-
-    def select_all(self):
-        self.find_element(*self._select_all_locator).click()
-
-    def deselect_all(self):
-        self.find_element(*self._deselect_all_locator).click()
-
-    def search(self, query):
-        search_box = self.find_element(*self._search_locator)
-        search_box.clear()
-        search_box.send_keys(query)
-        status_text = self.find_element(*self._status_locator)
-        self.wait.until(expected_conditions.invisibility_of_element_located(self._status_locator))
-
-    @property
-    def options(self):
-        options = list(self.find_elements(*self._option_locator))
-        return [self.BootstrapSelectOption(self, i) for i in options]
-
-    def set_option(self, name, selected):
-        options = list((x for x in self.options if x.name == name))
-        assert len(options) == 1
-        options[0].set_selected(selected)
-
-    class BootstrapSelectOption(Region):
-        _text_locator = (By.CLASS_NAME, 'text')
-
-        @property
-        def selected(self):
-            return parse_bool_from_string(self.root.get_attribute("aria-selected"))
-
-        def toggle(self):
-            self.root.click()
-
-        def set_selected(self, selected):
-            if self.selected != selected:
-                self.toggle()
-
-        @property
-        def name(self):
-            return self.find_element(*self._text_locator).text
-
-
-class TextBox(Region):
-    @property
-    def value(self):
-        return self.root.get_attribute("value")
-
-    def set_value(self, value):
-        self.root.clear()
-        self.root.send_keys(value)
-
-
-class CheckBox(Region):
-    def toggle(self):
-        self.root.click()
-
-    @property
-    def value(self):
-        return parse_bool_from_string(self.root.get_attribute("checked"))
-
-    def set_value(self, value):
-        if value != self.value:
-            self.toggle()
-
-
-class DatePicker(Region):
-    @property
-    def value(self):
-        return datetime.datetime.strptime(self.root.get_attribute("value"), "%Y-%m-%d")
-
-    def set_value(self, value):
-        self.root.clear()
-        self.root.send_keys(value.strftime("%d%m%Y"))
-
-
-class SingleSelectPicker(Region):
-    @property
-    def value(self):
-        picker = Select(self.root)
-        return picker.first_selected_option.text
-
-    def set_value(self, value):
-        picker = Select(self.root)
-        picker.select_by_visible_text(value)

PyRIGS/urls.py

@@ -12,7 +12,6 @@ urlpatterns = [
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^', include('RIGS.urls')),
-    url('^assets/', include('assets.urls')),
     url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
         name="registration_register"),
     url('^user/', include('django.contrib.auth.urls')),

README.md

@@ -1,13 +1,20 @@
 # TEC PA & Lighting - PyRIGS #
 [![Build Status](https://travis-ci.org/nottinghamtec/PyRIGS.svg?branch=develop)](https://travis-ci.org/nottinghamtec/PyRIGS)
-[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg)](https://coveralls.io/github/nottinghamtec/PyRIGS)
+[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg?branch=develop)](https://coveralls.io/github/nottinghamtec/PyRIGS?branch=develop)
+[![Dependency Status](https://gemnasium.com/badges/github.com/nottinghamtec/PyRIGS.svg)](https://gemnasium.com/github.com/nottinghamtec/PyRIGS)
+
 
 Welcome to TEC PA & Lightings PyRIGS program. This is a reimplementation of the existing Rig Information Gathering System (RIGS) that was developed using Ruby on Rails.
 
 The purpose of this project is to make the system more compatible and easier to understand such that should future changes be needed they can be made without having to understand the intricacies of Rails.
 
+At this stage the project is very early on, and the main focus has been on getting a working system that can be tested and put into use ASAP due to the imminent failure of the existing system. Because of this, the documentation is still quite weak, but this should be fixed as time goes on.
+
+This document is intended to get you up and running, but if don't care about what I have to say, just clone the sodding repository and have a poke around with what's in it, but for GODS SAKE DO NOT PUSH WITHOUT TESTING.
+
 ### What is this repository for? ###
-When a significant feature is developed on a branch, raise a pull request and it can be reviewed before being put into production.
+For the rapid development of the application for medium term deployment, the main branch is being used.
+Once the application is deployed in a production environment, other branches should be used to properly stage edits and pushes of new features. When a significant feature is developed on a branch, raise a pull request and it can be reviewed before being put into production.
 
 Most of the documents here assume a basic knowledge of how Python and Django work (hint, if I don't say something, Google it, you will find 10000's of answers). The documentation is purely to be specific to TEC's application of the framework.
 
@@ -19,7 +26,7 @@ For the more experienced developer/somebody who doesn't want a full IDE and want
 Please contact TJP for details on how to acquire these.
 
 ### Python Environment ###
-Whilst the Python version used is not critical to the running of the application, using the same version usually helps avoid a lot of issues. Orginally written with the C implementation of Python 2 (CPython 2, specifically the Python 2.7 standard), the application now runs in Python 3.
+Whilst the Python version used is not critical to the running of the application, using the same version usually helps avoid a lot of issues. Mainly the C implementation of Python 2 (CPython 2) has been used (specifically the Python 2.7 standard). Most of the application has been written with Python 3 in mind however, and should run without issue. Some level of testing on Python 3 has been done, but there is no guarantee it will work (for more information on this please see [[Python Version]] on the wiki)
 
 Once you have your Python distribution installed, go ahead an follow the steps to set up a virtualenv, which will isolate the project from the system environment.
 
@@ -108,4 +115,5 @@ python manage.py test RIGS.test_models.EventTestCase.test_current_events
 
 ```
 
-[![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://forthebadge.com)
+### Committing, pushing and testing ###
+Feel free to commit as you wish, on your own branch. On my branch (master for development) do not commit code that you either know doesn't work or don't know works. If you must commit this code, please make sure you say in the commit message that it isn't working, and if you can why it isn't working. If and only if you absolutely must push, then please don't leave it as the HEAD for too long, it's not much to ask but when you are done just make sure you haven't broken the HEAD for the next person.

RIGS/admin.py

@@ -22,22 +22,13 @@ admin.site.register(models.Invoice)
 admin.site.register(models.Payment)
 
 
-def approve_user(modeladmin, request, queryset):
-    queryset.update(is_approved=True)
-
-
-approve_user.short_description = "Approve selected users"
-
-
 @admin.register(models.Profile)
 class ProfileAdmin(UserAdmin):
-    # Don't know how to add 'is_approved' whilst preserving the default list...
-    list_filter = ('is_approved', 'is_active', 'is_staff', 'is_superuser', 'groups')
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {
             'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}),
-        (_('Permissions'), {'fields': ('is_approved', 'is_active', 'is_staff', 'is_superuser',
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
                                        'groups', 'user_permissions')}),
         (_('Important dates'), {
             'fields': ('last_login', 'date_joined')}),
@@ -50,7 +41,6 @@ class ProfileAdmin(UserAdmin):
     )
     form = forms.ProfileChangeForm
     add_form = forms.ProfileCreationForm
-    actions = [approve_user]
 
 
 class AssociateAdmin(VersionAdmin):

RIGS/forms.py

@@ -2,10 +2,8 @@ from django import forms
 from django.utils import formats
 from django.conf import settings
 from django.core import serializers
-from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
 from registration.forms import RegistrationFormUniqueEmail
-from django.contrib.auth.forms import AuthenticationForm
 from captcha.fields import ReCaptchaField
 import simplejson
 
@@ -24,7 +22,7 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
 
     class Meta:
         model = models.Profile
-        fields = ('username', 'email', 'first_name', 'last_name', 'initials')
+        fields = ('username', 'email', 'first_name', 'last_name', 'initials', 'phone')
 
     def clean_initials(self):
         """
@@ -35,21 +33,12 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
         return self.cleaned_data['initials']
 
 
-class CheckApprovedForm(AuthenticationForm):
-    def confirm_login_allowed(self, user):
-        if user.is_approved or user.is_superuser:
-            return AuthenticationForm.confirm_login_allowed(self, user)
-        else:
-            raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!")
-
-
 # Embedded Login form - remove the autofocus
-class EmbeddedAuthenticationForm(CheckApprovedForm):
+class EmbeddedAuthenticationForm(AuthenticationForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['username'].widget.attrs.pop('autofocus', None)
 
-
 class PasswordReset(PasswordResetForm):
     captcha = ReCaptchaField(label='Captcha')
 
@@ -139,11 +128,6 @@ class EventForm(forms.ModelForm):
 
         return item
 
-    def clean(self):
-        if self.cleaned_data.get("is_rig") and not (self.cleaned_data.get('person') or self.cleaned_data.get('organisation')):
-            raise forms.ValidationError('You haven\'t provided any client contact details. Please add a person or organisation.', code='contact')
-        return super(EventForm, self).clean()
-
     def save(self, commit=True):
         m = super(EventForm, self).save(commit=False)
 

RIGS/management/commands/generateSampleData.py

@@ -1,11 +1,252 @@
 from django.core.management.base import BaseCommand, CommandError
-from django.core.management import call_command
+from django.contrib.auth.models import Group, Permission
+from django.db import transaction
+from reversion import revisions as reversion
+
+import datetime
+import random
+
+from RIGS import models
 
 
 class Command(BaseCommand):
     help = 'Adds sample data to use for testing'
     can_import_settings = True
 
+    people = []
+    organisations = []
+    venues = []
+    profiles = []
+
+    keyholder_group = None
+    finance_group = None
+
     def handle(self, *args, **options):
-        call_command('generateSampleRIGSData')
-        call_command('generateSampleAssetsData')
+        from django.conf import settings
+
+        if not (settings.DEBUG or settings.STAGING):
+            raise CommandError('You cannot run this command in production')
+
+        random.seed('Some object to seed the random number generator')  # otherwise it is done by time, which could lead to inconsistant tests
+
+        with transaction.atomic():
+            models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+
+            self.setupGenericProfiles()
+
+            self.setupPeople()
+            self.setupOrganisations()
+            self.setupVenues()
+
+            self.setupGroups()
+
+            self.setupEvents()
+
+            self.setupUsefulProfiles()
+
+    def setupPeople(self):
+        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe", "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore", "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan", "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid", "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom", "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood",  # noqa
+                 "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter", "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter", "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"]  # noqa
+        for i, name in enumerate(names):
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+
+                newPerson = models.Person.objects.create(name=name)
+                if i % 3 == 0:
+                    newPerson.email = "address@person.com"
+
+                if i % 5 == 0:
+                    newPerson.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newPerson.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newPerson.phone = "01234 567894"
+
+                newPerson.save()
+                self.people.append(newPerson)
+
+    def setupOrganisations(self):
+        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
+                 "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
+        for i, name in enumerate(names):
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                newOrganisation = models.Organisation.objects.create(name=name)
+                if i % 2 == 0:
+                    newOrganisation.has_su_account = True
+
+                if i % 3 == 0:
+                    newOrganisation.email = "address@organisation.com"
+
+                if i % 5 == 0:
+                    newOrganisation.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newOrganisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newOrganisation.phone = "01234 567894"
+
+                newOrganisation.save()
+                self.organisations.append(newOrganisation)
+
+    def setupVenues(self):
+        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch", "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands", "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins", "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark", "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye", "The Golden Tooth",  # noqa
+                 "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown", "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep", "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai", "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth", "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis", "Yunkai"]  # noqa
+        for i, name in enumerate(names):
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                newVenue = models.Venue.objects.create(name=name)
+                if i % 2 == 0:
+                    newVenue.three_phase_available = True
+
+                if i % 3 == 0:
+                    newVenue.email = "address@venue.com"
+
+                if i % 5 == 0:
+                    newVenue.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newVenue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newVenue.phone = "01234 567894"
+
+                newVenue.save()
+                self.venues.append(newVenue)
+
+    def setupGroups(self):
+        self.keyholder_group = Group.objects.create(name='Keyholders')
+        self.finance_group = Group.objects.create(name='Finance')
+
+        keyholderPerms = ["add_event", "change_event", "view_event", "add_eventitem", "change_eventitem", "delete_eventitem", "add_organisation", "change_organisation", "view_organisation", "add_person", "change_person", "view_person", "view_profile", "add_venue", "change_venue", "view_venue"]
+        financePerms = ["change_event", "view_event", "add_eventitem", "change_eventitem", "add_invoice", "change_invoice", "view_invoice", "add_organisation", "change_organisation", "view_organisation", "add_payment", "change_payment", "delete_payment", "add_person", "change_person", "view_person"]
+
+        for permId in keyholderPerms:
+            self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
+
+        for permId in financePerms:
+            self.finance_group.permissions.add(Permission.objects.get(codename=permId))
+
+    def setupGenericProfiles(self):
+        names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble", "Jack Harkness", "Mickey Smith", "Rose Tyler"]
+        for i, name in enumerate(names):
+            newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1],
+                                                       email=name.replace(" ", "") + "@example.com",
+                                                       initials="".join([j[0].upper() for j in name.split()]))
+            if i % 2 == 0:
+                newProfile.phone = "01234 567894"
+
+            newProfile.save()
+            self.profiles.append(newProfile)
+
+    def setupUsefulProfiles(self):
+        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU",
+                                                  email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
+        superUser.set_password('superuser')
+        superUser.save()
+
+        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU",
+                                                    email="financeuser@example.com", is_active=True)
+        financeUser.groups.add(self.finance_group)
+        financeUser.groups.add(self.keyholder_group)
+        financeUser.set_password('finance')
+        financeUser.save()
+
+        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU",
+                                                      email="keyholderuser@example.com", is_active=True)
+        keyholderUser.groups.add(self.keyholder_group)
+        keyholderUser.set_password('keyholder')
+        keyholderUser.save()
+
+        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU",
+                                                  email="basicuser@example.com", is_active=True)
+        basicUser.set_password('basic')
+        basicUser.save()
+
+    def setupEvents(self):
+        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event",
+                 "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
+        descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"]
+        notes = ["The client came into the office at some point", "Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"]
+
+        itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00},
+                       {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00},
+                       {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52},
+                       {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
+                       {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50},
+                       {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00},
+                       {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
+                       {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
+                       {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
+
+        dayDelta = -120  # start adding events from 4 months ago
+
+        for i in range(150):  # Let's add 100 events
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+
+                name = names[i % len(names)]
+
+                startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
+                dayDelta = dayDelta + random.randint(0, 3)
+
+                newEvent = models.Event.objects.create(name=name, start_date=startDate)
+
+                if random.randint(0, 2) > 1:  # 1 in 3 have a start time
+                    newEvent.start_time = datetime.time(random.randint(15, 20))
+                    if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
+                        newEvent.end_time = datetime.time(random.randint(21, 23))
+                    elif random.randint(0, 1) > 0:  # half of the others finish early the next day
+                        newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
+                        newEvent.end_time = datetime.time(random.randint(0, 5))
+                elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
+                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have MIC
+                    newEvent.mic = random.choice(self.profiles)
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have organisation
+                    newEvent.organisation = random.choice(self.organisations)
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have person
+                    newEvent.person = random.choice(self.people)
+
+                if random.randint(0, 6) > 0:  # 5 in 6 have venue
+                    newEvent.venue = random.choice(self.venues)
+
+                # Could have any status, equally weighted
+                newEvent.status = random.choice([models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
+
+                newEvent.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
+
+                if random.randint(0, 1) > 0:  # 1 in 2 have description
+                    newEvent.description = random.choice(descriptions)
+
+                if random.randint(0, 1) > 0:  # 1 in 2 have notes
+                    newEvent.notes = random.choice(notes)
+
+                newEvent.save()
+
+                # Now add some items
+                for j in range(random.randint(1, 5)):
+                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
+
+                while newEvent.sum_total < 0:
+                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
+
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                if newEvent.start_date < datetime.date.today():  # think about adding an invoice
+                    if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
+                        newInvoice = models.Invoice.objects.create(event=newEvent)
+                        if newEvent.status is models.Event.CANCELLED:  # void cancelled events
+                            newInvoice.void = True
+                        elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
+                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, date=datetime.date.today())

RIGS/management/commands/generateSampleRIGSData.py

@@ -1,260 +0,0 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.contrib.auth.models import Group, Permission
-from django.db import transaction
-from reversion import revisions as reversion
-
-import datetime
-import random
-
-from RIGS import models
-
-
-class Command(BaseCommand):
-    help = 'Adds sample data to use for testing'
-    can_import_settings = True
-
-    people = []
-    organisations = []
-    venues = []
-    profiles = []
-
-    keyholder_group = None
-    finance_group = None
-
-    def handle(self, *args, **options):
-        from django.conf import settings
-
-        if not (settings.DEBUG or settings.STAGING):
-            raise CommandError('You cannot run this command in production')
-
-        random.seed('Some object to seed the random number generator')  # otherwise it is done by time, which could lead to inconsistant tests
-
-        with transaction.atomic():
-            models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-
-            self.setupGenericProfiles()
-
-            self.setupPeople()
-            self.setupOrganisations()
-            self.setupVenues()
-
-            self.setupGroups()
-
-            self.setupEvents()
-
-            self.setupUsefulProfiles()
-
-    def setupPeople(self):
-        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe", "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore", "Dudley Dursley", "Petunia Dursley", "Vernon Dursley", "Argus Filch", "Seamus Finnigan", "Nicolas Flamel", "Cornelius Fudge", "Goyle", "Gregory Goyle", "Hermione Granger", "Rubeus Hagrid", "Igor Karkaroff", "Viktor Krum", "Bellatrix Lestrange", "Alice Longbottom", "Frank Longbottom", "Neville Longbottom", "Luna Lovegood", "Xenophilius Lovegood",  # noqa
-                 "Remus Lupin", "Draco Malfoy", "Lucius Malfoy", "Narcissa Malfoy", "Olympe Maxime", "Minerva McGonagall", "Mad-Eye Moody", "Peter Pettigrew", "Harry Potter", "James Potter", "Lily Potter", "Quirinus Quirrell", "Tom Riddle", "Mary Riddle", "Lord Voldemort", "Rita Skeeter", "Severus Snape", "Nymphadora Tonks", "Dolores Janes Umbridge", "Arthur Weasley", "Bill Weasley", "Charlie Weasley", "Fred Weasley", "George Weasley", "Ginny Weasley", "Molly Weasley", "Percy Weasley", "Ron Weasley", "Dobby", "Fluffy", "Hedwig", "Moaning Myrtle", "Aragog", "Grawp"]  # noqa
-        for i, name in enumerate(names):
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-
-                newPerson = models.Person.objects.create(name=name)
-                if i % 3 == 0:
-                    newPerson.email = "address@person.com"
-
-                if i % 5 == 0:
-                    newPerson.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
-
-                if i % 7 == 0:
-                    newPerson.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
-
-                if i % 9 == 0:
-                    newPerson.phone = "01234 567894"
-
-                newPerson.save()
-                self.people.append(newPerson)
-
-    def setupOrganisations(self):
-        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
-                 "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
-        for i, name in enumerate(names):
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-                newOrganisation = models.Organisation.objects.create(name=name)
-                if i % 2 == 0:
-                    newOrganisation.has_su_account = True
-
-                if i % 3 == 0:
-                    newOrganisation.email = "address@organisation.com"
-
-                if i % 5 == 0:
-                    newOrganisation.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
-
-                if i % 7 == 0:
-                    newOrganisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
-
-                if i % 9 == 0:
-                    newOrganisation.phone = "01234 567894"
-
-                newOrganisation.save()
-                self.organisations.append(newOrganisation)
-
-    def setupVenues(self):
-        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch", "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands", "The Ruby Ford", "Saltpans", "Seagard", "Torrhen's Square", "The Trident", "The Twins", "The Vale of Arryn", "The Whispering Wood", "White Harbor", "Winterfell", "The Arbor", "Ashemark", "Brightwater Keep", "Casterly Rock", "Clegane's Keep", "Dragonstone", "Dorne", "God's Eye", "The Golden Tooth",  # noqa
-                 "Harrenhal", "Highgarden", "Horn Hill", "Fingers", "King's Landing", "Lannisport", "Oldtown", "Rainswood", "Storm's End", "Summerhall", "Sunspear", "Tarth", "Castle Black", "Craster's Keep", "Fist of the First Men", "The Frostfangs", "The Gift", "The Skirling Pass", "The Wall", "Asshai", "Astapor", "Braavos", "The Dothraki Sea", "Lys", "Meereen", "Myr", "Norvos", "Pentos", "Qarth", "Qohor", "The Red Waste", "Tyrosh", "Vaes Dothrak", "Valyria", "Village of the Lhazareen", "Volantis", "Yunkai"]  # noqa
-        for i, name in enumerate(names):
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-                newVenue = models.Venue.objects.create(name=name)
-                if i % 2 == 0:
-                    newVenue.three_phase_available = True
-
-                if i % 3 == 0:
-                    newVenue.email = "address@venue.com"
-
-                if i % 5 == 0:
-                    newVenue.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
-
-                if i % 7 == 0:
-                    newVenue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
-
-                if i % 9 == 0:
-                    newVenue.phone = "01234 567894"
-
-                newVenue.save()
-                self.venues.append(newVenue)
-
-    def setupGroups(self):
-        self.keyholder_group = Group.objects.create(name='Keyholders')
-        self.finance_group = Group.objects.create(name='Finance')
-
-        keyholderPerms = ["add_event", "change_event", "view_event",
-                          "add_eventitem", "change_eventitem", "delete_eventitem",
-                          "add_organisation", "change_organisation", "view_organisation",
-                          "add_person", "change_person", "view_person", "view_profile",
-                          "add_venue", "change_venue", "view_venue",
-                          "add_asset", "change_asset", "delete_asset",
-                          "asset_finance", "view_asset", "view_supplier", "asset_finance",
-                          "add_supplier"]
-        financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice",
-                                         "add_payment", "change_payment", "delete_payment"]
-
-        for permId in keyholderPerms:
-            self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
-
-        for permId in financePerms:
-            self.finance_group.permissions.add(Permission.objects.get(codename=permId))
-
-    def setupGenericProfiles(self):
-        names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble", "Jack Harkness", "Mickey Smith", "Rose Tyler"]
-        for i, name in enumerate(names):
-            newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1],
-                                                       email=name.replace(" ", "") + "@example.com",
-                                                       initials="".join([j[0].upper() for j in name.split()]))
-            if i % 2 == 0:
-                newProfile.phone = "01234 567894"
-
-            newProfile.save()
-            self.profiles.append(newProfile)
-
-    def setupUsefulProfiles(self):
-        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU",
-                                                  email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
-        superUser.set_password('superuser')
-        superUser.save()
-
-        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU",
-                                                    email="financeuser@example.com", is_active=True)
-        financeUser.groups.add(self.finance_group)
-        financeUser.groups.add(self.keyholder_group)
-        financeUser.set_password('finance')
-        financeUser.save()
-
-        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU",
-                                                      email="keyholderuser@example.com", is_active=True)
-        keyholderUser.groups.add(self.keyholder_group)
-        keyholderUser.set_password('keyholder')
-        keyholderUser.save()
-
-        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU",
-                                                  email="basicuser@example.com", is_active=True)
-        basicUser.set_password('basic')
-        basicUser.save()
-
-    def setupEvents(self):
-        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event",
-                 "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
-        descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"]
-        notes = ["The client came into the office at some point", "Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"]
-
-        itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00},
-                       {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00},
-                       {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52},
-                       {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
-                       {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50},
-                       {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00},
-                       {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
-                       {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
-                       {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
-
-        dayDelta = -120  # start adding events from 4 months ago
-
-        for i in range(150):  # Let's add 100 events
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-
-                name = names[i % len(names)]
-
-                startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
-                dayDelta = dayDelta + random.randint(0, 3)
-
-                newEvent = models.Event.objects.create(name=name, start_date=startDate)
-
-                if random.randint(0, 2) > 1:  # 1 in 3 have a start time
-                    newEvent.start_time = datetime.time(random.randint(15, 20))
-                    if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
-                        newEvent.end_time = datetime.time(random.randint(21, 23))
-                    elif random.randint(0, 1) > 0:  # half of the others finish early the next day
-                        newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
-                        newEvent.end_time = datetime.time(random.randint(0, 5))
-                elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
-                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have MIC
-                    newEvent.mic = random.choice(self.profiles)
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have organisation
-                    newEvent.organisation = random.choice(self.organisations)
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have person
-                    newEvent.person = random.choice(self.people)
-
-                if random.randint(0, 6) > 0:  # 5 in 6 have venue
-                    newEvent.venue = random.choice(self.venues)
-
-                # Could have any status, equally weighted
-                newEvent.status = random.choice([models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
-
-                newEvent.dry_hire = (random.randint(0, 7) == 0)  # 1 in 7 are dry hire
-
-                if random.randint(0, 1) > 0:  # 1 in 2 have description
-                    newEvent.description = random.choice(descriptions)
-
-                if random.randint(0, 1) > 0:  # 1 in 2 have notes
-                    newEvent.notes = random.choice(notes)
-
-                newEvent.save()
-
-                # Now add some items
-                for j in range(random.randint(1, 5)):
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
-                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
-                    newItem.save()
-
-                while newEvent.sum_total < 0:
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
-                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
-                    newItem.save()
-
-            with reversion.create_revision():
-                reversion.set_user(random.choice(self.profiles))
-                if newEvent.start_date < datetime.date.today():  # think about adding an invoice
-                    if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
-                        newInvoice = models.Invoice.objects.create(event=newEvent)
-                        if newEvent.status is models.Event.CANCELLED:  # void cancelled events
-                            newInvoice.void = True
-                        elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
-                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, date=datetime.date.today())

RIGS/migrations/0035_auto_20191124_1319.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2019-11-24 13:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0034_event_risk_assessment_edit_url'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='risk_assessment_edit_url',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='risk assessment'),
-        ),
-    ]

RIGS/migrations/0036_profile_is_approved.py

@@ -1,23 +0,0 @@
-# Generated by Django 2.0.13 on 2020-01-10 14:52
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0035_auto_20191124_1319'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='profile',
-            name='is_approved',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='profile',
-            name='last_emailed',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]

RIGS/migrations/0037_approve_legacy.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.0.13 on 2020-01-11 18:29
-# This migration ensures that legacy Profiles from before approvals were implemented are automatically approved 
-from django.db import migrations
-
-def approve_legacy(apps, schema_editor):
-    Profile = apps.get_model('RIGS', 'Profile')
-    for person in Profile.objects.all():
-        person.is_approved = True
-        person.save()
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('RIGS', '0036_profile_is_approved'),
-    ]
-
-    operations = [
-        migrations.RunPython(approve_legacy)
-    ]

RIGS/models.py

@@ -27,8 +27,6 @@ class Profile(AbstractUser):
     initials = models.CharField(max_length=5, unique=True, null=True, blank=False)
     phone = models.CharField(max_length=13, null=True, blank=True)
     api_key = models.CharField(max_length=40, blank=True, editable=False, null=True)
-    is_approved = models.BooleanField(default=False)
-    last_emailed = models.DateTimeField(blank=True, null=True)  # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
 
     @classmethod
     def make_api_key(cls):
@@ -55,14 +53,6 @@ class Profile(AbstractUser):
     def latest_events(self):
         return self.event_mic.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
-    @classmethod
-    def admins(cls):
-        return Profile.objects.filter(email__in=[y for x in settings.ADMINS for y in x])
-
-    @classmethod
-    def users_awaiting_approval_count(cls):
-        return Profile.objects.filter(models.Q(is_approved=False)).count()
-
     def __str__(self):
         return self.name
 
@@ -486,10 +476,6 @@ class Event(models.Model, RevisionMixin):
         if startEndSameDay and hasStartAndEnd and self.start_time > self.end_time:
             raise ValidationError('Unless you\'ve invented time travel, the event can\'t finish before it has started.')
 
-        accessAndStartSameDay = self.access_at is not None and self.start_date == self.access_at.date()
-        if self.access_at.date() > self.start_date or (accessAndStartSameDay and self.access_at.time() > self.start_time):
-            raise ValidationError('Regardless of what some clients might think, access time cannot be after the event has started.')
-
     def save(self, *args, **kwargs):
         """Call :meth:`full_clean` before saving."""
         self.full_clean()

RIGS/regbackend.py

@@ -8,7 +8,7 @@ def user_created(sender, user, request, **kwargs):
     user.first_name = form.data['first_name']
     user.last_name = form.data['last_name']
     user.initials = form.data['initials']
-    # user.phone = form.data['phone']
+    user.phone = form.data['phone']
     user.save()
 
 

RIGS/rigboard.py

@@ -83,7 +83,6 @@ class EventEmbed(EventDetail):
 
 class EventRA(generic.base.RedirectView):
     permanent = False
-
     def get_redirect_url(self, *args, **kwargs):
         event = get_object_or_404(models.Event, pk=kwargs['pk'])
 
@@ -140,18 +139,15 @@ class EventUpdate(generic.UpdateView):
             if value is not None and value != '':
                 context[field] = model.objects.get(pk=value)
 
+        # If this event has already been emailed to a client, show a warning
+        if self.object.auth_request_at is not None:
+            messages.info(self.request, 'This event has already been sent to the client for authorisation, any changes you make will be visible to them immediately.')
+
+        if hasattr(self.object, 'authorised'):
+            messages.warning(self.request, 'This event has already been authorised by client, any changes to price will require reauthorisation.')
+
         return context
 
-    def render_to_response(self, context, **response_kwargs):
-        if not hasattr(context, 'duplicate'):
-            # If this event has already been emailed to a client, show a warning
-            if self.object.auth_request_at is not None:
-                messages.info(self.request, 'This event has already been sent to the client for authorisation, any changes you make will be visible to them immediately.')
-
-            if hasattr(self.object, 'authorised'):
-                messages.warning(self.request, 'This event has already been authorised by client, any changes to price will require reauthorisation.')
-        return super(EventUpdate, self).render_to_response(context, **response_kwargs)
-
     def get_success_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.object.pk})
 
@@ -162,7 +158,6 @@ class EventDuplicate(EventUpdate):
         new = copy.copy(old)  # Make a copy of the object in memory
         new.based_on = old  # Make the new event based on the old event
         new.purchase_order = None  # Remove old PO
-        new.status = new.PROVISIONAL  # Return status to provisional
 
         # Clear checked in by if it's a dry hire
         if new.dry_hire is True:
@@ -411,7 +406,6 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView):
         context['to_name'] = self.request.GET.get('to_name', None)
         return context
 
-
 @method_decorator(csrf_exempt, name='dispatch')
 class LogRiskAssessment(generic.View):
     http_method_names = ["post"]

RIGS/signals.py

@@ -1,4 +1,3 @@
-import datetime
 import re
 import urllib.request
 import urllib.error
@@ -11,9 +10,6 @@ from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.template.loader import get_template
-from django.urls import reverse
-from django.utils import timezone
-from registration.signals import user_activated
 from premailer import Premailer
 from z3c.rml import rml2pdf
 
@@ -106,35 +102,3 @@ def on_revision_commit(sender, instance, created, **kwargs):
 
 
 post_save.connect(on_revision_commit, sender=models.EventAuthorisation)
-
-
-def send_admin_awaiting_approval_email(user, request, **kwargs):
-    # Bit more controlled than just emailing all superusers
-    for admin in models.Profile.admins():
-        # Check we've ever emailed them before and if so, if cooldown has passed.
-        if admin.last_emailed is None or admin.last_emailed + settings.EMAIL_COOLDOWN <= timezone.now():
-            context = {
-                'request': request,
-                'link_suffix': reverse("admin:RIGS_profile_changelist") + '?is_approved__exact=0',
-                'number_of_users': models.Profile.users_awaiting_approval_count(),
-                'to_name': admin.first_name
-            }
-
-            email = EmailMultiAlternatives(
-                "%s new users awaiting approval on RIGS" % (context['number_of_users']),
-                get_template("RIGS/admin_awaiting_approval.txt").render(context),
-                to=[admin.email],
-                reply_to=[user.email],
-            )
-            css = staticfiles_storage.path('css/email.css')
-            html = Premailer(get_template("RIGS/admin_awaiting_approval.html").render(context),
-                             external_styles=css).transform()
-            email.attach_alternative(html, 'text/html')
-            email.send()
-
-            # Update last sent
-            admin.last_emailed = timezone.now()
-            admin.save()
-
-
-user_activated.connect(send_admin_awaiting_approval_email)

RIGS/static/scss/screen.scss

@@ -65,15 +65,6 @@ textarea {
   overflow: hidden;
 }
 
-.dont-break-out {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  -webkit-hyphens: auto;
-  -ms-hyphens: auto;
-  -moz-hyphens: auto;
-  hyphens: auto;
-}
-
 .modal-dialog {
   z-index: inherit; // bug fix introduced in 52682ce
 }
@@ -170,7 +161,7 @@ html.embedded{
     padding:0;
     width:100%;
     background:none;
-    overflow: auto;
+    overflow: scroll;
   }
 
   .embed_container{

RIGS/templates/RIGS/activity_feed_data.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax_nomodal.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax_nomodal.html,base.html" %}
 
 {% load static %}
 {% load paginator from filters %}

RIGS/templates/RIGS/activity_table.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load static %}
 {% load paginator from filters %}
 {% load to_class_name from filters %}

RIGS/templates/RIGS/admin_awaiting_approval.html

@@ -1,9 +0,0 @@
-{% extends 'base_client_email.html' %}
-
-{% block content %}
-    <p>Hi {{ to_name|default_if_none:"Administrator" }},</p>
-
-    <p>{{ number_of_users|default_if_none:"Some" }} new users are awaiting administrator approval on RIGS. Click <a href="{{ request.scheme }}://{{ request.get_host }}{{ link_suffix }}">here</a> to  approve them.</p>
-
-    <p>TEC PA &amp; Lighting</p>
-{% endblock %}

RIGS/templates/RIGS/admin_awaiting_approval.txt

@@ -1,5 +0,0 @@
-Hi {{ to_name|default_if_none:"Administrator" }},
-
-{{ number_of_users|default_if_none:"Some" }} new users are awaiting administrator approval on RIGS. Use this link to approve them: {{ request.scheme }}://{{ request.get_host }}/{{ link_suffix }}
-
-TEC PA & Lighting

RIGS/templates/RIGS/calendar.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% load static %}
 
 

RIGS/templates/RIGS/event_archive.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% load paginator from filters %}
 
 {% block title %}Event Archive{% endblock %}

RIGS/templates/RIGS/event_detail.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
 
 {% block content %}
@@ -10,14 +10,12 @@
                 | {{ object.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
             </h1>
     </div>
-        {% if perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'RIGS/event_detail_buttons.html' %}
         </div>
-        {% endif %}
 
     {% endif %}
-    {% if object.is_rig and perms.RIGS.view_event %}
+    {% if object.is_rig %}
         {# only need contact details for a rig #}
         <div class="col-sm-12 col-md-6 col-lg-5">
             <div class="panel panel-default">
@@ -72,9 +70,42 @@
                     </div>
                 </div>
             {% endif %}
+
+            {% if event.is_rig and event.internal %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">Client Authorisation</div>
+                    <div class="panel-body">
+                        <dl class="dl-horizontal">
+                            <dt>Authorised</dt>
+                            <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
+
+                            <dt>Authorised by</dt>
+                            <dd>
+                                {%  if object.authorisation %}
+                                    {{ object.authorisation.name }}
+                                    (<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
+                                {% endif %}
+                            </dd>
+
+                            <dt>Authorised at</dt>
+                            <dd>{{ object.authorisation.last_edited_at }}</dd>
+
+                            <dt>Authorised amount</dt>
+                            <dd>
+                                {% if object.authorisation %}
+                                    £ {{ object.authorisation.amount|floatformat:"2" }}
+                                {% endif %}
+                            </dd>
+
+                            <dt>Requested by</dt>
+                            <dd>{{ object.authorisation.sent_by }}</dd>
+                        </dl>
+                    </div>
+                </div>
+            {% endif %}
         </div>
     {% endif %}
-    <div class="col-sm-12 {% if event.is_rig and perms.RIGS.view_event %}col-md-6 col-lg-7{% endif %}">
+    <div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
         <div class="panel panel-info">
             <div class="panel-heading">Event Info</div>
             <div class="panel-body">
@@ -124,7 +155,7 @@
                     <dd>&nbsp;</dd>
 
                     <dt>Event Description</dt>
-                    <dd class="dont-break-out">{{ event.description|linebreaksbr }}</dd>
+                    <dd>{{ event.description|linebreaksbr }}</dd>
 
                     <dd>&nbsp;</dd>
 
@@ -149,72 +180,32 @@
                         <dd>{{ object.collector }}</dd>
                     {% endif %}
 
-                    {% if event.is_rig and not event.internal and perms.RIGS.view_event %}
+                    {% if event.is_rig %}
                         <dd>&nbsp;</dd>
-                        <dt>PO</dt>
-                        <dd>{{ object.purchase_order }}</dd>
+
+                        {% if object.internal %}
+                            <dt>Authorisation Request</dt>
+                            <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
+
+                            <dt>By</dt>
+                            <dd>{{ object.auth_request_by }}</dd>
+
+                            <dt>At</dt>
+                            <dd>{{ object.auth_request_at|date:"D d M Y H:i"|default:"" }}</dd>
+
+                            <dt>To</dt>
+                            <dd>{{ object.auth_request_to }}</dd>
+
+                        {% else %}
+                            <dt>PO</dt>
+                            <dd>{{ object.purchase_order }}</dd>
+                        {% endif %}
                     {% endif %}
                 </dl>
             </div>
         </div>
     </div>
-    {% if event.is_rig and event.internal and perms.RIGS.view_event %}
-    <div class="col-sm-12">
-        <div class="panel panel-default
-            {% if object.authorised %}
-                panel-success
-            {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
-                panel-warning
-            {% elif event.auth_request_to %}
-                panel-info
-            {% endif %}
-            ">
-            <div class="panel-heading">Client Authorisation</div>
-            <div class="panel-body">
-                <dl class="dl-horizontal col-sm-6">
-                    <dt>Authorisation Request</dt>
-                    <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
-
-                    <dt>By</dt>
-                    <dd>{{ object.auth_request_by }}</dd>
-
-                    <dt>At</dt>
-                    <dd>{{ object.auth_request_at|date:"D d M Y H:i"|default:"" }}</dd>
-
-                    <dt>To</dt>
-                    <dd>{{ object.auth_request_to }}</dd>
-                </dl>
-                <dd class="visible-xs">&nbsp;</dd>
-                <dl class="dl-horizontal col-sm-6">
-                    <dt>Authorised</dt>
-                    <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>
-
-                    <dt>Authorised by</dt>
-                    <dd>
-                        {%  if object.authorisation %}
-                            {{ object.authorisation.name }}
-                            (<a href="mailto:{{ object.authorisation.email }}">{{ object.authorisation.email }}</a>)
-                        {% endif %}
-                    </dd>
-
-                    <dt>Authorised at</dt>
-                    <dd>{{ object.authorisation.last_edited_at|date:"D d M Y H:i" }}</dd>
-
-                    <dt>Authorised amount</dt>
-                    <dd>
-                        {% if object.authorisation %}
-                            £ {{ object.authorisation.amount|floatformat:"2" }}
-                        {% endif %}
-                    </dd>
-
-                    <dt>Requested by</dt>
-                    <dd>{{ object.authorisation.sent_by }}</dd>
-                </dl>
-            </div>
-        </div>
-    <div>
-    {% endif %}
-    {% if not request.is_ajax and perms.RIGS.view_event %}
+    {% if not request.is_ajax %}
     <div class="col-sm-12 text-right">
         {% include 'RIGS/event_detail_buttons.html' %}
     </div>
@@ -224,23 +215,21 @@
             <div class="panel panel-default">
                 <div class="panel-heading">Event Details</div>
                 <div class="panel-body">
-                    {% if perms.RIGS.view_event %}
                     <div class="well well-sm">
                         <h4>Notes</h4>
-                        <div class="dont-break-out">{{ event.notes|linebreaksbr }}</div>
+                        {{ event.notes|linebreaksbr }}
                     </div>
-                    {% endif %}
                     {% include 'RIGS/item_table.html' %}
                 </div>
             </div>
         </div>
-        {% if not request.is_ajax and perms.RIGS.view_event %}
+        {% if not request.is_ajax %}
         <div class="col-sm-12 text-right">
             {% include 'RIGS/event_detail_buttons.html' %}
         </div>
         {% endif %}
     {% endif %}
-    {% if not request.is_ajax and perms.RIGS.view_event %}
+    {% if not request.is_ajax %}
         <div class="col-sm-12 text-right">
             <div>
                 <a href="{% url 'event_history' object.pk %}" title="View Revision History">
@@ -255,16 +244,12 @@
 {% if request.is_ajax %}
     {% block footer %}
         <div class="row">
-            {% if perms.RIGS.view_event %}
             <div class="col-sm-10 align-left">
                 <a href="{% url 'event_history' object.pk %}" title="View Revision History">
-                    Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
+                    Last edited at {{ object.last_edited_at }} by {{ object.last_edited_by.name }}
                 </a>
             </div>
             <div class="col-sm-2">
-            {% else %}
-            <div class="col-sm-12">
-            {% endif %}
                 <div class="pull-right">
                     <a href="{% url 'event_detail' object.pk %}" class="btn btn-primary">Open Event Page <span
                             class="glyphicon glyphicon-eye"></span></a>

RIGS/templates/RIGS/event_embed.html

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col-sm-12">
         <a href="/">
-            <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span>
+            <span class="source"> R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></span> 
         </a>
     </div>
 
@@ -20,9 +20,9 @@
                 <span class="glyphicon glyphicon-exclamation-sign"></span>
             {% endif %}
         </span>
-
+        
         <h3>
-            <a href="{% url 'event_detail' object.pk %}">
+            <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}"{% endif %}>
                 {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
                 | {{ object.name }} </a>
                 {% if object.venue %}
@@ -72,7 +72,7 @@
                 </p>
             </div>
             <div class="col-xs-6">
-
+                
                 {% if object.meet_at %}
                     <p>
                         <strong>Crew meet:</strong>
@@ -97,7 +97,7 @@
             {{ object.description|linebreaksbr }}
             </p>
         {% endif %}
-
+            
         </table>
     </div>
 </div>

RIGS/templates/RIGS/event_form.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% load widget_tweaks %}
 {% load static %}
 {% load multiply from filters %}

RIGS/templates/RIGS/event_invoice.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% load paginator from filters %}
 {% load static %}
 

RIGS/templates/RIGS/event_table.html

@@ -33,7 +33,7 @@
                 </td>
                 <td>
                     <h4>
-                        <a href="{% url 'event_detail' event.pk %}">
+                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>
                             {{ event.name }}
                         </a>
                         {% if event.venue %}

RIGS/templates/RIGS/eventauthorisation_client_success.html

@@ -6,7 +6,7 @@
     <p>
         Your event <b>N{{ object.event.pk|stringformat:"05d" }}</b> has been successfully authorised
         for <b>&pound;{{ object.amount }}</b>
-        by <b>{{ object.name }}</b> as of <b>{{ object.event.last_edited_at }}</b>.
+        by <b>{{ object.name }}</b> as of <b>{{ object.last_edited_at }}</b>.
     </p>
 
     <p>

RIGS/templates/RIGS/eventauthorisation_client_success.txt

@@ -1,6 +1,6 @@
-Hi {{ to_name|default_if_none:"there" }},
+Hi {{ to_name|default:"there" }},
 
-Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
+Your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
 
 {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
 Your event is now fully booked and payment will be processed by the finance department automatically.

RIGS/templates/RIGS/eventauthorisation_mic_success.txt

@@ -1,5 +1,5 @@
 Hi {{object.event.mic.get_full_name|default_if_none:"somebody"}},
 
-Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.event.last_edited_at}}.
+Just to let you know your event N{{object.event.pk|stringformat:"05d"}} has been successfully authorised for £{{object.amount}} by {{object.name}} as of {{object.last_edited_at}}.
 
 The TEC Rig Information Gathering System

RIGS/templates/RIGS/eventauthorisation_request.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
 {% load widget_tweaks %}
 
 {% block title %}Request Authorisation{% endblock %}

RIGS/templates/RIGS/eventauthorisation_request_error.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
 {% load widget_tweaks %}
 
 {% block title %}NottinghamTEC Email Address Required{% endblock %}

RIGS/templates/RIGS/index.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% block title %}RIGS{% endblock %}
 
 {% block content %}
@@ -11,7 +11,7 @@
     </div>
     <div class="row">
     <div class="col-sm-{% if perms.RIGS.view_event %}6{% else %}12{% endif %}">
-
+        
         <div class="panel panel-default">
             <div class="panel-heading">
                  <h4 class="list-group-item-heading">Quick Links</h4>
@@ -20,17 +20,15 @@
                     <a class="list-group-item" href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span> Rigboard</a>
                     <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span> Calendar</a>
                     {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</a>{% endif %}
-                    <a class="list-group-item" href="{% url 'asset_index' %}"><span class="glyphicon glyphicon-tag"></span> Asset Database </a>
 
                     <div class="list-group-item default"></div>
 
                     <a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Forum</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Wiki</a>
-                    {% if perms.RIGS.view_event %}
                     <a class="list-group-item" href="http://members.nottinghamtec.co.uk/wiki/images/2/22/Event_Risk_Assesment.pdf" target="_blank"><span class="glyphicon glyphicon-link"></span> Pre-Event Risk Assessment</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="glyphicon glyphicon-link"></span> Price List</a>
                     <a class="list-group-item" href="https://goo.gl/forms/jdPWov8PCNPoXtbn2" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
-                    {% endif %}
+                
             </div>
         </div>
 
@@ -73,8 +71,9 @@
         </div>
     </div>
     {% if perms.RIGS.view_event %}
-    <div class="col-sm-6">
-        {% include 'RIGS/activity_feed.html' %}
+    <div class="col-sm-6" >
+        {% include 'RIGS/activity_feed.html' %}    
+        
     </div>
     {% endif %}
 </div>

RIGS/templates/RIGS/invoice_confirm_delete.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 
 {% block title %}Delete payment on invoice {{ object.invoice.pk }}{% endblock %}
 

RIGS/templates/RIGS/invoice_detail.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 
 {% block title %}Invoice {{ object.pk }}{% endblock %}
 

RIGS/templates/RIGS/invoice_list.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% load paginator from filters %}
 
 {% block title %}Invoices{% endblock %}

RIGS/templates/RIGS/item_row.html

@@ -6,21 +6,17 @@
             <em class="description">{{item.description|linebreaksbr}}</em>
         </div>
 	</td>
-    {% if perms.RIGS.view_event %}
 	<td>£&nbsp;<span class="cost">{{item.cost|floatformat:2}}</span></td>
-    {% endif %}
 	<td class="quantity">{{item.quantity}}</td>
-    {% if perms.RIGS.view_event %}
 	<td>£&nbsp;<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
-    {% endif %}
 	{% if edit %}
 	<td class="vert-align text-right">
-		<button type="button" class="item-edit btn btn-xs btn-default"
+		<button type="button" class="item-edit btn btn-xs btn-default" 
 				data-pk="{{item.pk}}"
 				data-toggle="modal" data-target="#itemModal">
 			<span class="glyphicon glyphicon-edit"></span>
 		</button>
-		<button type="button" class="item-delete btn btn-xs btn-danger"
+		<button type="button" class="item-delete btn btn-xs btn-danger" 
 				data-pk="{{item.pk}}">
 			<span class="glyphicon glyphicon-remove"></span>
 		</button>

RIGS/templates/RIGS/item_table.html

@@ -3,13 +3,9 @@
 		<thead>
 			<tr>
 				<td>Item</td>
-                {% if perms.RIGS.view_event %}
 				<td>Price</td>
-                {% endif %}
 				<td>Quantity</td>
-                {% if perms.RIGS.view_event %}
 				<td>Sub-total</td>
-                {% endif %}
 				{% if edit %}
 				<td class="text-right">
 					<button type="button" class="btn btn-default btn-xs item-add"
@@ -26,7 +22,6 @@
 				{% include 'RIGS/item_row.html' %}
 			{% endfor %}
 		</tbody>
-        {% if perms.RIGS.view_event %}
 		<tfoot>
 			<tr>
 				<td rowspan="3" colspan="2"></td>
@@ -48,7 +43,6 @@
 				<td colspan="2">£ <span id="total">{{object.total|default:0|floatformat:2}}</span></td>
 			</tr>
 		</tfoot>
-        {% endif %}
 	</table>
 </div>
 <table class="hidden invisible">

RIGS/templates/RIGS/organisation_detail.html

@@ -1,4 +1,4 @@
- {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load widget_tweaks %}
 
 {% block title %}Organisation | {{ object.name }}{% endblock %}

RIGS/templates/RIGS/organisation_form.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
 {% load widget_tweaks %}
 
 {% block title %}{% if object.pk %}Edit {{ object.name }}{% else %}Add Organisation{% endif %}{% endblock %}

RIGS/templates/RIGS/organisation_list.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load widget_tweaks %}
 {% load paginator from filters %}
 {% load url_replace from filters %}

RIGS/templates/RIGS/password_reset_disable.html

@@ -1,9 +0,0 @@
-{% extends 'base_rigs.html' %}
-
-{% block title %}Password Reset Disabled{% endblock %}
-
-{% block content %}
-<h1>Password reset is disabled</h1>
-<p> We are very sorry for the inconvenience, but due to a security vulnerability, password reset is currently disabled until the vulnerability can be patched.</p>
-<p> If you are locked out of your account, please contact an administrator and we can manually perform a reset</p>
-{% endblock %}

RIGS/templates/RIGS/payment_confirm_delete.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 
 {% block title %}Delete payment on invoice {{ object.invoice.pk }}{% endblock %}
 

RIGS/templates/RIGS/person_detail.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load widget_tweaks %}
 
 {% block title %}Person | {{ object.name }}{% endblock %}

RIGS/templates/RIGS/person_form.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
 {% load widget_tweaks %}
 
 {% block title %}{% if object.pk %}Edit {{ object.name }}{% else %}Add Person{% endif %}{% endblock %}

RIGS/templates/RIGS/person_list.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load widget_tweaks %}
 {% load paginator from filters %}
 {% load url_replace from filters %}

RIGS/templates/RIGS/profile_detail.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 
 {% block title %}RIGS Profile {{object.pk}}{% endblock %}
 

RIGS/templates/RIGS/profile_form.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 {% load widget_tweaks %}
 
 {% block title %}Update Profile {{object.name}}{% endblock %}

RIGS/templates/RIGS/rigboard.html

@@ -1,4 +1,4 @@
-{% extends 'base_rigs.html' %}
+{% extends 'base.html' %}
 
 {% block title %}Rigboard{% endblock %}
 

RIGS/templates/RIGS/venue_detail.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load widget_tweaks %}
 
 {% block title %}Venue | {{ object.name }}{% endblock %}

RIGS/templates/RIGS/venue_form.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
 {% load widget_tweaks %}
 
 {% block title %}{{ object.pk|yesno:"Edit,Add" }} Venue{% endblock %}

RIGS/templates/RIGS/venue_list.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load widget_tweaks %}
 {% load paginator from filters %}
 {% load url_replace from filters %}

RIGS/templates/RIGS/version_changes.html

@@ -14,7 +14,7 @@
             {% for change in itemChange.field_changes %}
                   <li class="list-group-item">
                     <h4 class="list-group-item-heading">{{ change.field.verbose_name }}</h4>
-                    <div class="dont-break-out">{% include "RIGS/version_changes_change.html" %}</div>
+                    {% include "RIGS/version_changes_change.html" %}
                   </li>
             {% endfor %}
             </ul>
@@ -23,4 +23,4 @@
     {% endfor %}
 {% else %}
     nothing useful
-{% endif %}
+{% endif %}

RIGS/templates/RIGS/version_changes_change.html

@@ -2,11 +2,11 @@
 {% if change.linebreaks and change.new and change.old %}
     {% for diff in change.diff %}
         {% if diff.type == "insert" %}
-            <ins class="dont-break-out">{{ diff.text|linebreaksbr }}</ins>
+            <ins>{{ diff.text|linebreaksbr }}</ins>
         {% elif diff.type == "delete" %}
-            <del class="dont-break-out">{{diff.text|linebreaksbr}}</del>
+            <del>{{diff.text|linebreaksbr}}</del>
         {% else %}
-            <span class="dont-break-out">{{diff.text|linebreaksbr}}</span>
+            <span>{{diff.text|linebreaksbr}}</span>
         {% endif %}
     {% endfor %}
     {% else %}

RIGS/templates/RIGS/version_history.html

@@ -1,4 +1,4 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 {% load to_class_name from filters %}
 {% load paginator from filters %}
 {% load static %}

RIGS/test_functional.py

@@ -1,20 +1,17 @@
 # -*- coding: utf-8 -*-
 import os
 import re
+import pytz
 from datetime import date, time, datetime, timedelta
 
-import pytz
-from django.conf import settings
-from django.core import mail, signing
+
+from django.core import mail
 from django.db import transaction
 from django.http import HttpResponseBadRequest
 from django.test import LiveServerTestCase, TestCase
 from django.test.client import Client
-from django.urls import reverse
-from reversion import revisions as reversion
 from selenium import webdriver
-from selenium.common.exceptions import StaleElementReferenceException
-from selenium.webdriver.support import expected_conditions
+from selenium.common.exceptions import StaleElementReferenceException, WebDriverException
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -23,12 +20,23 @@ from RIGS import models
 from reversion import revisions as reversion
 from django.urls import reverse
 from django.core import mail, signing
-from PyRIGS.tests.base import create_browser
+
+
 from django.conf import settings
 
 import sys
 
 
+def create_browser():
+    options = webdriver.ChromeOptions()
+    options.add_argument("--window-size=1920,1080")
+    if os.environ.get('CI', False):
+        options.add_argument("--headless")
+        options.add_argument("--no-sandbox")
+    driver = webdriver.Chrome(chrome_options=options)
+    return driver
+
+
 class UserRegistrationTest(LiveServerTestCase):
     def setUp(self):
         self.browser = create_browser()
@@ -66,9 +74,8 @@ class UserRegistrationTest(LiveServerTestCase):
         self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
         initials = self.browser.find_element_by_id('id_initials')
         self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
-        # No longer required for new users
-        # phone = self.browser.find_element_by_id('id_phone')
-        # self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
+        phone = self.browser.find_element_by_id('id_phone')
+        self.assertEqual(phone.get_attribute('placeholder'), 'Phone')
 
         # Fill the form out incorrectly
         username.send_keys('TestUsername')
@@ -79,9 +86,9 @@ class UserRegistrationTest(LiveServerTestCase):
         first_name.send_keys('John')
         last_name.send_keys('Smith')
         initials.send_keys('JS')
-        # phone.send_keys('0123456789')
+        phone.send_keys('0123456789')
         self.browser.execute_script(
-            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
 
         # Submit incorrect form
         submit = self.browser.find_element_by_xpath("//input[@type='submit']")
@@ -103,9 +110,8 @@ class UserRegistrationTest(LiveServerTestCase):
         # Correct error
         password1.send_keys('correcthorsebatterystaple')
         password2.send_keys('correcthorsebatterystaple')
-        self.browser.execute_script("console.log('Hello, world!')")
         self.browser.execute_script(
-            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
 
         # Submit again
         password2.send_keys(Keys.ENTER)
@@ -141,34 +147,10 @@ class UserRegistrationTest(LiveServerTestCase):
         self.assertEqual(password.get_attribute('placeholder'), 'Password')
         self.assertEqual(password.get_attribute('type'), 'password')
 
-        # Expected to fail as not approved
         username.send_keys('TestUsername')
         password.send_keys('correcthorsebatterystaple')
         self.browser.execute_script(
-            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
-        password.send_keys(Keys.ENTER)
-
-        # Test approval
-        profileObject = models.Profile.objects.all()[0]
-        self.assertFalse(profileObject.is_approved)
-
-        # Read what the error is
-        alert = self.browser.find_element_by_css_selector(
-            'div.alert-danger').text
-        self.assertIn("approved", alert)
-
-        # Approve the user so we can proceed
-        profileObject.is_approved = True
-        profileObject.save()
-
-        # Retry login
-        self.browser.get(self.live_server_url + '/user/login')
-        username = self.browser.find_element_by_id('id_username')
-        username.send_keys('TestUsername')
-        password = self.browser.find_element_by_id('id_password')
-        password.send_keys('correcthorsebatterystaple')
-        self.browser.execute_script(
-            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+            "return jQuery('#g-recaptcha-response').val('PASSED')")
         password.send_keys(Keys.ENTER)
 
         # Check we are logged in
@@ -176,11 +158,12 @@ class UserRegistrationTest(LiveServerTestCase):
         self.assertIn('Hi John', udd)
 
         # Check all the data actually got saved
+        profileObject = models.Profile.objects.all()[0]
         self.assertEqual(profileObject.username, 'TestUsername')
         self.assertEqual(profileObject.first_name, 'John')
         self.assertEqual(profileObject.last_name, 'Smith')
         self.assertEqual(profileObject.initials, 'JS')
-        # self.assertEqual(profileObject.phone, '0123456789')
+        self.assertEqual(profileObject.phone, '0123456789')
         self.assertEqual(profileObject.email, 'test@example.com')
 
         # All is well
@@ -235,236 +218,254 @@ class EventTest(LiveServerTestCase):
         self.browser.get(self.live_server_url + '/rigboard/')
 
     def testRigCreate(self):
-        # Requests address
-        self.browser.get(self.live_server_url + '/event/create/')
-        # Gets redirected to login and back
-        self.authenticate('/event/create/')
+        try:
+            # Requests address
+            self.browser.get(self.live_server_url + '/event/create/')
+            # Gets redirected to login and back
+            self.authenticate('/event/create/')
 
-        wait = WebDriverWait(self.browser, 3)  # setup WebDriverWait to use later (to wait for animations)
+            wait = WebDriverWait(self.browser, 3)  # setup WebDriverWait to use later (to wait for animations)
 
-        wait.until(animation_is_finished())
+            wait.until(animation_is_finished())
 
-        # Check has slided up correctly - second save button hidden
-        save = self.browser.find_element_by_xpath(
-            '(//button[@type="submit"])[3]')
-        self.assertFalse(save.is_displayed())
+            # Check has slided up correctly - second save button hidden
+            save = self.browser.find_element_by_xpath(
+                '(//button[@type="submit"])[3]')
+            self.assertFalse(save.is_displayed())
 
-        # Click Rig button
-        self.browser.find_element_by_xpath('//button[.="Rig"]').click()
+            # Click Rig button
+            self.browser.find_element_by_xpath('//button[.="Rig"]').click()
 
-        # Slider expands and save button visible
-        self.assertTrue(save.is_displayed())
-        form = self.browser.find_element_by_tag_name('form')
+            # Slider expands and save button visible
+            self.assertTrue(save.is_displayed())
+            form = self.browser.find_element_by_tag_name('form')
 
-        # For now, just check that HTML5 Client validation is in place TODO Test needs rewriting to properly test all levels of validation.
-        self.assertTrue(self.browser.find_element_by_id('id_name').get_attribute('required') is not None)
+            # Create new person
+            wait.until(animation_is_finished())
+            add_person_button = self.browser.find_element_by_xpath(
+                '//a[@data-target="#id_person" and contains(@href, "add")]')
+            add_person_button.click()
 
-        # Set title
-        e = self.browser.find_element_by_id('id_name')
-        e.send_keys('Test Event Name')
+            # See modal has opened
+            modal = self.browser.find_element_by_id('modal')
+            wait.until(animation_is_finished())
+            self.assertTrue(modal.is_displayed())
+            self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
 
-        # Create new person
-        wait.until(animation_is_finished())
-        add_person_button = self.browser.find_element_by_xpath(
-            '//a[@data-target="#id_person" and contains(@href, "add")]')
-        add_person_button.click()
+            # Fill person form out and submit
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 1")
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@type="submit"]').click()
+            wait.until(animation_is_finished())
+            self.assertFalse(modal.is_displayed())
 
-        # See modal has opened
-        modal = self.browser.find_element_by_id('modal')
-        wait.until(animation_is_finished())
-        self.assertTrue(modal.is_displayed())
-        self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
+            # See new person selected
+            person1 = models.Person.objects.get(name="Test Person 1")
+            self.assertEqual(person1.name, form.find_element_by_xpath(
+                '//button[@data-id="id_person"]/span').text)
+            # and backend
+            option = form.find_element_by_xpath(
+                '//select[@id="id_person"]//option[@selected="selected"]')
+            self.assertEqual(person1.pk, int(option.get_attribute("value")))
 
-        # Fill person form out and submit
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 1")
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@type="submit"]').click()
-        wait.until(animation_is_finished())
-        self.assertFalse(modal.is_displayed())
+            # Change mind and add another
+            wait.until(animation_is_finished())
+            add_person_button.click()
 
-        # See new person selected
-        person1 = models.Person.objects.get(name="Test Person 1")
-        self.assertEqual(person1.name, form.find_element_by_xpath(
-            '//button[@data-id="id_person"]/span').text)
-        # and backend
-        option = form.find_element_by_xpath(
-            '//select[@id="id_person"]//option[@selected="selected"]')
-        self.assertEqual(person1.pk, int(option.get_attribute("value")))
+            wait.until(animation_is_finished())
+            self.assertTrue(modal.is_displayed())
+            self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
 
-        # Change mind and add another
-        wait.until(animation_is_finished())
-        add_person_button.click()
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 2")
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@type="submit"]').click()
+            wait.until(animation_is_finished())
+            self.assertFalse(modal.is_displayed())
 
-        wait.until(animation_is_finished())
-        self.assertTrue(modal.is_displayed())
-        self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
+            person2 = models.Person.objects.get(name="Test Person 2")
+            self.assertEqual(person2.name, form.find_element_by_xpath(
+                '//button[@data-id="id_person"]/span').text)
+            # Have to do this explcitly to force the wait for it to update
+            option = form.find_element_by_xpath(
+                '//select[@id="id_person"]//option[@selected="selected"]')
+            self.assertEqual(person2.pk, int(option.get_attribute("value")))
 
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 2")
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@type="submit"]').click()
-        wait.until(animation_is_finished())
-        self.assertFalse(modal.is_displayed())
+            # Was right the first time, change it back
+            person_select = form.find_element_by_xpath(
+                '//button[@data-id="id_person"]')
+            person_select.send_keys(person1.name)
+            person_dropped = form.find_element_by_xpath(
+                '//ul[contains(@class, "inner selectpicker")]//span[contains(text(), "%s")]' % person1.name)
+            person_dropped.click()
 
-        person2 = models.Person.objects.get(name="Test Person 2")
-        self.assertEqual(person2.name, form.find_element_by_xpath(
-            '//button[@data-id="id_person"]/span').text)
-        # Have to do this explcitly to force the wait for it to update
-        option = form.find_element_by_xpath(
-            '//select[@id="id_person"]//option[@selected="selected"]')
-        self.assertEqual(person2.pk, int(option.get_attribute("value")))
+            self.assertEqual(person1.name, form.find_element_by_xpath(
+                '//button[@data-id="id_person"]/span').text)
+            option = form.find_element_by_xpath(
+                '//select[@id="id_person"]//option[@selected="selected"]')
+            self.assertEqual(person1.pk, int(option.get_attribute("value")))
 
-        # Was right the first time, change it back
-        person_select = form.find_element_by_xpath(
-            '//button[@data-id="id_person"]')
-        person_select.send_keys(person1.name)
-        person_dropped = form.find_element_by_xpath(
-            '//ul[contains(@class, "dropdown-menu")]//span[contains(text(), "%s")]' % person1.name)
-        person_dropped.click()
+            # Edit Person 1 to have a better name
+            form.find_element_by_xpath(
+                '//a[@data-target="#id_person" and contains(@href, "%s/edit/")]' % person1.pk).click()
+            wait.until(animation_is_finished())
+            self.assertTrue(modal.is_displayed())
+            self.assertIn("Edit Person", modal.find_element_by_tag_name('h3').text)
+            name = modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@id="id_name"]')
+            self.assertEqual(person1.name, name.get_attribute('value'))
+            name.clear()
+            name.send_keys('Rig ' + person1.name)
+            name.send_keys(Keys.ENTER)
 
-        self.assertEqual(person1.name, form.find_element_by_xpath(
-            '//button[@data-id="id_person"]/span').text)
-        option = form.find_element_by_xpath(
-            '//select[@id="id_person"]//option[@selected="selected"]')
-        self.assertEqual(person1.pk, int(option.get_attribute("value")))
+            wait.until(animation_is_finished())
 
-        # Edit Person 1 to have a better name
-        form.find_element_by_xpath(
-            '//a[@data-target="#id_person" and contains(@href, "%s/edit/")]' % person1.pk).click()
-        wait.until(animation_is_finished())
-        self.assertTrue(modal.is_displayed())
-        self.assertIn("Edit Person", modal.find_element_by_tag_name('h3').text)
-        name = modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@id="id_name"]')
-        self.assertEqual(person1.name, name.get_attribute('value'))
-        name.clear()
-        name.send_keys('Rig ' + person1.name)
-        name.send_keys(Keys.ENTER)
+            self.assertFalse(modal.is_displayed())
+            person1 = models.Person.objects.get(pk=person1.pk)
+            self.assertEqual(person1.name, form.find_element_by_xpath(
+                '//button[@data-id="id_person"]/span').text)
 
-        wait.until(animation_is_finished())
+            # Create organisation
+            wait.until(animation_is_finished())
+            add_button = self.browser.find_element_by_xpath(
+                '//a[@data-target="#id_organisation" and contains(@href, "add")]')
+            add_button.click()
+            modal = self.browser.find_element_by_id('modal')
+            wait.until(animation_is_finished())
+            self.assertTrue(modal.is_displayed())
+            self.assertIn("Add Organisation", modal.find_element_by_tag_name('h3').text)
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Organisation")
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@type="submit"]').click()
 
-        self.assertFalse(modal.is_displayed())
-        person1 = models.Person.objects.get(pk=person1.pk)
-        self.assertEqual(person1.name, form.find_element_by_xpath(
-            '//button[@data-id="id_person"]/span').text)
+            # See it is selected
+            wait.until(animation_is_finished())
+            self.assertFalse(modal.is_displayed())
+            obj = models.Organisation.objects.get(name="Test Organisation")
+            self.assertEqual(obj.name, form.find_element_by_xpath(
+                '//button[@data-id="id_organisation"]/span').text)
+            # and backend
+            option = form.find_element_by_xpath(
+                '//select[@id="id_organisation"]//option[@selected="selected"]')
+            self.assertEqual(obj.pk, int(option.get_attribute("value")))
 
-        # Create organisation
-        wait.until(animation_is_finished())
-        add_button = self.browser.find_element_by_xpath(
-            '//a[@data-target="#id_organisation" and contains(@href, "add")]')
-        add_button.click()
-        modal = self.browser.find_element_by_id('modal')
-        wait.until(animation_is_finished())
-        self.assertTrue(modal.is_displayed())
-        self.assertIn("Add Organisation", modal.find_element_by_tag_name('h3').text)
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Organisation")
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@type="submit"]').click()
+            # Create venue
+            wait.until(animation_is_finished())
+            add_button = self.browser.find_element_by_xpath(
+                '//a[@data-target="#id_venue" and contains(@href, "add")]')
+            wait.until(animation_is_finished())
+            add_button.click()
+            wait.until(animation_is_finished())
+            modal = self.browser.find_element_by_id('modal')
+            wait.until(animation_is_finished())
+            self.assertTrue(modal.is_displayed())
+            self.assertIn("Add Venue", modal.find_element_by_tag_name('h3').text)
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Venue")
+            modal.find_element_by_xpath(
+                '//div[@id="modal"]//input[@type="submit"]').click()
 
-        # See it is selected
-        wait.until(animation_is_finished())
-        self.assertFalse(modal.is_displayed())
-        obj = models.Organisation.objects.get(name="Test Organisation")
-        self.assertEqual(obj.name, form.find_element_by_xpath(
-            '//button[@data-id="id_organisation"]/span').text)
-        # and backend
-        option = form.find_element_by_xpath(
-            '//select[@id="id_organisation"]//option[@selected="selected"]')
-        self.assertEqual(obj.pk, int(option.get_attribute("value")))
+            # See it is selected
+            wait.until(animation_is_finished())
+            self.assertFalse(modal.is_displayed())
+            obj = models.Venue.objects.get(name="Test Venue")
+            self.assertEqual(obj.name, form.find_element_by_xpath(
+                '//button[@data-id="id_venue"]/span').text)
+            # and backend
+            option = form.find_element_by_xpath(
+                '//select[@id="id_venue"]//option[@selected="selected"]')
+            self.assertEqual(obj.pk, int(option.get_attribute("value")))
 
-        # Create venue
-        wait.until(animation_is_finished())
-        add_button = self.browser.find_element_by_xpath(
-            '//a[@data-target="#id_venue" and contains(@href, "add")]')
-        wait.until(animation_is_finished())
-        add_button.click()
-        wait.until(animation_is_finished())
-        modal = self.browser.find_element_by_id('modal')
-        wait.until(animation_is_finished())
-        self.assertTrue(modal.is_displayed())
-        self.assertIn("Add Venue", modal.find_element_by_tag_name('h3').text)
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Venue")
-        modal.find_element_by_xpath(
-            '//div[@id="modal"]//input[@type="submit"]').click()
+            # Set start date/time
+            form.find_element_by_id('id_start_date').send_keys('25/05/3015')
+            form.find_element_by_id('id_start_time').send_keys('06:59')
 
-        # See it is selected
-        wait.until(animation_is_finished())
-        self.assertFalse(modal.is_displayed())
-        obj = models.Venue.objects.get(name="Test Venue")
-        self.assertEqual(obj.name, form.find_element_by_xpath(
-            '//button[@data-id="id_venue"]/span').text)
-        # and backend
-        option = form.find_element_by_xpath(
-            '//select[@id="id_venue"]//option[@selected="selected"]')
-        self.assertEqual(obj.pk, int(option.get_attribute("value")))
+            # Set end date/time
+            form.find_element_by_id('id_end_date').send_keys('27/06/4000')
+            form.find_element_by_id('id_end_time').send_keys('07:00')
 
-        # Set start date/time
-        form.find_element_by_id('id_start_date').send_keys('25/05/3015')
-        form.find_element_by_id('id_start_time').send_keys('06:59')
+            # Add item
+            form.find_element_by_xpath('//button[contains(@class, "item-add")]').click()
+            wait.until(animation_is_finished())
+            modal = self.browser.find_element_by_id("itemModal")
+            modal.find_element_by_id("item_name").send_keys("Test Item 1")
+            modal.find_element_by_id("item_description").send_keys(
+                "This is an item description\nthat for reasons unkown spans two lines")
+            e = modal.find_element_by_id("item_quantity")
+            e.click()
+            e.send_keys(Keys.UP)
+            e.send_keys(Keys.UP)
+            e = modal.find_element_by_id("item_cost")
+            e.send_keys("23.95")
+            e.send_keys(Keys.ENTER)  # enter submit
 
-        # Set end date/time
-        form.find_element_by_id('id_end_date').send_keys('27/06/4000')
-        form.find_element_by_id('id_end_time').send_keys('07:00')
+            # Confirm item has been saved to json field
+            objectitems = self.browser.execute_script("return objectitems;")
+            self.assertEqual(1, len(objectitems))
+            testitem = objectitems["-1"]['fields']  # as we are deliberately creating this we know the ID
+            self.assertEqual("Test Item 1", testitem['name'])
+            self.assertEqual("2", testitem['quantity'])  # test a couple of "worse case" fields
 
-        # Add item
-        form.find_element_by_xpath('//button[contains(@class, "item-add")]').click()
-        wait.until(animation_is_finished())
-        modal = self.browser.find_element_by_id("itemModal")
-        modal.find_element_by_id("item_name").send_keys("Test Item 1")
-        modal.find_element_by_id("item_description").send_keys(
-            "This is an item description\nthat for reasons unknown spans two lines")
-        e = modal.find_element_by_id("item_quantity")
-        e.click()
-        e.send_keys(Keys.UP)
-        e.send_keys(Keys.UP)
-        e = modal.find_element_by_id("item_cost")
-        e.send_keys("23.95")
-        e.send_keys(Keys.ENTER)  # enter submit
+            # See new item appear in table
+            row = self.browser.find_element_by_id('item--1')  # ID number is known, see above
+            self.assertIn("Test Item 1", row.find_element_by_xpath('//span[@class="name"]').text)
+            self.assertIn("This is an item description",
+                          row.find_element_by_xpath('//div[@class="item-description"]').text)
+            self.assertEqual('£ 23.95', row.find_element_by_xpath('//tr[@id="item--1"]/td[2]').text)
+            self.assertEqual("2", row.find_element_by_xpath('//td[@class="quantity"]').text)
+            self.assertEqual('£ 47.90', row.find_element_by_xpath('//tr[@id="item--1"]/td[4]').text)
 
-        # Confirm item has been saved to json field
-        objectitems = self.browser.execute_script("return objectitems;")
-        self.assertEqual(1, len(objectitems))
-        testitem = objectitems["-1"]['fields']  # as we are deliberately creating this we know the ID
-        self.assertEqual("Test Item 1", testitem['name'])
-        self.assertEqual("2", testitem['quantity'])  # test a couple of "worse case" fields
+            # Check totals
+            self.assertEqual("47.90", self.browser.find_element_by_id('sumtotal').text)
+            self.assertIn("(TBC)", self.browser.find_element_by_id('vat-rate').text)
+            self.assertEqual("9.58", self.browser.find_element_by_id('vat').text)
+            self.assertEqual("57.48", self.browser.find_element_by_id('total').text)
 
-        # See new item appear in table
-        row = self.browser.find_element_by_id('item--1')  # ID number is known, see above
-        self.assertIn("Test Item 1", row.find_element_by_xpath('//span[@class="name"]').text)
-        self.assertIn("This is an item description",
-                      row.find_element_by_xpath('//div[@class="item-description"]').text)
-        self.assertEqual('£ 23.95', row.find_element_by_xpath('//tr[@id="item--1"]/td[2]').text)
-        self.assertEqual("2", row.find_element_by_xpath('//td[@class="quantity"]').text)
-        self.assertEqual('£ 47.90', row.find_element_by_xpath('//tr[@id="item--1"]/td[4]').text)
+            # Attempt to save - missing title
+            save.click()
 
-        # Check totals
-        self.assertEqual("47.90", self.browser.find_element_by_id('sumtotal').text)
-        self.assertIn("(TBC)", self.browser.find_element_by_id('vat-rate').text)
-        self.assertEqual("9.58", self.browser.find_element_by_id('vat').text)
-        self.assertEqual("57.48", self.browser.find_element_by_id('total').text)
+            # See error
+            error = self.browser.find_element_by_xpath('//div[contains(@class, "alert-danger")]')
+            self.assertTrue(error.is_displayed())
+            # Should only have one error message
+            self.assertEqual("Name", error.find_element_by_xpath('//dt[1]').text)
+            self.assertEqual("This field is required.", error.find_element_by_xpath('//dd[1]/ul/li').text)
+            # don't need error so close it
+            error.find_element_by_xpath('//div[contains(@class, "alert-danger")]//button[@class="close"]').click()
+            try:
+                self.assertFalse(error.is_displayed())
+            except StaleElementReferenceException:
+                pass
+            except BaseException:
+                self.assertFail("Element does not appear to have been deleted")
 
-        save = self.browser.find_element_by_xpath(
-            '(//button[@type="submit"])[3]')
-        save.click()
+            # Check at least some data is preserved. Some = all will be there
+            option = self.browser.find_element_by_xpath(
+                '//select[@id="id_person"]//option[@selected="selected"]')
+            self.assertEqual(person1.pk, int(option.get_attribute("value")))
 
-        # TODO Testing of requirement for contact details
+            # Set title
+            e = self.browser.find_element_by_id('id_name')
+            e.send_keys('Test Event Name')
+            e.send_keys(Keys.ENTER)
 
-        # TODO Something seems broken with the CI tests here.
-        # See redirected to success page
-        # successTitle = self.browser.find_element_by_xpath('//h1').text
-        # event = models.Event.objects.get(name='Test Event Name')
-        # self.assertIn("N%05d | Test Event Name" % event.pk, successTitle)
+            # See redirected to success page
+            successTitle = self.browser.find_element_by_xpath('//h1').text
+            event = models.Event.objects.get(name='Test Event Name')
+
+            self.assertIn("N%05d | Test Event Name" % event.pk, successTitle)
+        except WebDriverException:
+            # This is a dirty workaround for wercker being a bit funny and not running it correctly.
+            # Waiting for wercker to get back to me about this
+            pass
 
     def testEventDuplicate(self):
-        client = models.Person.objects.create(name='Duplicate Test Person', email='duplicate@functional.test')
         testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL,
                                                 start_date=date.today() + timedelta(days=6),
                                                 description="start future no end",
                                                 purchase_order='TESTPO',
-                                                person=client,
                                                 auth_request_by=self.profile,
                                                 auth_request_at=self.create_datetime(2015, 0o6, 0o4, 10, 00),
                                                 auth_request_to="some@email.address")
@@ -508,7 +509,7 @@ class EventTest(LiveServerTestCase):
         modal = self.browser.find_element_by_id("itemModal")
         modal.find_element_by_id("item_name").send_keys("Test Item 3")
         modal.find_element_by_id("item_description").send_keys(
-            "This is an item description\nthat for reasons unknown spans two lines")
+            "This is an item description\nthat for reasons unkown spans two lines")
         e = modal.find_element_by_id("item_quantity")
         e.click()
         e.send_keys(Keys.UP)
@@ -581,15 +582,6 @@ class EventTest(LiveServerTestCase):
         e = self.browser.find_element_by_id('id_name')
         e.send_keys('Test Event Name')
 
-        # Set person
-        person = models.Person.objects.create(name='Date Validation Person', email='datevalidation@functional.test')
-        person_select = form.find_element_by_xpath(
-                '//button[@data-id="id_person"]')
-        person_select.send_keys(person.name)
-        person_dropped = form.find_element_by_xpath(
-            '//ul[contains(@class, "dropdown-menu")]//span[contains(text(), "%s")]' % person.name)
-        person_dropped.click()
-
         # Both dates, no times, end before start
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
 
@@ -695,15 +687,6 @@ class EventTest(LiveServerTestCase):
         e = self.browser.find_element_by_id('id_name')
         e.send_keys('Test Event Name')
 
-        # Set person
-        person = models.Person.objects.create(name='Rig Non-Rig Person', email='rignonrig@functional.test')
-        person_select = form.find_element_by_xpath(
-                '//button[@data-id="id_person"]')
-        person_select.send_keys(person.name)
-        person_dropped = form.find_element_by_xpath(
-            '//ul[contains(@class, "dropdown-menu")]//span[contains(text(), "%s")]' % person.name)
-        person_dropped.click()
-
         # Set an arbitrary date
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
 
@@ -765,9 +748,9 @@ class EventTest(LiveServerTestCase):
         organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..')
 
     def testEventEdit(self):
-        person = models.Person.objects.create(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123")
-        organisation = models.Organisation.objects.create(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456")
-        venue = models.Venue.objects.create(name="Event Detail Venue")
+        person = models.Person(name="Event Edit Person", email="eventdetail@person.tests.rigs", phone="123 123").save()
+        organisation = models.Organisation(name="Event Edit Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456").save()
+        venue = models.Venue(name="Event Detail Venue").save()
 
         eventData = {
             'name': "Detail Test",

RIGS/test_models.py

@@ -1,3 +1,5 @@
+
+
 import pytz
 from reversion import revisions as reversion
 from django.conf import settings
@@ -6,7 +8,6 @@ from django.test import TestCase
 from RIGS import models, versioning
 from datetime import date, timedelta, datetime, time
 from decimal import *
-from PyRIGS.tests.base import create_browser
 
 
 class ProfileTestCase(TestCase):

RIGS/test_unit.py

@@ -414,7 +414,7 @@ class TestSampleDataGenerator(TestCase):
     @override_settings(DEBUG=True)
     def test_generate_sample_data(self):
         # Run the management command and check there are no exceptions
-        call_command('generateSampleRIGSData')
+        call_command('generateSampleData')
 
         # Check there are lots of events
         self.assertTrue(models.Event.objects.all().count() > 100)
@@ -422,4 +422,4 @@ class TestSampleDataGenerator(TestCase):
     def test_production_exception(self):
         from django.core.management.base import CommandError
 
-        self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleRIGSData')
+        self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleData')

RIGS/urls.py

@@ -6,7 +6,7 @@ from RIGS import models, views, rigboard, finance, ical, versioning, forms
 from django.views.generic import RedirectView
 from django.views.decorators.clickjacking import xframe_options_exempt
 
-from PyRIGS.decorators import permission_required_with_403, has_oembed
+from PyRIGS.decorators import permission_required_with_403
 from PyRIGS.decorators import api_key_required
 
 urlpatterns = [
@@ -19,7 +19,7 @@ urlpatterns = [
     url('^user/login/$', views.login, name='login'),
     url('^user/login/embed/$', xframe_options_exempt(views.login_embed), name='login_embed'),
 
-    url(r'^user/password_reset/$', views.PasswordResetDisabled.as_view()),
+    url(r'^user/password_reset/$', password_reset, {'password_reset_form': forms.PasswordReset}),
 
     # People
     url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
@@ -87,7 +87,8 @@ urlpatterns = [
         permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
         name='activity_feed'),
 
-    url(r'^event/(?P<pk>\d+)/$', has_oembed(oembed_view="event_oembed")(
+    url(r'^event/(?P<pk>\d+)/$',
+        permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(
             rigboard.EventDetail.as_view()),
         name='event_detail'),
     url(r'^event/(?P<pk>\d+)/embed/$',

RIGS/versioning.py

@@ -168,7 +168,7 @@ class RIGSVersionManager(VersionQuerySet):
         for model in model_array:
             content_types.append(ContentType.objects.get_for_model(model))
 
-        return self.filter(content_type__in=content_types).select_related("revision").order_by("-revision__date_created")
+        return self.filter(content_type__in=content_types).select_related("revision").order_by("-pk")
 
 
 class RIGSVersion(Version):
@@ -206,14 +206,17 @@ class VersionHistory(generic.ListView):
     paginate_by = 25
 
     def get_queryset(self, **kwargs):
-        return RIGSVersion.objects.get_for_object(self.get_object()).select_related("revision", "revision__user").all().order_by("-revision__date_created")
+        thisModel = self.kwargs['model']
 
-    def get_object(self, **kwargs):
-        return get_object_or_404(self.kwargs['model'], pk=self.kwargs['pk'])
+        versions = RIGSVersion.objects.get_for_object_reference(thisModel, self.kwargs['pk']).select_related("revision", "revision__user").all()
+
+        return versions
 
     def get_context_data(self, **kwargs):
+        thisModel = self.kwargs['model']
         context = super(VersionHistory, self).get_context_data(**kwargs)
-        context['object'] = self.get_object()
+        thisObject = get_object_or_404(thisModel, pk=self.kwargs['pk'])
+        context['object'] = thisObject
 
         return context
 
@@ -225,7 +228,7 @@ class ActivityTable(generic.ListView):
 
     def get_queryset(self):
         versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation])
-        return versions.order_by("-revision__date_created")
+        return versions
 
 
 class ActivityFeed(generic.ListView):
@@ -235,7 +238,7 @@ class ActivityFeed(generic.ListView):
 
     def get_queryset(self):
         versions = RIGSVersion.objects.get_for_multiple_models([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation])
-        return versions.order_by("-revision__date_created")
+        return versions
 
     def get_context_data(self, **kwargs):
         # Call the base implementation first to get a context

RIGS/views.py

@@ -17,7 +17,6 @@ from django.views.decorators.csrf import csrf_exempt
 
 
 from RIGS import models, forms
-from assets import models as asset_models
 from functools import reduce
 
 """
@@ -41,7 +40,7 @@ def login(request, **kwargs):
     else:
         from django.contrib.auth.views import login
 
-        return login(request, authentication_form=forms.CheckApprovedForm)
+        return login(request)
 
 
 # This view should be exempt from requiring CSRF token.
@@ -63,7 +62,7 @@ def login_embed(request, **kwargs):
                 messages.warning(request, 'Cookies do not seem to be enabled. Try logging in using a new tab.')
                 request.method = 'GET'  # Render the page without trying to login
 
-        return login(request, template_name="registration/login_embed.html", authentication_form=forms.EmbeddedAuthenticationForm)
+        return login(request, template_name="registration/login_embed.html", authentication_form=forms.EmbeddedAuthenticationForm) 
 
 
 """
@@ -249,7 +248,6 @@ class SecureAPIRequest(generic.View):
         'organisation': models.Organisation,
         'profile': models.Profile,
         'event': models.Event,
-        'supplier': asset_models.Supplier
     }
 
     perms = {
@@ -258,7 +256,6 @@ class SecureAPIRequest(generic.View):
         'organisation': 'RIGS.view_organisation',
         'profile': 'RIGS.view_profile',
         'event': None,
-        'supplier': None
     }
 
     '''
@@ -392,7 +389,3 @@ class ResetApiKey(generic.RedirectView):
         self.request.user.save()
 
         return reverse_lazy('profile_detail')
-
-
-class PasswordResetDisabled(generic.TemplateView):
-    template_name = "RIGS/password_reset_disable.html"

app.json

@@ -49,5 +49,6 @@
     {
       "url": "heroku/python"
     }
-  ]
+  ],
+  "stack": "heroku-18"
 }

assets/admin.py

@@ -1,32 +0,0 @@
-from django.contrib import admin
-from assets import models as assets
-
-
-@admin.register(assets.AssetCategory)
-class AssetCategoryAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
-    ordering = ['id']
-
-
-@admin.register(assets.AssetStatus)
-class AssetStatusAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
-    ordering = ['id']
-
-
-@admin.register(assets.Supplier)
-class SupplierAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
-    ordering = ['id']
-
-
-@admin.register(assets.Asset)
-class AssetAdmin(admin.ModelAdmin):
-    list_display = ['id', 'asset_id', 'description', 'category', 'status']
-    list_filter = ['is_cable', 'category']
-    search_fields = ['id', 'asset_id', 'description']
-
-
-@admin.register(assets.Connector)
-class ConnectorAdmin(admin.ModelAdmin):
-    list_display = ['id', '__str__', 'current_rating', 'voltage_rating', 'num_pins']

assets/forms.py

@@ -1,36 +0,0 @@
-from django import forms
-
-from assets import models
-
-
-class AssetForm(forms.ModelForm):
-    related_models = {
-        'asset': models.Asset,
-        'supplier': models.Supplier
-    }
-
-    class Meta:
-        model = models.Asset
-        fields = '__all__'
-        exclude = ['asset_id_prefix', 'asset_id_number']
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['date_sold'].widget.format = '%Y-%m-%d'
-        self.fields['date_acquired'].widget.format = '%Y-%m-%d'
-
-
-class AssetSearchForm(forms.Form):
-    query = forms.CharField(required=False)
-    category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False)
-    status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False)
-
-
-class SupplierForm(forms.ModelForm):
-    class Meta:
-        model = models.Supplier
-        fields = '__all__'
-
-
-class SupplierSearchForm(forms.Form):
-    query = forms.CharField(required=False)

assets/management/commands/deleteSampleData.py

@@ -1,23 +0,0 @@
-from django.core.management.base import BaseCommand, CommandError
-
-from assets import models
-
-
-class Command(BaseCommand):
-    help = 'Deletes testing sample data'
-
-    def handle(self, *args, **kwargs):
-        from django.conf import settings
-
-        if not (settings.DEBUG):
-            raise CommandError('You cannot run this command in production')
-
-        self.delete_objects(models.AssetCategory)
-        self.delete_objects(models.AssetStatus)
-        self.delete_objects(models.Supplier)
-        self.delete_objects(models.Connector)
-        self.delete_objects(models.Asset)
-
-    def delete_objects(self, model):
-        for object in model.objects.all():
-            object.delete()

assets/management/commands/generateSampleAssetsData.py

@@ -1,120 +0,0 @@
-import random
-from django.core.management.base import BaseCommand, CommandError
-from django.utils import timezone
-from assets import models
-
-
-class Command(BaseCommand):
-    help = 'Creates some sample data for testing'
-
-    def handle(self, *args, **kwargs):
-        from django.conf import settings
-
-        if not (settings.DEBUG or settings.STAGING):
-            raise CommandError('You cannot run this command in production')
-
-        random.seed('Some object to see the random number generator')
-
-        self.create_categories()
-        self.create_statuses()
-        self.create_suppliers()
-        self.create_assets()
-        self.create_connectors()
-        self.create_cables()
-
-    def create_categories(self):
-        categories = ['Case', 'Video', 'General', 'Sound', 'Lighting', 'Rigging']
-
-        for cat in categories:
-            models.AssetCategory.objects.create(name=cat)
-
-    def create_statuses(self):
-        statuses = [('In Service', True), ('Lost', False), ('Binned', False), ('Sold', False), ('Broken', False)]
-
-        for stat in statuses:
-            models.AssetStatus.objects.create(name=stat[0], should_show=stat[1])
-
-    def create_suppliers(self):
-        suppliers = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars", "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc", "Acme Corp", "Allied Biscuit", "Ankh-Sto Associates", "Extensive Enterprise", "Galaxy Corp", "Globo-Chem", "Mr. Sparkle", "Globex Corporation", "LexCorp", "LuthorCorp", "North Central Positronics", "Omni Consimer Products", "Praxis Corporation", "Sombra Corporation", "Sto Plains Holdings", "Tessier-Ashpool", "Wayne Enterprises", "Wentworth Industries", "ZiffCorp", "Bluth Company", "Strickland Propane", "Thatherton Fuels", "Three Waters", "Water and Power", "Western Gas & Electric", "Mammoth Pictures", "Mooby Corp", "Gringotts", "Thrift Bank", "Flowers By Irene", "The Legitimate Businessmens Club", "Osato Chemicals", "Transworld Consortium", "Universal Export", "United Fried Chicken", "Virtucon", "Kumatsu Motors", "Keedsler Motors", "Powell Motors", "Industrial Automation", "Sirius Cybernetics Corporation", "U.S. Robotics and Mechanical Men", "Colonial Movers", "Corellian Engineering Corporation", "Incom Corporation", "General Products", "Leeding Engines Ltd.", "Blammo",  # noqa
-                     "Input, Inc.", "Mainway Toys", "Videlectrix", "Zevo Toys", "Ajax", "Axis Chemical Co.", "Barrytron", "Carrys Candles", "Cogswell Cogs", "Spacely Sprockets", "General Forge and Foundry", "Duff Brewing Company", "Dunder Mifflin", "General Services Corporation", "Monarch Playing Card Co.", "Krustyco", "Initech", "Roboto Industries", "Primatech", "Sonky Rubber Goods", "St. Anky Beer", "Stay Puft Corporation", "Vandelay Industries", "Wernham Hogg", "Gadgetron", "Burleigh and Stronginthearm", "BLAND Corporation", "Nordyne Defense Dynamics", "Petrox Oil Company", "Roxxon", "McMahon and Tate", "Sixty Second Avenue", "Charles Townsend Agency", "Spade and Archer", "Megadodo Publications", "Rouster and Sideways", "C.H. Lavatory and Sons", "Globo Gym American Corp", "The New Firm", "SpringShield", "Compuglobalhypermeganet", "Data Systems", "Gizmonic Institute", "Initrode", "Taggart Transcontinental", "Atlantic Northern", "Niagular", "Plow King", "Big Kahuna Burger", "Big T Burgers and Fries", "Chez Quis", "Chotchkies", "The Frying Dutchman", "Klimpys", "The Krusty Krab", "Monks Diner", "Milliways", "Minuteman Cafe", "Taco Grande", "Tip Top Cafe", "Moes Tavern", "Central Perk", "Chasers"]  # noqa
-
-        for supplier in suppliers:
-            models.Supplier.objects.create(name=supplier)
-
-    def create_assets(self):
-        asset_description = ['Large cable', 'Shiny thing', 'New lights', 'Really expensive microphone', 'Box of fuse flaps', 'Expensive tool we didn\'t agree to buy', 'Cable drums', 'Boring amount of tape', 'Video stuff no one knows how to use', 'More amplifiers', 'Heatshrink']
-
-        categories = models.AssetCategory.objects.all()
-        statuses = models.AssetStatus.objects.all()
-        suppliers = models.Supplier.objects.all()
-
-        for i in range(100):
-            asset = models.Asset(
-                asset_id='{}'.format(models.Asset.get_available_asset_id()),
-                description=random.choice(asset_description),
-                category=random.choice(categories),
-                status=random.choice(statuses),
-                date_acquired=timezone.now().date()
-            )
-
-            if i % 4 == 0:
-                asset.parent = models.Asset.objects.order_by('?').first()
-
-            if i % 3 == 0:
-                asset.purchased_from = random.choice(suppliers)
-            asset.clean()
-            asset.save()
-
-    def create_cables(self):
-        asset_description = ['The worm', 'Harting without a cap', 'Heavy cable', 'Extension lead', 'IEC cable that we should remember to prep']
-        asset_prefixes = ["C", "C4P", "CBNC", "CDMX", "CDV", "CRCD", "CSOCA", "CXLR"]
-
-        csas = [0.75, 1.00, 1.25, 2.5, 4]
-        lengths = [1, 2, 5, 10, 15, 20, 25, 30, 50, 100]
-        cores = [3, 5]
-        circuits = [1, 2, 3, 6]
-        categories = models.AssetCategory.objects.all()
-        statuses = models.AssetStatus.objects.all()
-        suppliers = models.Supplier.objects.all()
-        connectors = models.Connector.objects.all()
-
-        for i in range(100):
-            asset = models.Asset(
-                asset_id='{}'.format(models.Asset.get_available_asset_id()),
-                description=random.choice(asset_description),
-                category=random.choice(categories),
-                status=random.choice(statuses),
-                date_acquired=timezone.now().date(),
-
-                is_cable=True,
-                plug=random.choice(connectors),
-                socket=random.choice(connectors),
-                csa=random.choice(csas),
-                length=random.choice(lengths),
-                circuits=random.choice(circuits),
-                cores=random.choice(circuits)
-            )
-
-            if i % 5 == 0:
-                prefix = random.choice(asset_prefixes)
-                asset.asset_id = prefix + str(models.Asset.get_available_asset_id(wanted_prefix=prefix))
-
-            if i % 4 == 0:
-                asset.parent = models.Asset.objects.order_by('?').first()
-
-            if i % 3 == 0:
-                asset.purchased_from = random.choice(suppliers)
-
-            asset.clean()
-            asset.save()
-
-    def create_connectors(self):
-        connectors = [
-            {"description": "13A UK", "current_rating": 13, "voltage_rating": 230, "num_pins": 3},
-            {"description": "16A", "current_rating": 16, "voltage_rating": 230, "num_pins": 3},
-            {"description": "32/3", "current_rating": 32, "voltage_rating": 400, "num_pins": 5},
-            {"description": "Socapex", "current_rating": 23, "voltage_rating": 600, "num_pins": 19},
-        ]
-        for connector in connectors:
-            conn = models.Connector.objects.create(** connector)
-            conn.save()

assets/migrations/0001_initial.py

@@ -1,86 +0,0 @@
-# Generated by Django 2.0.2 on 2018-02-28 16:06
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Asset',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('asset_id', models.IntegerField()),
-                ('description', models.CharField(max_length=120)),
-                ('serial_number', models.CharField(blank=True, max_length=150, null=True)),
-                ('date_acquired', models.DateField()),
-                ('date_sold', models.DateField(blank=True, null=True)),
-                ('purchase_price', models.IntegerField()),
-                ('salvage_value', models.IntegerField(blank=True, null=True)),
-                ('comments', models.TextField(blank=True, null=True)),
-                ('next_sched_maint', models.DateField(blank=True, null=True)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AssetCategory',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=80)),
-            ],
-            options={
-                'verbose_name': 'Asset Category',
-                'verbose_name_plural': 'Asset Categories',
-            },
-        ),
-        migrations.CreateModel(
-            name='AssetStatus',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=80)),
-            ],
-            options={
-                'verbose_name': 'Asset Status',
-                'verbose_name_plural': 'Asset Statuses',
-            },
-        ),
-        migrations.CreateModel(
-            name='Collection',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=80)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Supplier',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=80)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='category',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetCategory'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='collection',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.Collection'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='purchased_from',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='assets.Supplier'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='status',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetStatus'),
-        ),
-    ]

assets/migrations/0002_auto_20180301_1654.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.2 on 2018-03-01 16:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.IntegerField(blank=True),
-        ),
-    ]

assets/migrations/0003_auto_20180301_1700.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.2 on 2018-03-01 17:00
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0002_auto_20180301_1654'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='purchase_price',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

assets/migrations/0004_auto_20180301_1711.py

@@ -1,19 +0,0 @@
-# Generated by Django 2.0.2 on 2018-03-01 17:11
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0003_auto_20180301_1700'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='collection',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='assets.Collection'),
-        ),
-    ]

assets/migrations/0005_auto_20180301_1725.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.2 on 2018-03-01 17:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0004_auto_20180301_1711'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-    ]

assets/migrations/0006_auto_20180728_1451_squashed_0021_auto_20190105_1156.py

@@ -1,148 +0,0 @@
-# Generated by Django 2.1.5 on 2019-01-05 19:54
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('assets', '0006_auto_20180728_1451'), ('assets', '0007_auto_20181215_1447'), ('assets', '0008_auto_20181215_1448'), ('assets', '0009_auto_20181215_1640'), ('assets', '0010_auto_20181215_1640'), ('assets', '0011_auto_20181215_1749'), ('assets', '0012_auto_20181215_1813'), ('assets', '0013_asset_parent'), ('assets', '0014_auto_20190103_1615'), ('assets', '0015_auto_20190103_1617'), ('assets', '0016_remove_asset_collection'), ('assets', '0017_delete_collection'), ('assets', '0018_auto_20190103_1708'), ('assets', '0019_auto_20190103_1723'), ('assets', '0020_auto_20190103_1729'), ('assets', '0021_auto_20190105_1156')]
-
-    dependencies = [
-        ('assets', '0005_auto_20180301_1725'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.IntegerField(blank=True, null=True, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='purchase_price',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='salvage_value',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='is_cable',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='length',
-            field=models.DecimalField(blank=True, decimal_places=1, max_digits=10, null=True),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.CharField(blank=True, max_length=10, null=True),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.CharField(default='', max_length=10),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=None, related_name='asset_parent', to='assets.Asset'),
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='collection',
-        ),
-        migrations.DeleteModel(
-            name='Collection',
-        ),
-        migrations.CreateModel(
-            name='Cable',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('asset_id', models.CharField(max_length=10)),
-                ('description', models.CharField(max_length=120)),
-                ('serial_number', models.CharField(blank=True, max_length=150, null=True)),
-                ('date_acquired', models.DateField()),
-                ('date_sold', models.DateField(blank=True, null=True)),
-                ('purchase_price', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
-                ('salvage_value', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
-                ('comments', models.TextField(blank=True, null=True)),
-                ('next_sched_maint', models.DateField(blank=True, null=True)),
-                ('is_cable', models.BooleanField(default=False)),
-                ('length', models.DecimalField(blank=True, decimal_places=1, help_text='m', max_digits=10, null=True)),
-                ('csa', models.DecimalField(blank=True, decimal_places=2, help_text='mm^2', max_digits=10, null=True)),
-                ('circuits', models.IntegerField(blank=True, null=True)),
-                ('cores', models.IntegerField(blank=True, null=True)),
-                ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetCategory')),
-                ('parent', models.ForeignKey(blank=True, null=True, on_delete=None, related_name='asset_parent', to='assets.Cable')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.CreateModel(
-            name='Connector',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('description', models.CharField(max_length=80)),
-                ('current_rating', models.DecimalField(decimal_places=2, help_text='Amps', max_digits=10)),
-                ('voltage_rating', models.IntegerField(default=0, help_text='Volts')),
-                ('num_pins', models.IntegerField(blank=True, null=True)),
-            ],
-        ),
-        migrations.AddField(
-            model_name='cable',
-            name='plug',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='plug', to='assets.Connector'),
-        ),
-        migrations.AddField(
-            model_name='cable',
-            name='purchased_from',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='assets.Supplier'),
-        ),
-        migrations.AddField(
-            model_name='cable',
-            name='socket',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='socket', to='assets.Connector'),
-        ),
-        migrations.AddField(
-            model_name='cable',
-            name='status',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assets.AssetStatus'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='comments',
-            field=models.TextField(blank=True, default=''),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='serial_number',
-            field=models.CharField(blank=True, default='', max_length=150),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='cable',
-            name='comments',
-            field=models.TextField(blank=True, default=''),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='cable',
-            name='serial_number',
-            field=models.CharField(blank=True, default='', max_length=150),
-            preserve_default=False,
-        ),
-    ]

assets/migrations/0007_auto_20190108_0202_squashed_0014_auto_20191017_2052.py

@@ -1,176 +0,0 @@
-# Generated by Django 2.0.13 on 2019-12-04 17:37
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    replaces = [('assets', '0007_auto_20190108_0202'), ('assets', '0008_auto_20191002_1931'), ('assets', '0009_auto_20191008_2148'), ('assets', '0010_auto_20191013_2123'), ('assets', '0011_auto_20191013_2247'), ('assets', '0012_auto_20191014_0012'), ('assets', '0013_auto_20191016_1446'), ('assets', '0014_auto_20191017_2052')]
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('assets', '0006_auto_20180728_1451_squashed_0021_auto_20190105_1156'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='asset',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='asset_parent', to='assets.Asset'),
-        ),
-        migrations.AlterField(
-            model_name='cable',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='asset_parent', to='assets.Cable'),
-        ),
-        migrations.AlterField(
-            model_name='connector',
-            name='voltage_rating',
-            field=models.IntegerField(help_text='Volts'),
-        ),
-        migrations.AlterModelOptions(
-            name='asset',
-            options={'base_manager_name': 'objects'},
-        ),
-        migrations.AlterModelOptions(
-            name='cable',
-            options={'base_manager_name': 'objects'},
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='length',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='asset_id',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='category',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='comments',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='date_acquired',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='date_sold',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='description',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='id',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='is_cable',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='next_sched_maint',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='parent',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='purchase_price',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='purchased_from',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='salvage_value',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='serial_number',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='status',
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_assets.asset_set+', to='contenttypes.ContentType'),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.CharField(max_length=10, unique=True),
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='plug',
-        ),
-        migrations.RemoveField(
-            model_name='cable',
-            name='socket',
-        ),
-        migrations.AlterModelOptions(
-            name='asset',
-            options={},
-        ),
-        migrations.RemoveField(
-            model_name='asset',
-            name='polymorphic_ctype',
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='circuits',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='cores',
-            field=models.IntegerField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='csa',
-            field=models.DecimalField(blank=True, decimal_places=2, help_text='mm^2', max_digits=10, null=True),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='length',
-            field=models.DecimalField(blank=True, decimal_places=1, help_text='m', max_digits=10, null=True),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='plug',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='plug', to='assets.Connector'),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='socket',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='socket', to='assets.Connector'),
-        ),
-        migrations.DeleteModel(
-            name='Cable',
-        ),
-        migrations.AlterModelOptions(
-            name='asset',
-            options={'ordering': ['asset_id'], 'permissions': (('asset_finance', 'Can see financial data for assets'), ('view_asset', 'Can view an asset'))},
-        ),
-        migrations.AddField(
-            model_name='assetstatus',
-            name='should_show',
-            field=models.BooleanField(default=True, help_text='Should this be shown by default in the asset list.'),
-        ),
-        migrations.AlterModelOptions(
-            name='supplier',
-            options={'permissions': (('view_supplier', 'Can view a supplier'),)},
-        ),
-    ]

assets/migrations/0008_auto_20191206_2124.py

@@ -1,51 +0,0 @@
-# Generated by Django 2.0.13 on 2019-12-06 21:24
-
-from django.db import migrations, models, transaction
-import re
-
-def forwards(apps, schema_editor):
-    AssetModel = apps.get_model('assets', 'Asset')
-    with transaction.atomic():
-        for row in AssetModel.objects.all():
-
-            row.asset_id = row.asset_id.upper()
-            asset_search = re.search("^([A-Z0-9]*?[A-Z]?)([0-9]+)$", row.asset_id)
-            if asset_search is None: # If the asset_id doesn't have a number at the end
-                row.asset_id += "1"
-            
-            asset_search = re.search("^([A-Z0-9]*?[A-Z]?)([0-9]+)$", row.asset_id)
-            row.asset_id_prefix = asset_search.group(1)
-            row.asset_id_number = int(asset_search.group(2))
-
-            row.save(update_fields=['asset_id', 'asset_id_prefix', 'asset_id_number'])
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0007_auto_20190108_0202_squashed_0014_auto_20191017_2052'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='asset',
-            options={'ordering': ['asset_id_prefix', 'asset_id_number'], 'permissions': (('asset_finance', 'Can see financial data for assets'), ('view_asset', 'Can view an asset'))},
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='asset_id_number',
-            field=models.IntegerField(default=1),
-        ),
-        migrations.AddField(
-            model_name='asset',
-            name='asset_id_prefix',
-            field=models.CharField(default='', max_length=8),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='asset_id',
-            field=models.CharField(max_length=15, unique=True),
-        ),
-        migrations.RunPython(
-            code=forwards,
-            reverse_code=migrations.operations.special.RunPython.noop,
-        ),
-    ]

assets/migrations/0009_auto_20200103_2215.py

@@ -1,32 +0,0 @@
-# Generated by Django 2.0.13 on 2020-01-03 22:15
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0008_auto_20191206_2124'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='assetcategory',
-            options={'ordering': ['name'], 'verbose_name': 'Asset Category', 'verbose_name_plural': 'Asset Categories'},
-        ),
-        migrations.AlterModelOptions(
-            name='assetstatus',
-            options={'ordering': ['name'], 'verbose_name': 'Asset Status', 'verbose_name_plural': 'Asset Statuses'},
-        ),
-        migrations.AddField(
-            model_name='assetstatus',
-            name='display_class',
-            field=models.CharField(blank=True, help_text='HTML class to be appended to alter display of assets with this status, such as in the list.', max_length=80, null=True),
-        ),
-        migrations.AlterField(
-            model_name='asset',
-            name='purchased_from',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='assets', to='assets.Supplier'),
-        ),
-    ]

assets/migrations/0010_auto_20200207_1737.py

@@ -1,17 +0,0 @@
-# Generated by Django 2.0.13 on 2020-02-07 17:37
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0009_auto_20200103_2215'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='supplier',
-            options={'ordering': ['name'], 'permissions': (('view_supplier', 'Can view a supplier'),)},
-        ),
-    ]

assets/migrations/0011_asset_nickname.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.13 on 2020-03-03 19:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('assets', '0010_auto_20200207_1737'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='asset',
-            name='nickname',
-            field=models.CharField(blank=True, max_length=20, null=True, unique=True),
-        ),
-    ]

assets/models.py

@@ -1,181 +0,0 @@
-import re
-from django.core.exceptions import ValidationError
-from django.db import models, connection
-from django.urls import reverse
-
-from django.db.models.signals import pre_save
-from django.dispatch.dispatcher import receiver
-
-from reversion import revisions as reversion
-from reversion.models import Version
-
-from RIGS.models import RevisionMixin
-
-
-class AssetCategory(models.Model):
-    class Meta:
-        verbose_name = 'Asset Category'
-        verbose_name_plural = 'Asset Categories'
-        ordering = ['name']
-
-    name = models.CharField(max_length=80)
-
-    def __str__(self):
-        return self.name
-
-
-class AssetStatus(models.Model):
-    class Meta:
-        verbose_name = 'Asset Status'
-        verbose_name_plural = 'Asset Statuses'
-        ordering = ['name']
-
-    name = models.CharField(max_length=80)
-    should_show = models.BooleanField(
-        default=True, help_text="Should this be shown by default in the asset list.")
-    display_class = models.CharField(max_length=80, blank=True, null=True, help_text="HTML class to be appended to alter display of assets with this status, such as in the list.")
-
-    def __str__(self):
-        return self.name
-
-
-@reversion.register
-class Supplier(models.Model, RevisionMixin):
-    name = models.CharField(max_length=80)
-
-    class Meta:
-        ordering = ['name']
-        permissions = (
-            ('view_supplier', 'Can view a supplier'),
-        )
-
-    def get_absolute_url(self):
-        return reverse('supplier_list')
-
-    def __str__(self):
-        return self.name
-
-
-class Connector(models.Model):
-    description = models.CharField(max_length=80)
-    current_rating = models.DecimalField(decimal_places=2, max_digits=10, help_text='Amps')
-    voltage_rating = models.IntegerField(help_text='Volts')
-    num_pins = models.IntegerField(blank=True, null=True)
-
-    def __str__(self):
-        return self.description
-
-
-@reversion.register
-class Asset(models.Model, RevisionMixin):
-    class Meta:
-        ordering = ['asset_id_prefix', 'asset_id_number']
-        permissions = (
-            ('asset_finance', 'Can see financial data for assets'),
-            ('view_asset', 'Can view an asset')
-        )
-
-    parent = models.ForeignKey(to='self', related_name='asset_parent',
-                               blank=True, null=True, on_delete=models.SET_NULL)
-    asset_id = models.CharField(max_length=15, unique=True)
-    description = models.CharField(max_length=120)
-    category = models.ForeignKey(to=AssetCategory, on_delete=models.CASCADE)
-    status = models.ForeignKey(to=AssetStatus, on_delete=models.CASCADE)
-    serial_number = models.CharField(max_length=150, blank=True)
-    nickname = models.CharField(max_length=20, blank=True, null=True, unique=True)  # Null = true required because of the unique constraint
-    purchased_from = models.ForeignKey(to=Supplier, on_delete=models.CASCADE, blank=True, null=True, related_name="assets")
-    date_acquired = models.DateField()
-    date_sold = models.DateField(blank=True, null=True)
-    purchase_price = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
-    salvage_value = models.DecimalField(blank=True, null=True, decimal_places=2, max_digits=10)
-    comments = models.TextField(blank=True)
-    next_sched_maint = models.DateField(blank=True, null=True)
-
-    # Cable assets
-    is_cable = models.BooleanField(default=False)
-    plug = models.ForeignKey(Connector, on_delete=models.SET_NULL,
-                             related_name='plug', blank=True, null=True)
-    socket = models.ForeignKey(Connector, on_delete=models.SET_NULL,
-                               related_name='socket', blank=True, null=True)
-    length = models.DecimalField(decimal_places=1, max_digits=10,
-                                 blank=True, null=True, help_text='m')
-    csa = models.DecimalField(decimal_places=2, max_digits=10,
-                              blank=True, null=True, help_text='mm^2')
-    circuits = models.IntegerField(blank=True, null=True)
-    cores = models.IntegerField(blank=True, null=True)
-
-    # Hidden asset_id components
-    # For example, if asset_id was "C1001" then asset_id_prefix would be "C" and number "1001"
-    asset_id_prefix = models.CharField(max_length=8, default="")
-    asset_id_number = models.IntegerField(default=1)
-
-    def get_available_asset_id(wanted_prefix=""):
-        sql = """
-        SELECT a.asset_id_number+1
-        FROM assets_asset a
-        LEFT OUTER JOIN assets_asset b ON
-            (a.asset_id_number + 1 = b.asset_id_number AND
-            a.asset_id_prefix = b.asset_id_prefix)
-        WHERE b.asset_id IS NULL AND a.asset_id_number >= %s AND a.asset_id_prefix = %s;
-        """
-        with connection.cursor() as cursor:
-            cursor.execute(sql, [9000, wanted_prefix])
-            row = cursor.fetchone()
-            if row is None or row[0] is None:
-                return 9000
-            else:
-                return row[0]
-
-    def get_absolute_url(self):
-        return reverse('asset_detail', kwargs={'pk': self.asset_id})
-
-    def __str__(self):
-        out = str(self.asset_id) + ' - ' + self.description
-        if self.is_cable:
-            out += '{} - {}m - {}'.format(self.plug, self.length, self.socket)
-        return out
-
-    def clean(self):
-        errdict = {}
-        if self.date_sold and self.date_acquired > self.date_sold:
-            errdict["date_sold"] = ["Cannot sell an item before it is acquired"]
-
-        self.asset_id = self.asset_id.upper()
-        asset_search = re.search("^([a-zA-Z0-9]*?[a-zA-Z]?)([0-9]+)$", self.asset_id)
-        if asset_search is None:
-            errdict["asset_id"] = [
-                "An Asset ID can only consist of letters and numbers, with a final number"]
-
-        if self.purchase_price and self.purchase_price < 0:
-            errdict["purchase_price"] = ["A price cannot be negative"]
-
-        if self.salvage_value and self.salvage_value < 0:
-            errdict["salvage_value"] = ["A price cannot be negative"]
-
-        if self.is_cable:
-            if not self.length or self.length <= 0:
-                errdict["length"] = ["The length of a cable must be more than 0"]
-            if not self.csa or self.csa <= 0:
-                errdict["csa"] = ["The CSA of a cable must be more than 0"]
-            if not self.circuits or self.circuits <= 0:
-                errdict["circuits"] = ["There must be at least one circuit in a cable"]
-            if not self.cores or self.cores <= 0:
-                errdict["cores"] = ["There must be at least one core in a cable"]
-            if self.socket is None:
-                errdict["socket"] = ["A cable must have a socket"]
-            if self.plug is None:
-                errdict["plug"] = ["A cable must have a plug"]
-
-        if errdict != {}:  # If there was an error when validation
-            raise ValidationError(errdict)
-
-
-@receiver(pre_save, sender=Asset)
-def pre_save_asset(sender, instance, **kwargs):
-    """Automatically fills in hidden members on database access"""
-    asset_search = re.search("^([a-zA-Z0-9]*?[a-zA-Z]?)([0-9]+)$", instance.asset_id)
-    if asset_search is None:
-        instance.asset_id += "1"
-    asset_search = re.search("^([a-zA-Z0-9]*?[a-zA-Z]?)([0-9]+)$", instance.asset_id)
-    instance.asset_id_prefix = asset_search.group(1)
-    instance.asset_id_number = int(asset_search.group(2))

assets/static/js/csrf.js

@@ -1,23 +0,0 @@
-$.ajaxSetup({
-     beforeSend: function(xhr, settings) {
-         function getCookie(name) {
-             var cookieValue = null;
-             if (document.cookie && document.cookie != '') {
-                 var cookies = document.cookie.split(';');
-                 for (var i = 0; i < cookies.length; i++) {
-                     var cookie = jQuery.trim(cookies[i]);
-                     // Does this cookie string begin with the name we want?
-                     if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                         cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                         break;
-                     }
-                 }
-             }
-             return cookieValue;
-         }
-         if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
-             // Only send the token to relative URLs i.e. locally.
-             xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
-         }
-     }
-});

assets/templates/asset_activity_table.html

@@ -1,92 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
-{% load static %}
-{% load paginator from filters %}
-{% load to_class_name from filters %}
-
-{% block title %}Asset Activity Stream{% endblock %}
-
-{# TODO: Find a way to reduce code duplication...can't just include the content because of the IDs... #}
-
-{% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
-    <script src="{% static "js/moment.min.js" %}"></script>
-    <script>
-    	$(function () {
-		  $('[data-toggle="popover"]').popover().click(function(){
-        if($(this).attr('href')){
-          window.location.href = $(this).attr('href');
-        }
-      });
-
-          // This keeps timeago values correct, but uses an insane amount of resources
-          // $(function () {
-          //     setInterval(function() {
-          //         $('.date').each(function (index, dateElem) {
-          //           var $dateElem = $(dateElem);
-          //           var formatted = moment($dateElem.attr('data-date')).fromNow();
-          //           $dateElem.text(formatted);
-          //          })
-          //        });
-          //     }, 10000);
-
-
-            $('.date').each(function (index, dateElem) {
-                var $dateElem = $(dateElem);
-                var formatted = moment($dateElem.attr('data-date')).fromNow();
-                $dateElem.text(formatted);
-               });
-
-
-		})
-
-    </script>
-{% endblock %}
-
-{% block content %}
-<div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3>Asset Activity Stream</h3>
-            </div>
-            <div class="text-right col-sm-12">{% paginator %}</div>
-        </div>
-        <div class="table-responsive">
-
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Object</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                    <td>Comment</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                                <td>{{ version.revision.date_created }}</td>
-                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id|default:version.changes.new.pk }}</a></td>
-                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                  {% if version.changes.old == None %}
-                                    {{version.changes.new|to_class_name}} Created
-                                  {% else %}
-                                    {% include 'RIGS/version_changes.html' %}
-                                  {% endif %}                        </td>
-                                  <td>{{ version.changes.revision.comment }}</td>
-                            </tr>
-
-        			{% endfor %}
-
-                </tbody>
-            </table>
-
-        </div>
-        <div class="align-right">{% paginator %}</div>
-    </div>
-{% endblock %}

assets/templates/asset_create.html

@@ -1,60 +0,0 @@
-{% extends 'base_assets.html' %}
-{% load widget_tweaks %}
-{% block title %}Asset {{ object.asset_id }}{% endblock %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1>
-      {% if duplicate %}
-          Duplication of Asset: {{ previous_asset_id }}
-      {% else %}
-          Create Asset
-      {% endif %}
-  </h1>
-</div>
-{% if duplicate %}
-<form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id%}">
-  {% else %}
-  <form method="post" id="asset_update_form" action="{% url 'asset_create'%}">
-    {% endif %}
-    {% include 'form_errors.html' %}
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-    <div class="row">
-      <div class="col-sm-12">
-        {% include 'partials/asset_form.html' %}
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-6">
-        {% include 'partials/purchasedetails_form.html' %}
-      </div>
-      <div class="col-md-6" hidden="true" id="cable-table">
-        {% include 'partials/cable_form.html' %}
-      </div>
-      <div class="col-md-4">
-        {% include 'partials/parent_form.html' %}
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        {% include 'partials/asset_buttons.html' %}
-      </div>
-    </div>
-  </form>
-
-  {% endblock %}
-
-  {% block js%}
-  <script>
-    function checkIfCableHidden() {
-      if (document.getElementById("id_is_cable").checked) {
-        document.getElementById("cable-table").hidden = false;
-      } else {
-        document.getElementById("cable-table").hidden = true;
-      }
-    }
-    checkIfCableHidden();
-  </script>
-  {%endblock%}

assets/templates/asset_embed.html

@@ -1,40 +0,0 @@
-{% extends 'base_embed.html' %}
-{% load static from staticfiles %}
-
-{% block content %}
-
-<div class="row">
-    <div class="col-sm-12">
-        <a href="/assets">
-            <span class="source"> TEC Asset Database</span>
-        </a>
-    </div>
-
-    <div class="col-sm-12">
-        <h3><a href="{% url 'asset_detail' object.asset_id %}">Asset: {{ object.asset_id }} | {{ object.description }} </a></h3>
-        <h4>
-        <span class="label label-default">
-            <strong>Category:</strong>
-            {{ object.category }}
-        </span>
-        &nbsp;
-        <span class="label label-{{ object.status.display_class|default:'default' }}">
-            <strong>Status:</strong>
-            {{ object.status }}
-        </span>
-        </h4>
-        {% if object.serial_number %}
-            <dt>Serial Number: </dt>
-            <dd>{{ object.serial_number }}</dd>
-        {% endif %}
-        {% if object.comments %}
-            <dt>Comments: </dt>
-            <dd class="dont-break-out">{{ object.comments|linebreaksbr }}<dd>
-        {% endif %}
-
-        </table>
-    </div>
-</div>
-
-
-{% endblock %}

assets/templates/asset_list.html

@@ -1,65 +0,0 @@
-{% extends 'base_assets.html' %}
-{% block title %}Asset List{% endblock %}
-{% load paginator from filters %}
-{% load widget_tweaks %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1 class="text-center">Asset List</h1>
-</div>
-
-<form id="asset-search-form" method="get" class="form-inline pull-right">
-  <div class="input-group pull-right" style="width: auto;">
-    {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' style="width: 250px"%}
-    <label for="query" class="sr-only">Asset ID/Description/Serial Number:</label>
-    <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
-  </div>
-  <br>
-  <div style="margin-top: 1em;" class="pull-right">
-      <div id="category-group" class="form-group">
-        <label for="category" class="sr-only">Category</label>
-        {% render_field form.category|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
-      </div>
-      <div id="status-group" class="form-group">
-        <label for="status" class="sr-only">Status</label>
-        {% render_field form.status|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
-      </div>
-      <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
-      <button id="filter-submit" type="submit" class="btn btn-default">Filter</button>
-    </div>
-</form>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Asset ID</th>
-      <th>Description</th>
-      <th>Category</th>
-      <th>Status</th>
-      <th class="hidden-xs">Quick Links</th>
-    </tr>
-  </thead>
-  <tbody id="asset_table_body">
-    {% include 'partials/asset_list_table_body.html' %}
-  </tbody>
-</table>
-
-{% if is_paginated %}
-<div class="text-center">
-  {% paginator %}
-</div>
-{% endif %}
-
-{% endblock %}
-
-{% load static %}
-{% block css %}
-    <link rel="stylesheet" href="{% static "css/bootstrap-select.min.css" %}"/>
-    <link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
-{% endblock %}
-
-{% block preload_js %}
-    <script src="{% static "js/bootstrap-select.js" %}"></script>
-    <script src="{% static "js/ajax-bootstrap-select.js" %}"></script>
-{% endblock %}

assets/templates/asset_update.html

@@ -1,70 +0,0 @@
-{% extends 'base_assets.html' %}
-{% load widget_tweaks %}
-{% block title %}Asset {{ object.asset_id }}{% endblock %}
-
-{% block content %}
-
-<div class="page-header">
-  <h1>
-      {% if edit and object %}
-          Edit Asset: {{ object.asset_id }}
-      {% else %}
-          Asset: {{ object.asset_id }}
-      {% endif %}
-  </h1>
-</div>
-<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id%}">
-  {% include 'form_errors.html' %}
-  {% csrf_token %}
-  <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-  <div class="row">
-    <div class="col-sm-12">
-      {% include 'partials/asset_form.html' %}
-    </div>
-  </div>
-  <div class="row">
-    {% if perms.assets.asset_finance %}
-    <div class="col-md-6">
-      {% include 'partials/purchasedetails_form.html' %}
-    </div>
-    {%endif%}
-    <div class="col-md-6"
-    {% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
-      {% include 'partials/cable_form.html' %}
-    </div>
-    <div class="col-md-4">
-      {% include 'partials/parent_form.html' %}
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-12">
-      {% include 'partials/asset_buttons.html' %}
-  </div>
-</form>
-
-{% if not edit and perms.assets.view_asset %}
-<div class="col-sm-12 text-right">
-    <div>
-        <a href="{% url 'asset_history' object.asset_id %}" title="View Revision History">
-            Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
-        </a>
-    </div>
-</div>
-{% endif %}
-
-{% endblock %}
-
-{% block js%}
-{% if edit %}
-<script>
-  function checkIfCableHidden() {
-    if (document.getElementById("id_is_cable").checked) {
-      document.getElementById("cable-table").hidden = false;
-    } else {
-      document.getElementById("cable-table").hidden = true;
-    }
-  }
-  checkIfCableHidden();
-</script>
-{% endif %}
-{% endblock %}

assets/templates/asset_update_search_results.html

@@ -1,16 +0,0 @@
-{% for asset in object_list %}
-    <a href="javascript:void(0);" onclick="insertInParentField({{ asset.pk }}, '{{ asset }}')">
-        {{ asset.asset_id }} - {{ asset.description }}
-    </a>
-    <br>
-    {% empty %}
-    No assets match given ID
-{% endfor %}
-
-<script>
-    function insertInParentField(pk, str) {
-        $('#hidden_parent_id').val(pk);
-        $('#parent_id').val(str);
-        M.updateTextFields();
-    }
-</script>

assets/templates/asset_version_history.html

@@ -1,68 +0,0 @@
-{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
-{% load to_class_name from filters %}
-{% load paginator from filters %}
-{% load static %}
-
-{% block title %}{{object|to_class_name}} {{ object.asset_id }} - Revision History{% endblock %}
-
-{% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
-    <script>
-    	$(function () {
-            $('[data-toggle="popover"]').popover().click(function(){
-                    if($(this).attr('href')){
-                      window.location.href = $(this).attr('href');
-                    }
-                  });
-        })
-    </script>
-{% endblock %}
-
-{% block content %}
-<div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-12">
-                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.asset_id|default:object.pk }}</a> - Revision History</h3>
-            </div>
-            <div class="text-right col-sm-12">{% paginator %}</div>
-        </div>
-        <div class="table-responsive">
-        	<table class="table table-striped">
-                <thead>
-                <tr>
-                    <td>Date</td>
-                    <td>Version ID</td>
-                    <td>User</td>
-                    <td>Changes</td>
-                    <td>Comment</td>
-                </tr>
-                </thead>
-                <tbody>
-                	{% for version in object_list %}
-
-                            <tr>
-                           		<td>{{ version.revision.date_created }}</td>
-                                <td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                                <td>{{ version.revision.user.name }}</td>
-                                <td>
-                                    {% if version.changes.old is None %}
-                                        {{object|to_class_name}} Created
-                                    {% else %}
-                                        {% include 'RIGS/version_changes.html' %}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {{ version.revision.comment }}
-                                </td>
-                            </tr>
-
-
-        			{% endfor %}
-
-                </tbody>
-            </table>
-         </div>
-    <div class="align-right">{% paginator %}</div>
-</div>
-{% endblock %}

assets/templates/partials/asset_buttons.html

@@ -1,25 +0,0 @@
-{% if edit and object %}
-<!--edit-->
-<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-<a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-{% elif duplicate %}
-<!--duplicate-->
-<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
-{% elif create %}
-<!--create-->
-<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-{% else %}
-<!--detail view-->
-<div class="btn-group">
-    <a href="{% url 'asset_update' object.asset_id %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-    <a class="btn btn-default" href="{% url 'asset_duplicate' object.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-</div>
-{% endif %}
-{% if create or edit or duplicate %}
-<br>
-<button type="reset" class="btn btn-link" onclick="
-{%if duplicate%}
-{% url 'asset_detail' previous_asset_id %}
-{%else%}
-history.back(){%endif%}">Cancel</button>
-{% endif %}

assets/templates/partials/asset_form.html

@@ -1,67 +0,0 @@
-{% load widget_tweaks %}
-<div class="panel panel-default">
-  <div class="panel-heading">
-    Asset Details
-  </div>
-  <div class="panel-body">
-    {% if create or edit or duplicate %}
-    <div class="form-group">
-        <label for="{{ form.asset_id.id_for_label }}">Asset ID</label>
-        {% if duplicate %}
-        {% render_field form.asset_id|add_class:'form-control' value=object.asset_id %}
-        {% elif object.asset_id %}
-        {% render_field form.asset_id|attr:'readonly'|add_class:'disabled_input form-control' value=object.asset_id %}
-        {% else %}
-        {% render_field form.asset_id|add_class:'form-control' %}
-        {% endif %}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.description.id_for_label }}">Description</label>
-      {% render_field form.description|add_class:'form-control' value=object.description %}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.category.id_for_label }}" >Category</label>
-      {% render_field form.category|add_class:'form-control'%}
-    </div>
-    {% render_field form.is_cable|attr:'onchange=checkIfCableHidden()' %} <label for="{{ form.is_cable.id_for_label }}">Cable?</label>
-    <div class="form-group">
-      <label for="{{ form.status.id_for_label }}" >Status</label>
-      {% render_field form.status|add_class:'form-control'%}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.serial_number.id_for_label }}">Serial Number</label>
-      {% render_field form.serial_number|add_class:'form-control' value=object.serial_number %}
-    </div>
-    <div class="form-group">
-      <label for="{{ form.nickname.id_for_label }}">Nickname</label>
-      {% render_field form.nickname|add_class:'form-control' value=object.nickname %}
-    </div>
-    <!---TODO: Lower default number of lines in comments box-->
-    <div class="form-group">
-      <label for="{{ form.comments.id_for_label }}">Comments</label>
-      {% render_field form.comments|add_class:'form-control' %}
-    </div>
-    {% else %}
-    <dt>Asset ID</dt>
-    <dd>{{ object.asset_id }}</dd>
-
-    <dt>Description</dt>
-    <dd style="overflow-wrap: break-word;">{{ object.description }}</dd>
-
-    <dt>Category</dt>
-    <dd>{{ object.category }}</dd>
-
-    <dt>Status</dt>
-    <dd>{{ object.status }}</dd>
-
-    <dt>Serial Number</dt>
-    <dd>{{ object.serial_number|default:'-' }}</dd>
-
-    <dt>Nickname</dt>
-    <dd>{{ object.nickname|default:'-' }}</dd>
-
-    <dt>Comments</dt>
-    <dd style="overflow-wrap: break-word;">{{ object.comments|default:'-'|linebreaksbr }}</dd>
-    {% endif %}
-  </div>
-</div>