Fix datetime/date check, and add https to calendar URLs

Update JS dependencies

.editorconfig

@@ -1,29 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.hbs]
-insert_final_newline = false
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-# Python: PEP8 defines 4 spaces for indentation
-[*.py]
-indent_style = space
-indent_size = 4
-# Salt state files, YAML format, 2 spaces
-[*.sls, *.yaml, *.yml]
-indent_style = space
-indent_size = 2

.gitignore

@@ -53,6 +53,7 @@ coverage.xml
 
 # Django stuff:
 *.log
+db.sqlite3
 
 # Sphinx documentation
 docs/_build/

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/PyRIGS.iml" filepath="$PROJECT_DIR$/.idea/PyRIGS.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/pyrigs.iml" filepath="$PROJECT_DIR$/.idea/pyrigs.iml" />
     </modules>
   </component>
 </project>

.travis.yml

@@ -1,21 +1,32 @@
 language: python
 python:
-  "2.7"
+  "3.6"
+cache: pip
 
-before_install:
+addons:
-  - "export DISPLAY=:99.0"
+  chrome: beta
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
+  - wget http://chromedriver.storage.googleapis.com/2.32/chromedriver_linux64.zip
+  - unzip chromedriver_linux64.zip
+  - export PATH=$PATH:$(pwd)
+  - chmod +x chromedriver
   - pip install -r requirements.txt
-  - pip install coveralls codeclimate-test-reporter
+  - pip install coveralls codeclimate-test-reporter pep8
 
 before_script:
+  - export PATH=$PATH:/usr/lib/chromium-browser/
   - python manage.py collectstatic --noinput
 
 script:
-  - coverage run manage.py test RIGS
+  - pep8 . --exclude=migrations,importer*
+  - python manage.py check
+  - python manage.py makemigrations --check --dry-run
+  - coverage run manage.py test --verbosity=2
 
 after_success:
   - coveralls
   - codeclimate-test-reporter
+
+notifications:
+  webhooks: https://fathomless-fjord-24024.herokuapp.com/notify

PyRIGS/decorators.py

@@ -1,15 +1,19 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.shortcuts import render
 from django.http import HttpResponseRedirect
-from django.shortcuts import render_to_response
+from django.core.urlresolvers import reverse
-from django.template import RequestContext
+
+from RIGS import models
 
 
-def user_passes_test_with_403(test_func, login_url=None):
+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.
-
     Anonymous users will be redirected to login_url, while users that fail
     the test will be given a 403 error.
+    If embed_view is set, then a JS redirect will be used, and a application/json+oembed
+    meta tag set with the url of oembed_view
+    (oembed_view will be passed the kwargs from the main function)
     """
     if not login_url:
         from django.conf import settings
@@ -20,31 +24,30 @@ def user_passes_test_with_403(test_func, login_url=None):
             if test_func(request.user):
                 return view_func(request, *args, **kwargs)
             elif not request.user.is_authenticated():
-                return HttpResponseRedirect('%s?%s=%s' % (
+                if oembed_view is not None:
-                    login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
+                    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:
-                resp = render_to_response(
+                    return HttpResponseRedirect('%s?%s=%s' % (login_url, REDIRECT_FIELD_NAME, request.get_full_path()))
-                    '403.html', context_instance=RequestContext(request))
+            else:
+                resp = render(request, '403.html')
                 resp.status_code = 403
                 return resp
-
         _checklogin.__doc__ = view_func.__doc__
         _checklogin.__dict__ = view_func.__dict__
         return _checklogin
-
     return _dec
 
 
-def permission_required_with_403(perm, login_url=None):
+def permission_required_with_403(perm, login_url=None, oembed_view=None):
     """
     Decorator for views that checks whether a user has a particular permission
     enabled, redirecting to the log-in page or rendering a 403 as necessary.
     """
-    return user_passes_test_with_403(
+    return user_passes_test_with_403(lambda u: u.has_perm(perm), login_url=login_url, oembed_view=oembed_view)
-        lambda u: u.has_perm(perm), login_url=login_url)
-
-
-from RIGS import models
 
 
 def api_key_required(function):
@@ -53,14 +56,12 @@ def api_key_required(function):
     Failed users will be given a 403 error.
     Should only be used for urls which include <api_pk> and <api_key> kwargs
     """
-
     def wrap(request, *args, **kwargs):
 
         userid = kwargs.get('api_pk')
         key = kwargs.get('api_key')
 
-        error_resp = render_to_response(
+        error_resp = render(request, '403.html')
-            '403.html', context_instance=RequestContext(request))
         error_resp.status_code = 403
 
         if key is None:
@@ -76,5 +77,18 @@ def api_key_required(function):
         if user_object.api_key != key:
             return error_resp
         return function(request, *args, **kwargs)
-
+    return wrap
+
+
+def nottinghamtec_address_required(function):
+    """
+    Checks that the current user has an email address ending @nottinghamtec.co.uk
+    """
+    def wrap(request, *args, **kwargs):
+        # Fail if current user's email address isn't @nottinghamtec.co.uk
+        if not request.user.email.endswith('@nottinghamtec.co.uk'):
+            error_resp = render(request, 'RIGS/eventauthorisation_request_error.html')
+            return error_resp
+
+        return function(request, *args, **kwargs)
     return wrap

PyRIGS/formats/en/formats.py

@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
 
 DATETIME_FORMAT = ('d/m/Y H:i')
 DATE_FORMAT = ('d/m/Y')

PyRIGS/settings.py

@@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+import raven
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -23,19 +24,18 @@ SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get(
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
 
-STAGING = bool(int(os.environ.get('STAGING'))
-               ) if os.environ.get('STAGING') else False
 
-TEMPLATE_DEBUG = True
+STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
 
-ALLOWED_HOSTS = [
+ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
-    'pyrigs.nottinghamtec.co.uk',
-    'rigs.nottinghamtec.co.uk',
-    'pyrigs.herokuapp.com']
 
 if STAGING:
     ALLOWED_HOSTS.append('.herokuapp.com')
 
+if DEBUG:
+    ALLOWED_HOSTS.append('localhost')
+    ALLOWED_HOSTS.append('example.com')
+
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:
     SECURE_SSL_REDIRECT = True  # Redirect all http requests to https
@@ -68,6 +68,7 @@ INSTALLED_APPS = (
 MIDDLEWARE_CLASSES = (
     'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware',
     'django.middleware.security.SecurityMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'reversion.middleware.RevisionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -144,22 +145,19 @@ LOGGING = {
     }
 }
 
-import raven
-
 RAVEN_CONFIG = {
     'dsn': os.environ.get('RAVEN_DSN'),
     # If you are using git, you can also automatically configure the
     # release based on the git info.
     # 'release': raven.fetch_git_sha(os.path.dirname(os.path.dirname(__file__))),
-    'debug': DEBUG,
 }
 
 # User system
 AUTH_USER_MODEL = 'RIGS.Profile'
 
 LOGIN_REDIRECT_URL = '/'
-LOGIN_URL = '/user/login'
+LOGIN_URL = '/user/login/'
-LOGOUT_URL = '/user/logout'
+LOGOUT_URL = '/user/logout/'
 
 ACCOUNT_ACTIVATION_DAYS = 7
 
@@ -173,7 +171,7 @@ EMAILER_TEST = False
 if not DEBUG or EMAILER_TEST:
     EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
     EMAIL_HOST = os.environ.get('EMAIL_HOST')
-    EMAIL_PORT = int(os.environ.get('EMAIL_PORT'))
+    EMAIL_PORT = int(os.environ.get('EMAIL_PORT', 25))
     EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
     EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
     EMAIL_USE_TLS = bool(int(os.environ.get('EMAIL_USE_TLS', 0)))
@@ -199,17 +197,6 @@ USE_TZ = True
 
 DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.contrib.auth.context_processors.auth",
-    "django.core.context_processors.debug",
-    "django.core.context_processors.i18n",
-    "django.core.context_processors.media",
-    "django.core.context_processors.static",
-    "django.core.context_processors.tz",
-    "django.core.context_processors.request",
-    "django.contrib.messages.context_processors.messages",
-)
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
@@ -219,10 +206,30 @@ STATIC_DIRS = (
     os.path.join(BASE_DIR, 'static/')
 )
 
-TEMPLATE_DIRS = (
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
             os.path.join(BASE_DIR, 'templates'),
-)
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "django.template.context_processors.request",
+                "django.contrib.messages.context_processors.messages",
+            ],
+            'debug': DEBUG
+        },
+    },
+]
 
 USE_GRAVATAR = True
 
 TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"
+AUTHORISATION_NOTIFICATION_ADDRESS = 'productions@nottinghamtec.co.uk'

PyRIGS/urls.py

@@ -1,25 +1,29 @@
-from django.conf import settings
+from django.conf.urls import include, url
-from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.conf import settings
 from registration.backends.default.views import RegistrationView
-
 import RIGS
+from RIGS import regbackend
 
-urlpatterns = patterns('',
+urlpatterns = [
     # Examples:
     # url(r'^$', 'PyRIGS.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^', include('RIGS.urls')),
-                       url('^user/register/$',
+    url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
-                           RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
         name="registration_register"),
     url('^user/', include('django.contrib.auth.urls')),
     url('^user/', include('registration.backends.default.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
-                       )
+]
 
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
+
+    import debug_toolbar
+    urlpatterns = [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ] + urlpatterns

PyRIGS/wsgi.py

@@ -7,10 +7,9 @@ For more information on this file, see
 https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 """
 import os
-
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "PyRIGS.settings")
 
-from django.core.wsgi import get_wsgi_application
+from django.core.wsgi import get_wsgi_application  # noqa
-from dj_static import Cling
+from dj_static import Cling  # noqa
 
 application = Cling(get_wsgi_application())

README.md

@@ -1,6 +1,8 @@
 # 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?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.
 
@@ -85,6 +87,7 @@ Then load the sample data using the command:
 python manage.py generateSampleData
 ```
 4 user accounts are created for convenience:
+
 |Username |Password |
 |---------|---------|
 |superuser|superuser|
@@ -92,5 +95,18 @@ python manage.py generateSampleData
 |keyholder|keyholder|
 |basic    |basic    |
 
+### Testing ###
+Tests are contained in 3 files. `RIGS/test_models.py` contains tests for logic within the data models. `RIGS/test_unit.py` contains "Live server" tests, using raw web requests. `RIGS/test_integration.py` contains user interface tests which take control of a web browser. For automated Travis tests, we use [Sauce Labs](https://saucelabs.com). When debugging locally, ensure that you have the latest version of Google Chrome installed, then install [chromedriver](https://sites.google.com/a/chromium.org/chromedriver/) and ensure it is on the `PATH`.
+
+You can run the entire test suite, or you can run specific sections individually. For example, in order of specificity:
+
+```
+python manage.py test
+python manage.py test RIGS.test_models
+python manage.py test RIGS.test_models.EventTestCase
+python manage.py test RIGS.test_models.EventTestCase.test_current_events
+
+```
+
 ### 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/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'RIGS.apps.RIGSAppConfig'

RIGS/admin.py

@@ -1,21 +1,23 @@
-import reversion
 from django.contrib import admin
-from django.contrib import messages
+from RIGS import models, forms
-from django.contrib.admin import helpers
 from django.contrib.auth.admin import UserAdmin
-from django.core.exceptions import ObjectDoesNotExist
+from django.utils.translation import ugettext_lazy as _
+from reversion.admin import VersionAdmin
+
+from django.contrib.admin import helpers
+from django.template.response import TemplateResponse
+from django.contrib import messages
 from django.db import transaction
+from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Count
 from django.forms import ModelForm
-from django.template.response import TemplateResponse
-from django.utils.translation import ugettext_lazy as _
 
-from RIGS import models, forms
+from reversion import revisions as reversion
 
 # Register your models here.
-admin.site.register(models.VatRate, reversion.VersionAdmin)
+admin.site.register(models.VatRate, VersionAdmin)
-admin.site.register(models.Event, reversion.VersionAdmin)
+admin.site.register(models.Event, VersionAdmin)
-admin.site.register(models.EventItem, reversion.VersionAdmin)
+admin.site.register(models.EventItem, VersionAdmin)
 admin.site.register(models.Invoice)
 admin.site.register(models.Payment)
 
@@ -41,7 +43,7 @@ class ProfileAdmin(UserAdmin):
     add_form = forms.ProfileCreationForm
 
 
-class AssociateAdmin(reversion.VersionAdmin):
+class AssociateAdmin(VersionAdmin):
     list_display = ('id', 'name', 'number_of_events')
     search_fields = ['id', 'name']
     list_display_links = ['id', 'name']
@@ -50,8 +52,7 @@ class AssociateAdmin(reversion.VersionAdmin):
     merge_fields = ['name']
 
     def get_queryset(self, request):
-        return super(AssociateAdmin, self).get_queryset(
+        return super(AssociateAdmin, self).get_queryset(request).annotate(event_count=Count('event'))
-            request).annotate(event_count=Count('event'))
 
     def number_of_events(self, obj):
         return obj.latest_events.count()
@@ -59,16 +60,12 @@ class AssociateAdmin(reversion.VersionAdmin):
     number_of_events.admin_order_field = 'event_count'
 
     def merge(self, request, queryset):
-        if request.POST.get(
+        if request.POST.get('post'):  # Has the user confirmed which is the master record?
-            'post'):  # Has the user confirmed which is the master record?
             try:
                 masterObjectPk = request.POST.get('master')
                 masterObject = queryset.get(pk=masterObjectPk)
             except ObjectDoesNotExist:
-                self.message_user(
+                self.message_user(request, "An error occured. Did you select a 'master' record?", level=messages.ERROR)
-                    request,
-                    "An error occured. Did you select a 'master' record?",
-                    level=messages.ERROR)
                 return
 
             with transaction.atomic(), reversion.create_revision():
@@ -84,7 +81,6 @@ class AssociateAdmin(reversion.VersionAdmin):
         else:  # Present the confirmation screen
 
             class TempForm(ModelForm):
-
                 class Meta:
                     model = queryset.model
                     fields = self.merge_fields
@@ -99,8 +95,7 @@ class AssociateAdmin(reversion.VersionAdmin):
                 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
                 'forms': forms
             }
-            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context,
+            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context)
-                                    current_app=self.admin_site.name)
 
 
 @admin.register(models.Person)
@@ -112,22 +107,10 @@ class PersonAdmin(AssociateAdmin):
 @admin.register(models.Venue)
 class VenueAdmin(AssociateAdmin):
     list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
-    merge_fields = [
+    merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
-        'name',
-        'phone',
-        'email',
-        'address',
-        'notes',
-        'three_phase_available']
 
 
 @admin.register(models.Organisation)
 class OrganisationAdmin(AssociateAdmin):
     list_display = ('id', 'name', 'phone', 'email', 'number_of_events')
-    merge_fields = [
+    merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
-        'name',
-        'phone',
-        'email',
-        'address',
-        'notes',
-        'union_account']

RIGS/apps.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class RIGSAppConfig(AppConfig):
+    name = 'RIGS'
+
+    def ready(self):
+        import RIGS.signals

RIGS/finance.py

@@ -1,20 +1,22 @@
-import cStringIO as StringIO
 import datetime
 import re
 
 from django.contrib import messages
 from django.core.urlresolvers import reverse_lazy
-from django.db.models import Q
 from django.http import Http404, HttpResponseRedirect
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.template import RequestContext
 from django.template.loader import get_template
 from django.views import generic
+from django.db.models import Q
 from z3c.rml import rml2pdf
 
 from RIGS import models
 
+from django import forms
+forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
+
 
 class InvoiceIndex(generic.ListView):
     model = models.Invoice
@@ -30,8 +32,7 @@ class InvoiceIndex(generic.ListView):
         return context
 
     def get_queryset(self):
-        # Manual query is the only way I have found to do this efficiently. Not
+        # Manual query is the only way I have found to do this efficiently. Not ideal but needs must
-        # ideal but needs must
         sql = "SELECT * FROM " \
               "(SELECT " \
               "(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \
@@ -56,8 +57,8 @@ class InvoicePrint(generic.View):
         invoice = get_object_or_404(models.Invoice, pk=pk)
         object = invoice.event
         template = get_template('RIGS/event_print.xml')
-        copies = ('TEC', 'Client')
+
-        context = RequestContext(request, {
+        context = {
             'object': object,
             'fonts': {
                 'opensans': {
@@ -67,10 +68,9 @@ class InvoicePrint(generic.View):
             },
             'invoice': invoice,
             'current_user': request.user,
-        })
+        }
 
         rml = template.render(context)
-        buffer = StringIO.StringIO()
 
         buffer = rml2pdf.parseString(rml)
 
@@ -79,8 +79,7 @@ class InvoicePrint(generic.View):
         escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name)
 
         response = HttpResponse(content_type='application/pdf')
-        response[
+        response['Content-Disposition'] = "filename=Invoice %05d - N%05d | %s.pdf" % (invoice.pk, invoice.event.pk, escapedEventName)
-            'Content-Disposition'] = "filename=Invoice %05d | %s.pdf" % (invoice.pk, escapedEventName)
         response.write(pdfData)
         return response
 
@@ -94,8 +93,7 @@ class InvoiceVoid(generic.View):
 
         if object.void:
             return HttpResponseRedirect(reverse_lazy('invoice_list'))
-        return HttpResponseRedirect(reverse_lazy(
+        return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
-            'invoice_detail', kwargs={'pk': object.pk}))
 
 
 class InvoiceDelete(generic.DeleteView):
@@ -104,21 +102,15 @@ class InvoiceDelete(generic.DeleteView):
     def get(self, request, pk):
         obj = self.get_object()
         if obj.payment_set.all().count() > 0:
-            messages.info(
+            messages.info(self.request, 'To delete an invoice, delete the payments first.')
-                self.request,
+            return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': obj.pk}))
-                'To delete an invoice, delete the payments first.')
-            return HttpResponseRedirect(reverse_lazy(
-                'invoice_detail', kwargs={'pk': obj.pk}))
         return super(InvoiceDelete, self).get(pk)
 
     def post(self, request, pk):
         obj = self.get_object()
         if obj.payment_set.all().count() > 0:
-            messages.info(
+            messages.info(self.request, 'To delete an invoice, delete the payments first.')
-                self.request,
+            return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': obj.pk}))
-                'To delete an invoice, delete the payments first.')
-            return HttpResponseRedirect(reverse_lazy(
-                'invoice_detail', kwargs={'pk': obj.pk}))
         return super(InvoiceDelete, self).post(pk)
 
     def get_success_url(self):
@@ -133,7 +125,7 @@ class InvoiceArchive(generic.ListView):
 
 class InvoiceWaiting(generic.ListView):
     model = models.Event
-    # paginate_by = 25
+    paginate_by = 25
     template_name = 'RIGS/event_invoice.html'
 
     def get_context_data(self, **kwargs):
@@ -152,12 +144,10 @@ class InvoiceWaiting(generic.ListView):
         # @todo find a way to select items
         events = self.model.objects.filter(
             (
-                # Starts before with no end
+                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
-                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |
+                Q(end_date__lte=datetime.date.today())  # Has end date, finishes before
-                # Has end date, finishes before
+            ) & Q(invoice__isnull=True) &  # Has not already been invoiced
-                Q(end_date__lte=datetime.date.today())
+            Q(is_rig=True)  # Is a rig (not non-rig)
-            ) & Q(invoice__isnull=True)  # Has not already been invoiced
-            & Q(is_rig=True)  # Is a rig (not non-rig)
 
         ).order_by('start_date') \
             .select_related('person',
@@ -178,8 +168,7 @@ class InvoiceEvent(generic.View):
             invoice.invoice_date = datetime.date.today()
             messages.success(self.request, 'Invoice created successfully')
 
-        return HttpResponseRedirect(reverse_lazy(
+        return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': invoice.pk}))
-            'invoice_detail', kwargs={'pk': invoice.pk}))
 
 
 class PaymentCreate(generic.CreateView):
@@ -188,9 +177,7 @@ class PaymentCreate(generic.CreateView):
 
     def get_initial(self):
         initial = super(generic.CreateView, self).get_initial()
-        invoicepk = self.request.GET.get(
+        invoicepk = self.request.GET.get('invoice', self.request.POST.get('invoice', None))
-            'invoice', self.request.POST.get(
-                'invoice', None))
         if invoicepk is None:
             raise Http404()
         invoice = get_object_or_404(models.Invoice, pk=invoicepk)

RIGS/forms.py

@@ -1,38 +1,35 @@
-__author__ = 'Ghost'
-import simplejson
-from captcha.fields import ReCaptchaField
 from django import forms
-from django.conf import settings
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm, PasswordResetForm
-from django.core import serializers
 from django.utils import formats
+from django.conf import settings
+from django.core import serializers
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
 from registration.forms import RegistrationFormUniqueEmail
+from captcha.fields import ReCaptchaField
+import simplejson
 
 from RIGS import models
 
+# Override the django form defaults to use the HTML date/time/datetime UI elements
+forms.DateField.widget = forms.DateInput(attrs={'type': 'date'})
+forms.TimeField.widget = forms.TextInput(attrs={'type': 'time'})
+forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'})
 
 # Registration
+
+
 class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
     captcha = ReCaptchaField()
 
     class Meta:
         model = models.Profile
-        fields = (
+        fields = ('username', 'email', 'first_name', 'last_name', 'initials', 'phone')
-            'username',
-            'email',
-            'first_name',
-            'last_name',
-            'initials',
-            'phone')
 
     def clean_initials(self):
         """
         Validate that the supplied initials are unique.
         """
-        if models.Profile.objects.filter(
+        if models.Profile.objects.filter(initials__iexact=self.cleaned_data['initials']):
-            initials__iexact=self.cleaned_data['initials']):
+            raise forms.ValidationError("These initials are already in use. Please supply different initials.")
-            raise forms.ValidationError(
-                "These initials are already in use. Please supply different initials.")
         return self.cleaned_data['initials']
 
 
@@ -53,14 +50,9 @@ class ProfileChangeForm(UserChangeForm):
 
 # Events Shit
 class EventForm(forms.ModelForm):
-    datetime_input_formats = formats.get_format_lazy(
+    datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS)
-        "DATETIME_INPUT_FORMATS") + settings.DATETIME_INPUT_FORMATS
+    meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
-    meet_at = forms.DateTimeField(
+    access_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
-        input_formats=datetime_input_formats,
-        required=False)
-    access_at = forms.DateTimeField(
-        input_formats=datetime_input_formats,
-        required=False)
 
     items_json = forms.CharField()
 
@@ -102,8 +94,7 @@ class EventForm(forms.ModelForm):
         items = {}
         for key in data:
             pk = int(key)
-            items[pk] = self._get_or_initialise_item(
+            items[pk] = self._get_or_initialise_item(pk, data[key]['fields'], event)
-                pk, data[key]['fields'], event)
 
         return items
 
@@ -154,4 +145,32 @@ class EventForm(forms.ModelForm):
         fields = ['is_rig', 'name', 'venue', 'start_time', 'end_date', 'start_date',
                   'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic',
                   'person', 'organisation', 'dry_hire', 'checked_in_by', 'status',
-                  'collector', 'purchase_order']
+                  'purchase_order', 'collector']
+
+
+class BaseClientEventAuthorisationForm(forms.ModelForm):
+    tos = forms.BooleanField(required=True, label="Terms of hire")
+    name = forms.CharField(label="Your Name")
+
+    def clean(self):
+        if self.cleaned_data.get('amount') != self.instance.event.total:
+            self.add_error('amount', 'The amount authorised must equal the total for the event (inc VAT).')
+        return super(BaseClientEventAuthorisationForm, self).clean()
+
+    class Meta:
+        abstract = True
+
+
+class InternalClientEventAuthorisationForm(BaseClientEventAuthorisationForm):
+    def __init__(self, **kwargs):
+        super(InternalClientEventAuthorisationForm, self).__init__(**kwargs)
+        self.fields['uni_id'].required = True
+        self.fields['account_code'].required = True
+
+    class Meta:
+        model = models.EventAuthorisation
+        fields = ('tos', 'name', 'amount', 'uni_id', 'account_code')
+
+
+class EventAuthorisationRequestForm(forms.Form):
+    email = forms.EmailField(required=True, label='Authoriser Email')

RIGS/ical.py

@@ -1,11 +1,12 @@
-import datetime
+from RIGS import models, forms
-
-import pytz
-from django.conf import settings
-from django.db.models import Q
 from django_ical.views import ICalFeed
+from django.db.models import Q
+from django.core.urlresolvers import reverse_lazy, reverse, NoReverseMatch
+from django.utils import timezone
+from django.conf import settings
 
-from RIGS import models
+import datetime
+import pytz
 
 
 class CalendarICS(ICalFeed):
@@ -33,17 +34,14 @@ class CalendarICS(ICalFeed):
         params['rig'] = request.GET.get('rig', 'true') == 'true'
 
         params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
-        params['provisional'] = request.GET.get(
+        params['provisional'] = request.GET.get('provisional', 'true') == 'true'
-            'provisional', 'true') == 'true'
         params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
 
         return params
 
     def description(self, params):
-        desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + (
+        desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + ('Non-rig, ' if params['non-rig'] else '') + ('Dry Hire ' if params['dry-hire'] else '') + '\n'
-            'Non-rig, ' if params['non-rig'] else '') + ('Dry Hire ' if params['dry-hire'] else '') + '\n'
+        desc = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + ('Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '')
-        desc = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + (
-            'Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '')
 
         return desc
 
@@ -52,8 +50,7 @@ class CalendarICS(ICalFeed):
         start = datetime.datetime.now() - datetime.timedelta(days=365)
         filter = Q(start_date__gte=start)
 
-        # Need something that is false for every entry
+        typeFilters = Q(pk=None)  # Need something that is false for every entry
-        typeFilters = Q(pk=None)
 
         if params['dry-hire']:
             typeFilters = typeFilters | Q(dry_hire=True, is_rig=True)
@@ -64,22 +61,18 @@ class CalendarICS(ICalFeed):
         if params['rig']:
             typeFilters = typeFilters | Q(is_rig=True, dry_hire=False)
 
-        # Need something that is false for every entry
+        statusFilters = Q(pk=None)  # Need something that is false for every entry
-        statusFilters = Q(pk=None)
 
         if params['cancelled']:
             statusFilters = statusFilters | Q(status=models.Event.CANCELLED)
         if params['provisional']:
             statusFilters = statusFilters | Q(status=models.Event.PROVISIONAL)
         if params['confirmed']:
-            statusFilters = statusFilters | Q(
+            statusFilters = statusFilters | Q(status=models.Event.CONFIRMED) | Q(status=models.Event.BOOKED)
-                status=models.Event.CONFIRMED) | Q(
-                status=models.Event.BOOKED)
 
         filter = filter & typeFilters & statusFilters
 
-        return models.Event.objects.filter(filter).order_by(
+        return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
-            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def item_title(self, item):
         title = ''
@@ -106,8 +99,7 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
-        if isinstance(
+        if type(item.latest_time) == datetime.date:  # Ical end_datetime is non-inclusive, so add a day
-            item.latest_time, datetime.date):  # Ical end_datetime is non-inclusive, so add a day
             return item.latest_time + datetime.timedelta(days=1)
 
         return item.latest_time
@@ -125,26 +117,19 @@ class CalendarICS(ICalFeed):
         desc += 'Event = ' + item.name + '\n'
         desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
         if item.is_rig and item.person:
-            desc += 'Client = ' + item.person.name + \
+            desc += 'Client = ' + item.person.name + ((' for ' + item.organisation.name) if item.organisation else '') + '\n'
-                    ((' for ' + item.organisation.name)
-                     if item.organisation else '') + '\n'
         desc += 'Status = ' + str(item.get_status_display()) + '\n'
         desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
 
         desc += '\n'
         if item.meet_at:
-            desc += 'Crew Meet = ' + \
+            desc += 'Crew Meet = ' + (item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'
-                    (item.meet_at.astimezone(tz).strftime(
-                        '%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'
         if item.access_at:
-            desc += 'Access At = ' + (item.access_at.astimezone(tz).strftime(
+            desc += 'Access At = ' + (item.access_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n'
-                '%Y-%m-%d %H:%M') if item.access_at else '---') + '\n'
         if item.start_date:
-            desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + (
+            desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ((' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n'
-                (' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n'
         if item.end_date:
-            desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + (
+            desc += 'Event End = ' + item.end_date.strftime('%Y-%m-%d') + ((' ' + item.end_time.strftime('%H:%M')) if item.has_end_time else '') + '\n'
-                (' ' + item.end_time.strftime('%H:%M')) if item.has_end_time else '') + '\n'
 
         desc += '\n'
         if item.description:
@@ -152,7 +137,7 @@ class CalendarICS(ICalFeed):
         # if item.notes:  // Need to add proper keyholder checks before this gets put back
         #     desc += 'Notes:\n'+item.notes+'\n\n'
 
-        base_url = "http://rigs.nottinghamtec.co.uk"
+        base_url = "https://rigs.nottinghamtec.co.uk"
         desc += 'URL = ' + base_url + str(item.get_absolute_url())
 
         return desc

RIGS/management/commands/generateSampleData.py

@@ -1,11 +1,11 @@
+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
 
-import reversion
-from django.contrib.auth.models import Group, Permission
-from django.core.management.base import BaseCommand, CommandError
-from django.db import transaction
-
 from RIGS import models
 
 
@@ -27,8 +27,7 @@ class Command(BaseCommand):
         if not (settings.DEBUG or settings.STAGING):
             raise CommandError('You cannot run this command in production')
 
-        random.seed(
+        random.seed('Some object to seed the random number generator')  # otherwise it is done by time, which could lead to inconsistant tests
-            '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')
@@ -46,18 +45,8 @@ class Command(BaseCommand):
             self.setupUsefulProfiles()
 
     def setupPeople(self):
-        names = ["Regulus Black", "Sirius Black", "Lavender Brown", "Cho Chang", "Vincent Crabbe", "Vincent Crabbe",
+        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
-                 "Bartemius Crouch", "Fleur Delacour", "Cedric Diggory", "Alberforth Dumbledore", "Albus Dumbledore",
+                 "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
-                 "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", "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"]
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -79,32 +68,8 @@ class Command(BaseCommand):
                 self.people.append(newPerson)
 
     def setupOrganisations(self):
-        names = ["Acme, inc.", "Widget Corp", "123 Warehousing", "Demo Company", "Smith and Co.", "Foo Bars",
+        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
-                 "ABC Telecom", "Fake Brothers", "QWERTY Logistics", "Demo, inc.", "Sample Company", "Sample, inc",
+                 "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
-                 "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", "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"]
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -128,17 +93,8 @@ class Command(BaseCommand):
                 self.organisations.append(newOrganisation)
 
     def setupVenues(self):
-        names = ["Bear Island", "Crossroads Inn", "Deepwood Motte", "The Dreadfort", "The Eyrie", "Greywater Watch",
+        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
-                 "The Iron Islands", "Karhold", "Moat Cailin", "Oldstones", "Raventree Hall", "Riverlands",
+                 "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
-                 "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", "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"]
         for i, name in enumerate(names):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
@@ -165,14 +121,8 @@ class Command(BaseCommand):
         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",
+        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"]
-                          "delete_eventitem", "add_organisation", "change_organisation", "view_organisation",
+        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"]
-                          "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))
@@ -181,11 +131,9 @@ class Command(BaseCommand):
             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",
+        names = ["Clara Oswin Oswald", "Rory Williams", "Amy Pond", "River Song", "Martha Jones", "Donna Noble", "Jack Harkness", "Mickey Smith", "Rose Tyler"]
-                 "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],
+            newProfile = models.Profile.objects.create(username=name.replace(" ", ""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1],
-                                                       last_name=name.split(" ")[-1],
                                                        email=name.replace(" ", "") + "@example.com",
                                                        initials="".join([j[0].upper() for j in name.split()]))
             if i % 2 == 0:
@@ -195,23 +143,19 @@ class Command(BaseCommand):
             self.profiles.append(newProfile)
 
     def setupUsefulProfiles(self):
-        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User",
+        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU",
-                                                  initials="SU",
+                                                  email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
-                                                  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",
+        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU",
-                                                    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",
+        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU",
-                                                      initials="KU",
                                                       email="keyholderuser@example.com", is_active=True)
         keyholderUser.groups.add(self.keyholder_group)
         keyholderUser.set_password('keyholder')
@@ -223,28 +167,17 @@ class Command(BaseCommand):
         basicUser.save()
 
     def setupEvents(self):
-        names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball",
+        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",
-                 "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event", "End of Term Show",
+                 "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"]
-                 "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony",
+        descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"]
-                 "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
+        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!"]
-        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 = [
+        itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00},
-            {'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2,
+                       {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00},
-             'cost': 200.00},
+                       {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52},
-            {'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,
+                       {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50},
-             'cost': 0.50},
+                       {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00},
-            {'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}]
@@ -285,8 +218,7 @@ class Command(BaseCommand):
                     newEvent.venue = random.choice(self.venues)
 
                 # Could have any status, equally weighted
-                newEvent.status = random.choice(
+                newEvent.status = random.choice([models.Event.BOOKED, models.Event.CONFIRMED, models.Event.PROVISIONAL, models.Event.CANCELLED])
-                    [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
 
@@ -317,5 +249,4 @@ class Command(BaseCommand):
                         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,
+                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, date=datetime.date.today())
-                                                          date=datetime.date.today())

RIGS/migrations/0001_initial.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
+
+from django.db import models, migrations
 import django.core.validators
 import django.utils.timezone
-from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('auth', '0001_initial'),
     ]
@@ -18,32 +19,18 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False,
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                                                     help_text='Designates that this user has all permissions without explicitly assigning them.',
+                ('username', models.CharField(max_length=30, unique=True, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])),
-                                                     verbose_name='superuser status')),
-                ('username', models.CharField(max_length=30, unique=True,
-                                              help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
-                                              verbose_name='username', validators=[
-                        django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])),
                 ('first_name', models.CharField(max_length=30, blank=True, verbose_name='first name')),
                 ('last_name', models.CharField(max_length=30, blank=True, verbose_name='last name')),
                 ('email', models.EmailField(max_length=75, blank=True, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False,
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                                                 help_text='Designates whether the user can log into this admin site.',
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                                                 verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True,
-                                                  help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.',
-                                                  verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('initials', models.CharField(max_length=5, unique=True)),
                 ('phone', models.CharField(max_length=13, blank=True, null=True)),
-                ('groups', models.ManyToManyField(blank=True,
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups', related_name='user_set', related_query_name='user', to='auth.Group')),
-                                                  help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.',
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions', related_name='user_set', related_query_name='user', to='auth.Permission')),
-                                                  verbose_name='groups', related_name='user_set',
-                                                  related_query_name='user', to='auth.Group')),
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.',
-                                                            verbose_name='user permissions', related_name='user_set',
-                                                            related_query_name='user', to='auth.Permission')),
             ],
             options={
                 'verbose_name_plural': 'users',

RIGS/migrations/0002_modelcomment_person.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
-from django.conf import settings
+
 from django.db import models, migrations
+from django.conf import settings
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0001_initial'),
     ]

RIGS/migrations/0003_auto_20141031_0219.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0002_modelcomment_person'),
     ]

RIGS/migrations/0004_organisation.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
-
 import RIGS.models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0003_auto_20141031_0219'),
     ]

RIGS/migrations/0005_auto_20141104_1619.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0004_organisation'),
     ]

RIGS/migrations/0006_auto_20141105_1553.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

RIGS/migrations/0007_vatrate.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 import RIGS.models

RIGS/migrations/0008_auto_20141105_1908.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings

RIGS/migrations/0009_auto_20141105_1916.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings

RIGS/migrations/0010_auto_20141105_2219.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings

RIGS/migrations/0011_venue_address.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

RIGS/migrations/0012_auto_20141106_0253.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

RIGS/migrations/0013_auto_20141202_0041.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0012_auto_20141106_0253'),
     ]

RIGS/migrations/0014_auto_20141208_0220.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0013_auto_20141202_0041'),
     ]

RIGS/migrations/0015_auto_20141208_0233.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
-from django.db import migrations
+
+from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0014_auto_20141208_0220'),
     ]

RIGS/migrations/0016_auto_20150127_1905.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
-from django.conf import settings
+
 from django.db import models, migrations
+from django.conf import settings
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0015_auto_20141208_0233'),
     ]
@@ -29,9 +30,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('date', models.DateField()),
                 ('amount', models.DecimalField(help_text=b'Please use ex. VAT', max_digits=10, decimal_places=2)),
-                ('method', models.CharField(max_length=2,
+                ('method', models.CharField(max_length=2, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core'), (b'M', b'Members')])),
-                                            choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'),
-                                                     (b'SU', b'SU Core'), (b'M', b'Members')])),
                 ('invoice', models.ForeignKey(to='RIGS.Invoice')),
             ],
             options={
@@ -41,8 +40,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='mic',
-            field=models.ForeignKey(related_name='event_mic', verbose_name=b'MIC', blank=True,
+            field=models.ForeignKey(related_name='event_mic', verbose_name=b'MIC', blank=True, to=settings.AUTH_USER_MODEL, null=True),
-                                    to=settings.AUTH_USER_MODEL, null=True),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0017_auto_20150129_2041.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

RIGS/migrations/0018_auto_20150130_0016.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 

RIGS/migrations/0019_auto_20150131_1919.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0018_auto_20150130_0016'),
     ]
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='payment',
             name='method',
-            field=models.CharField(blank=True, max_length=2, null=True,
+            field=models.CharField(blank=True, max_length=2, null=True, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core')]),
-                                   choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'),
-                                            (b'SU', b'SU Core')]),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0020_auto_20150303_0243.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0019_auto_20150131_1919'),
     ]
@@ -13,9 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='payment',
             name='method',
-            field=models.CharField(blank=True, max_length=2, null=True,
+            field=models.CharField(blank=True, max_length=2, null=True, choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'), (b'SU', b'SU Core'), (b'T', b'TEC Adjustment')]),
-                                   choices=[(b'C', b'Cash'), (b'I', b'Internal'), (b'E', b'External'),
-                                            (b'SU', b'SU Core'), (b'T', b'TEC Adjustment')]),
             preserve_default=True,
         ),
     ]

RIGS/migrations/0021_auto_20150420_1155.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0020_auto_20150303_0243'),
     ]

RIGS/migrations/0022_auto_20150424_2104.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0021_auto_20150420_1155'),
     ]

RIGS/migrations/0023_auto_20150529_0048.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
-import django.contrib.auth.models
+
-import django.core.validators
 from django.db import models, migrations
+import django.core.validators
+import django.contrib.auth.models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0022_auto_20150424_2104'),
     ]
@@ -45,10 +46,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='profile',
             name='groups',
-            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group',
+            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
-                                         blank=True,
-                                         help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.',
-                                         verbose_name='groups'),
         ),
         migrations.AlterField(
             model_name='profile',
@@ -58,12 +56,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='profile',
             name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'},
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
-                                   max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$',
-                                                                                                    'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.',
-                                                                                                    'invalid')],
-                                   help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.',
-                                   unique=True, verbose_name='username'),
         ),
         migrations.AlterField(
             model_name='venue',

RIGS/migrations/0024_auto_20160229_2042.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
-import django.db.models.deletion
+
 from django.db import models, migrations
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0023_auto_20150529_0048'),
     ]
@@ -14,7 +15,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='event',
             name='based_on',
-            field=models.ForeignKey(related_name='future_events', on_delete=django.db.models.deletion.SET_NULL,
+            field=models.ForeignKey(related_name='future_events', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='RIGS.Event', null=True),
-                                    blank=True, to='RIGS.Event', null=True),
         ),
     ]

RIGS/migrations/0025_auto_20160331_1302.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-03-31 12:02
+
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0024_auto_20160229_2042'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
+        ),
+        migrations.AlterField(
+            model_name='vatrate',
+            name='start_at',
+            field=models.DateField(),
+        ),
+    ]

RIGS/migrations/0025_eventauthorisation.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0024_auto_20160229_2042'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EventAuthorisation',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('email', models.EmailField(max_length=254)),
+                ('name', models.CharField(max_length=255)),
+                ('uni_id', models.CharField(max_length=10, null=True, verbose_name=b'University ID', blank=True)),
+                ('account_code', models.CharField(max_length=50, null=True, blank=True)),
+                ('amount', models.DecimalField(verbose_name=b'authorisation amount', max_digits=10, decimal_places=2)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('event', models.ForeignKey(related_name='authroisations', to='RIGS.Event')),
+            ],
+        ),
+    ]

RIGS/migrations/0026_auto_20170510_1846.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-05-10 17:46
+
+
+import django.contrib.auth.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0025_auto_20160331_1302'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
+        ),
+    ]

RIGS/migrations/0026_remove_eventauthorisation_created_at.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0025_eventauthorisation'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='eventauthorisation',
+            name='created_at',
+        ),
+    ]

RIGS/migrations/0027_eventauthorisation_event_singular.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0026_remove_eventauthorisation_created_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventauthorisation',
+            name='event',
+            field=models.OneToOneField(related_name='authorisation', to='RIGS.Event'),
+        ),
+    ]

RIGS/migrations/0029_eventauthorisation_sent_by.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0027_eventauthorisation_event_singular'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='eventauthorisation',
+            name='sent_by',
+            field=models.ForeignKey(default=1, to=settings.AUTH_USER_MODEL),
+            preserve_default=False,
+        ),
+    ]

RIGS/migrations/0030_auth_request_sending.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0029_eventauthorisation_sent_by'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='auth_request_at',
+            field=models.DateTimeField(null=True, blank=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='auth_request_by',
+            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='auth_request_to',
+            field=models.EmailField(max_length=254, null=True, blank=True),
+        ),
+    ]

RIGS/migrations/0031_merge_20170512_2102.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-05-12 20:02
+
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0030_auth_request_sending'),
+        ('RIGS', '0026_auto_20170510_1846'),
+    ]
+
+    operations = [
+    ]

RIGS/migrations/0032_auto_20170904_2355.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-04 22:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+import django.contrib.auth.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reversion', '0001_squashed_0004_auto_20160611_1202'),
+        ('RIGS', '0031_merge_20170512_2102'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RIGSVersion',
+            fields=[
+            ],
+            options={
+                'indexes': [],
+                'proxy': True,
+            },
+            bases=('reversion.version',),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='collector',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='collected by'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='mic',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='event_mic', to=settings.AUTH_USER_MODEL, verbose_name='MIC'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='purchase_order',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='PO'),
+        ),
+        migrations.AlterField(
+            model_name='eventauthorisation',
+            name='amount',
+            field=models.DecimalField(decimal_places=2, max_digits=10, verbose_name='authorisation amount'),
+        ),
+        migrations.AlterField(
+            model_name='eventauthorisation',
+            name='uni_id',
+            field=models.CharField(blank=True, max_length=10, null=True, verbose_name='University ID'),
+        ),
+        migrations.AlterField(
+            model_name='payment',
+            name='amount',
+            field=models.DecimalField(decimal_places=2, help_text='Please use ex. VAT', max_digits=10),
+        ),
+        migrations.AlterField(
+            model_name='payment',
+            name='method',
+            field=models.CharField(blank=True, choices=[('C', 'Cash'), ('I', 'Internal'), ('E', 'External'), ('SU', 'SU Core'), ('T', 'TEC Adjustment')], max_length=2, null=True),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='username',
+            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
+        ),
+    ]

RIGS/models.py

@@ -1,35 +1,32 @@
 import datetime
 import hashlib
-import random
+import datetime
+import pytz
+
+from django.db import models
+from django.contrib.auth.models import AbstractUser
+from django.conf import settings
+from django.utils import timezone
+from django.utils.functional import cached_property
+from django.utils.encoding import python_2_unicode_compatible
+from reversion import revisions as reversion
+from reversion.models import Version
 import string
+
+import random
 from collections import Counter
 from decimal import Decimal
 
-import pytz
-import reversion
-from django.conf import settings
-from django.contrib.auth.models import AbstractUser
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse_lazy
-from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.functional import cached_property
 
 
 # Create your models here.
 @python_2_unicode_compatible
 class Profile(AbstractUser):
-    initials = models.CharField(
+    initials = models.CharField(max_length=5, unique=True, null=True, blank=False)
-        max_length=5,
-        unique=True,
-        null=True,
-        blank=False)
     phone = models.CharField(max_length=13, null=True, blank=True)
-    api_key = models.CharField(
+    api_key = models.CharField(max_length=40, blank=True, editable=False, null=True)
-        max_length=40,
-        blank=True,
-        editable=False,
-        null=True)
 
     @classmethod
     def make_api_key(cls):
@@ -42,8 +39,7 @@ class Profile(AbstractUser):
     def profile_picture(self):
         url = ""
         if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None:
-            url = "https://www.gravatar.com/avatar/" + \
+            url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email.encode('utf-8')).hexdigest() + "?d=wavatar&s=500"
-                  hashlib.md5(self.email).hexdigest() + "?d=wavatar&s=500"
         return url
 
     @property
@@ -55,8 +51,7 @@ class Profile(AbstractUser):
 
     @property
     def latest_events(self):
-        return self.event_mic.order_by(
+        return self.event_mic.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
-            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def __str__(self):
         return self.name
@@ -68,32 +63,31 @@ class Profile(AbstractUser):
 
 
 class RevisionMixin(object):
+    @property
+    def current_version(self):
+        version = Version.objects.get_for_object(self).select_related('revision').first()
+        return version
+
     @property
     def last_edited_at(self):
-        versions = reversion.get_for_object(self)
+        version = self.current_version
-        if versions:
+        if version is None:
-            version = reversion.get_for_object(self)[0]
-            return version.revision.date_created
-        else:
             return None
+        return version.revision.date_created
 
     @property
     def last_edited_by(self):
-        versions = reversion.get_for_object(self)
+        version = self.current_version
-        if versions:
+        if version is None:
-            version = reversion.get_for_object(self)[0]
-            return version.revision.user
-        else:
             return None
+        return version.revision.user
 
     @property
     def current_version_id(self):
-        versions = reversion.get_for_object(self)
+        version = self.current_version
-        if versions:
+        if version is None:
-            version = reversion.get_for_object(self)[0]
-            return "V{0} | R{1}".format(version.pk, version.revision.pk)
-        else:
             return None
+        return "V{0} | R{1}".format(version.pk, version.revision.pk)
 
 
 @reversion.register
@@ -117,8 +111,7 @@ class Person(models.Model, RevisionMixin):
     @property
     def organisations(self):
         o = []
-        for e in Event.objects.filter(
+        for e in Event.objects.filter(person=self).select_related('organisation'):
-            person=self).select_related('organisation'):
             if e.organisation:
                 o.append(e.organisation)
 
@@ -129,8 +122,7 @@ class Person(models.Model, RevisionMixin):
 
     @property
     def latest_events(self):
-        return self.event_set.order_by(
+        return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
-            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
         return reverse_lazy('person_detail', kwargs={'pk': self.pk})
@@ -163,8 +155,7 @@ class Organisation(models.Model, RevisionMixin):
     @property
     def persons(self):
         p = []
-        for e in Event.objects.filter(
+        for e in Event.objects.filter(organisation=self).select_related('person'):
-            organisation=self).select_related('person'):
             if e.person:
                 p.append(e.person)
 
@@ -175,8 +166,7 @@ class Organisation(models.Model, RevisionMixin):
 
     @property
     def latest_events(self):
-        return self.event_set.order_by(
+        return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
-            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
         return reverse_lazy('organisation_detail', kwargs={'pk': self.pk})
@@ -189,7 +179,7 @@ class Organisation(models.Model, RevisionMixin):
 
 class VatManager(models.Manager):
     def current_rate(self):
-        return self.find_rate(datetime.datetime.now())
+        return self.find_rate(timezone.now())
 
     def find_rate(self, date):
         # return self.filter(startAt__lte=date).latest()
@@ -204,7 +194,7 @@ class VatManager(models.Manager):
 @reversion.register
 @python_2_unicode_compatible
 class VatRate(models.Model, RevisionMixin):
-    start_at = models.DateTimeField()
+    start_at = models.DateField()
     rate = models.DecimalField(max_digits=6, decimal_places=6)
     comment = models.CharField(max_length=255)
 
@@ -219,8 +209,7 @@ class VatRate(models.Model, RevisionMixin):
         get_latest_by = 'start_at'
 
     def __str__(self):
-        return self.comment + " " + \
+        return self.comment + " " + str(self.start_at) + " @ " + str(self.as_percent) + "%"
-               str(self.start_at) + " @ " + str(self.as_percent) + "%"
 
 
 @reversion.register
@@ -242,8 +231,7 @@ class Venue(models.Model, RevisionMixin):
 
     @property
     def latest_events(self):
-        return self.event_set.order_by(
+        return self.event_set.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
-            '-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
     def get_absolute_url(self):
         return reverse_lazy('venue_detail', kwargs={'pk': self.pk})
@@ -257,43 +245,26 @@ class Venue(models.Model, RevisionMixin):
 class EventManager(models.Manager):
     def current_events(self):
         events = self.filter(
-            (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False) & ~models.Q(
+            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False) & ~models.Q(status=Event.CANCELLED)) |  # Starts after with no end
-                status=Event.CANCELLED)) |  # Starts after with no end
+            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False) & ~models.Q(status=Event.CANCELLED)) |  # Ends after
-            (models.Q(end_date__gte=datetime.date.today(), dry_hire=False) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=timezone.now().date()) & ~models.Q(status=Event.CANCELLED)) |  # Active dry hire
-                status=Event.CANCELLED)) |  # Ends after
+            (models.Q(dry_hire=True, checked_in_by__isnull=True) & (models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) |  # Active dry hire GT
-            (models.Q(dry_hire=True, start_date__gte=datetime.date.today()) & ~models.Q(
+            models.Q(status=Event.CANCELLED, start_date__gte=timezone.now().date())  # Canceled but not started
-                status=Event.CANCELLED)) |  # Active dry hire
+        ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic')
-            (models.Q(dry_hire=True, checked_in_by__isnull=True) & (
-                models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED))) |  # Active dry hire GT
-            # Canceled but not started
-            models.Q(
-                status=Event.CANCELLED,
-                start_date__gte=datetime.date.today())
-        ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person',
-                                                                                                 'organisation',
-                                                                                                 'venue', 'mic')
         return events
 
     def events_in_bounds(self, start, end):
         events = self.filter(
-            # Start date in bounds
+            (models.Q(start_date__gte=start.date(), start_date__lte=end.date())) |  # Start date in bounds
-            (models.Q(start_date__gte=start.date(), start_date__lte=end.date())) |
+            (models.Q(end_date__gte=start.date(), end_date__lte=end.date())) |  # End date in bounds
-            # End date in bounds
+            (models.Q(access_at__gte=start, access_at__lte=end)) |  # Access at in bounds
-            (models.Q(end_date__gte=start.date(), end_date__lte=end.date())) |
-            # Access at in bounds
-            (models.Q(access_at__gte=start, access_at__lte=end)) |
             (models.Q(meet_at__gte=start, meet_at__lte=end)) |  # Meet at in bounds
 
-            # Start before, end after
+            (models.Q(start_date__lte=start, end_date__gte=end)) |  # Start before, end after
-            (models.Q(start_date__lte=start, end_date__gte=end)) |
+            (models.Q(access_at__lte=start, start_date__gte=end)) |  # Access before, start after
-            # Access before, start after
+            (models.Q(access_at__lte=start, end_date__gte=end)) |  # Access before, end after
-            (models.Q(access_at__lte=start, start_date__gte=end)) |
+            (models.Q(meet_at__lte=start, start_date__gte=end)) |  # Meet before, start after
-            # Access before, end after
+            (models.Q(meet_at__lte=start, end_date__gte=end))  # Meet before, end after
-            (models.Q(access_at__lte=start, end_date__gte=end)) |
-            # Meet before, start after
-            (models.Q(meet_at__lte=start, start_date__gte=end)) |
-            # Meet before, end after
-            (models.Q(meet_at__lte=start, end_date__gte=end))
 
         ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person',
                                                                                                  'organisation',
@@ -302,12 +273,12 @@ class EventManager(models.Manager):
 
     def rig_count(self):
         event_count = self.filter(
-            (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False,
+            (models.Q(start_date__gte=timezone.now().date(), end_date__isnull=True, dry_hire=False,
                       is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Starts after with no end
-            (models.Q(end_date__gte=datetime.date.today(), dry_hire=False, is_rig=True) & ~models.Q(
+            (models.Q(end_date__gte=timezone.now().date(), dry_hire=False, is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Ends after
-            (models.Q(dry_hire=True, start_date__gte=datetime.date.today(), is_rig=True) & ~models.Q(
+            (models.Q(dry_hire=True, start_date__gte=timezone.now().date(), is_rig=True) & ~models.Q(
                 status=Event.CANCELLED)) |  # Active dry hire
             (models.Q(dry_hire=True, checked_in_by__isnull=True, is_rig=True) & (
                 models.Q(status=Event.BOOKED) | models.Q(status=Event.CONFIRMED)))  # Active dry hire GT
@@ -336,9 +307,7 @@ class Event(models.Model, RevisionMixin):
     venue = models.ForeignKey('Venue', blank=True, null=True)
     description = models.TextField(blank=True, null=True)
     notes = models.TextField(blank=True, null=True)
-    status = models.IntegerField(
+    status = models.IntegerField(choices=EVENT_STATUS_CHOICES, default=PROVISIONAL)
-        choices=EVENT_STATUS_CHOICES,
-        default=PROVISIONAL)
     dry_hire = models.BooleanField(default=False)
     is_rig = models.BooleanField(default=True)
     based_on = models.ForeignKey('Event', on_delete=models.SET_NULL, related_name='future_events', blank=True,
@@ -354,27 +323,20 @@ class Event(models.Model, RevisionMixin):
     meet_info = models.CharField(max_length=255, blank=True, null=True)
 
     # Crew management
-    checked_in_by = models.ForeignKey(
+    checked_in_by = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_checked_in', blank=True, null=True)
-        settings.AUTH_USER_MODEL,
-        related_name='event_checked_in',
-        blank=True,
-        null=True)
     mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='event_mic', blank=True, null=True,
                             verbose_name="MIC")
 
     # Monies
     payment_method = models.CharField(max_length=255, blank=True, null=True)
     payment_received = models.CharField(max_length=255, blank=True, null=True)
-    purchase_order = models.CharField(
+    purchase_order = models.CharField(max_length=255, blank=True, null=True, verbose_name='PO')
-        max_length=255,
+    collector = models.CharField(max_length=255, blank=True, null=True, verbose_name='collected by')
-        blank=True,
+
-        null=True,
+    # Authorisation request details
-        verbose_name='PO')
+    auth_request_by = models.ForeignKey('Profile', null=True, blank=True)
-    collector = models.CharField(
+    auth_request_at = models.DateTimeField(null=True, blank=True)
-        max_length=255,
+    auth_request_to = models.EmailField(null=True, blank=True)
-        blank=True,
-        null=True,
-        verbose_name='collected by')
 
     # Calculated values
     """
@@ -408,7 +370,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def vat(self):
-        return self.sum_total * self.vat_rate.rate
+        return Decimal(self.sum_total * self.vat_rate.rate).quantize(Decimal('.01'))
 
     """
     Inc VAT
@@ -416,7 +378,7 @@ class Event(models.Model, RevisionMixin):
 
     @property
     def total(self):
-        return self.sum_total + self.vat
+        return Decimal(self.sum_total + self.vat).quantize(Decimal('.01'))
 
     @property
     def cancelled(self):
@@ -426,6 +388,10 @@ class Event(models.Model, RevisionMixin):
     def confirmed(self):
         return (self.status == self.BOOKED or self.status == self.CONFIRMED)
 
+    @property
+    def authorised(self):
+        return not self.internal and self.purchase_order or self.authorisation.amount == self.total
+
     @property
     def has_start_time(self):
         return self.start_time is not None
@@ -450,11 +416,9 @@ class Event(models.Model, RevisionMixin):
         # If there is no start time defined, pretend it's midnight
         startTimeFaked = False
         if self.has_start_time:
-            startDateTime = datetime.datetime.combine(
+            startDateTime = datetime.datetime.combine(self.start_date, self.start_time)
-                self.start_date, self.start_time)
         else:
-            startDateTime = datetime.datetime.combine(
+            startDateTime = datetime.datetime.combine(self.start_date, datetime.time(00, 00))
-                self.start_date, datetime.time(00, 00))
             startTimeFaked = True
 
         # timezoneIssues - apply the default timezone to the naiive datetime
@@ -462,8 +426,7 @@ class Event(models.Model, RevisionMixin):
         startDateTime = tz.localize(startDateTime)
         datetime_list.append(startDateTime)  # then add it to the list
 
-        # find the earliest datetime in the list
+        earliest = min(datetime_list).astimezone(tz)  # find the earliest datetime in the list
-        earliest = min(datetime_list).astimezone(tz)
 
         # if we faked it & it's the earliest, better own up
         if startTimeFaked and earliest == startDateTime:
@@ -489,24 +452,26 @@ class Event(models.Model, RevisionMixin):
         else:
             return endDate
 
+    @property
+    def internal(self):
+        return self.organisation and self.organisation.union_account
+
     objects = EventManager()
 
     def get_absolute_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.pk})
 
     def __str__(self):
-        return unicode(self.pk) + ": " + self.name
+        return str(self.pk) + ": " + self.name
 
     def clean(self):
         if self.end_date and self.start_date > self.end_date:
-            raise ValidationError(
+            raise ValidationError('Unless you\'ve invented time travel, the event can\'t finish before it has started.')
-                'Unless you\'ve invented time travel, the event can\'t finish before it has started.')
 
         startEndSameDay = not self.end_date or self.end_date == self.start_date
         hasStartAndEnd = self.has_start_time and self.has_end_time
         if startEndSameDay and hasStartAndEnd and self.start_time > self.end_time:
-            raise ValidationError(
+            raise ValidationError('Unless you\'ve invented time travel, the event can\'t finish before it has started.')
-                'Unless you\'ve invented time travel, the event can\'t finish before it has started.')
 
     def save(self, *args, **kwargs):
         """Call :meth:`full_clean` before saving."""
@@ -535,8 +500,7 @@ class EventItem(models.Model):
         ordering = ['order']
 
     def __str__(self):
-        return str(self.event.pk) + "." + str(self.order) + \
+        return str(self.event.pk) + "." + str(self.order) + ": " + self.event.name + " | " + self.name
-               ": " + self.event.name + " | " + self.name
 
 
 class EventCrew(models.Model):
@@ -548,6 +512,24 @@ class EventCrew(models.Model):
     notes = models.TextField(blank=True, null=True)
 
 
+@reversion.register
+class EventAuthorisation(models.Model, RevisionMixin):
+    event = models.OneToOneField('Event', related_name='authorisation')
+    email = models.EmailField()
+    name = models.CharField(max_length=255)
+    uni_id = models.CharField(max_length=10, blank=True, null=True, verbose_name="University ID")
+    account_code = models.CharField(max_length=50, blank=True, null=True)
+    amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="authorisation amount")
+    sent_by = models.ForeignKey('RIGS.Profile')
+
+    def get_absolute_url(self):
+        return reverse_lazy('event_detail', kwargs={'pk': self.event.pk})
+
+    @property
+    def activity_feed_string(self):
+        return str("N%05d" % self.event.pk + ' (requested by ' + self.sent_by.initials + ')')
+
+
 @python_2_unicode_compatible
 class Invoice(models.Model):
     event = models.OneToOneField('Event')
@@ -604,15 +586,8 @@ class Payment(models.Model):
 
     invoice = models.ForeignKey('Invoice')
     date = models.DateField()
-    amount = models.DecimalField(
+    amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT')
-        max_digits=10,
+    method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True)
-        decimal_places=2,
-        help_text='Please use ex. VAT')
-    method = models.CharField(
-        max_length=2,
-        choices=METHODS,
-        null=True,
-        blank=True)
 
     def __str__(self):
         return "%s: %d" % (self.get_method_display(), self.amount)

RIGS/regbackend.py

@@ -1,4 +1,6 @@
+from RIGS.models import Profile
 from RIGS.forms import ProfileRegistrationFormUniqueEmail
+from registration.signals import user_registered
 
 
 def user_created(sender, user, request, **kwargs):
@@ -10,6 +12,4 @@ def user_created(sender, user, request, **kwargs):
     user.save()
 
 
-from registration.signals import user_registered
-
 user_registered.connect(user_created)

RIGS/rigboard.py

@@ -1,23 +1,33 @@
-import cStringIO as StringIO
-import copy
-import datetime
-import re
-import urllib2
 from io import BytesIO
+import urllib.request
+import urllib.error
+import urllib.parse
 
-from PyPDF2 import PdfFileMerger, PdfFileReader
+from django.contrib.staticfiles.storage import staticfiles_storage
-from django.conf import settings
+from django.core.mail import EmailMessage, EmailMultiAlternatives
-from django.contrib import messages
+from django.views import generic
 from django.core.urlresolvers import reverse_lazy
-from django.db.models import Q
-from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.template import RequestContext
 from django.template.loader import get_template
-from django.views import generic
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django.core import signing
+from django.http import HttpResponse
+from django.core.exceptions import SuspiciousOperation
+from django.db.models import Q
+from django.contrib import messages
+from django.utils.decorators import method_decorator
 from z3c.rml import rml2pdf
+from PyPDF2 import PdfFileMerger, PdfFileReader
+import simplejson
+import premailer
 
 from RIGS import models, forms
+from PyRIGS import decorators
+import datetime
+import re
+import copy
 
 __author__ = 'ghost'
 
@@ -48,6 +58,28 @@ class EventDetail(generic.DetailView):
     model = models.Event
 
 
+class EventOembed(generic.View):
+    model = models.Event
+
+    def get(self, request, pk=None):
+        embed_url = reverse('event_embed', args=[pk])
+        full_url = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], embed_url)
+
+        data = {
+            'html': '<iframe src="{0}" frameborder="0" width="100%" height="250"></iframe>'.format(full_url),
+            'version': '1.0',
+            'type': 'rich',
+            'height': '250'
+        }
+
+        json = simplejson.JSONEncoderForHTML().encode(data)
+        return HttpResponse(json, content_type="application/json")
+
+
+class EventEmbed(EventDetail):
+    template_name = 'RIGS/event_embed.html'
+
+
 class EventCreate(generic.CreateView):
     model = models.Event
     form_class = forms.EventForm
@@ -59,13 +91,10 @@ class EventCreate(generic.CreateView):
 
         form = context['form']
         if re.search('"-\d+"', form['items_json'].value()):
-            messages.info(
+            messages.info(self.request, "Your item changes have been saved. Please fix the errors and save the event.")
-                self.request,
-                "Your item changes have been saved. Please fix the errors and save the event.")
 
-        # Get some other objects to include in the form. Used when there are
+        # Get some other objects to include in the form. Used when there are errors but also nice and quick.
-        # errors but also nice and quick.
+        for field, model in form.related_models.items():
-        for field, model in form.related_models.iteritems():
             value = form[field].value()
             if value is not None and value != '':
                 context[field] = model.objects.get(pk=value)
@@ -85,12 +114,19 @@ class EventUpdate(generic.UpdateView):
 
         form = context['form']
 
-        # Get some other objects to include in the form. Used when there are
+        # Get some other objects to include in the form. Used when there are errors but also nice and quick.
-        # errors but also nice and quick.
+        for field, model in form.related_models.items():
-        for field, model in form.related_models.iteritems():
             value = form[field].value()
             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 get_success_url(self):
@@ -99,18 +135,21 @@ class EventUpdate(generic.UpdateView):
 
 class EventDuplicate(EventUpdate):
     def get_object(self, queryset=None):
-        # Get the object (the event you're duplicating)
+        old = super(EventDuplicate, self).get_object(queryset)  # Get the object (the event you're duplicating)
-        old = super(EventDuplicate, self).get_object(queryset)
         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 all the authorisation information from the new event
+        new.auth_request_to = None
+        new.auth_request_by = None
+        new.auth_request_at = None
 
         if self.request.method in (
                 'POST', 'PUT'):  # This only happens on save (otherwise items won't display in editor)
             new.pk = None  # This means a new event will be created on save, and all items will be re-created
-
+        else:
-        messages.info(
+            messages.info(self.request, 'Event data duplicated but not yet saved. Click save to complete operation.')
-            self.request,
-            'Event data duplicated but not yet saved. Click save to complete operation.')
 
         return new
 
@@ -124,12 +163,10 @@ class EventPrint(generic.View):
     def get(self, request, pk):
         object = get_object_or_404(models.Event, pk=pk)
         template = get_template('RIGS/event_print.xml')
-        copies = ('TEC', 'Client')
 
         merger = PdfFileMerger()
 
-        for copy in copies:
+        context = {
-            context = RequestContext(request, {  # this should be outside the loop, but bug in 1.8.2 prevents this
             'object': object,
             'fonts': {
                 'opensans': {
@@ -137,24 +174,18 @@ class EventPrint(generic.View):
                     'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
                 }
             },
-                'copy': copy,
+            'quote': True,
             'current_user': request.user,
-            })
+        }
-
-            # context['copy'] = copy # this is the way to do it once we upgrade
-            # to Django 1.8.3
 
         rml = template.render(context)
-            buffer = StringIO.StringIO()
 
         buffer = rml2pdf.parseString(rml)
-
         merger.append(PdfFileReader(buffer))
-
         buffer.close()
 
-        terms = urllib2.urlopen(settings.TERMS_OF_HIRE_URL)
+        terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
-        merger.append(StringIO.StringIO(terms.read()))
+        merger.append(BytesIO(terms.read()))
 
         merged = BytesIO()
         merger.write(merged)
@@ -163,8 +194,7 @@ class EventPrint(generic.View):
 
         escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', object.name)
 
-        response[
+        response['Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName)
-            'Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName)
         response.write(merged.getvalue())
         return response
 
@@ -202,9 +232,151 @@ class EventArchive(generic.ArchiveIndexView):
         qs.select_related('person', 'organisation', 'venue', 'mic')
 
         if len(qs) == 0:
-            messages.add_message(
+            messages.add_message(self.request, messages.WARNING, "No events have been found matching those criteria.")
-                self.request,
-                messages.WARNING,
-                "No events have been found matching those criteria.")
 
         return qs
+
+
+class EventAuthorise(generic.UpdateView):
+    template_name = 'RIGS/eventauthorisation_form.html'
+    success_template = 'RIGS/eventauthorisation_success.html'
+
+    def form_valid(self, form):
+        self.object = form.save()
+
+        self.template_name = self.success_template
+        messages.add_message(self.request, messages.SUCCESS,
+                             'Success! Your event has been authorised. ' +
+                             'You will also receive email confirmation to %s.' % (self.object.email))
+        return self.render_to_response(self.get_context_data())
+
+    @property
+    def event(self):
+        return models.Event.objects.select_related('organisation', 'person', 'venue').get(pk=self.kwargs['pk'])
+
+    def get_object(self, queryset=None):
+        return getattr(self.event, 'authorisation', None)
+
+    def get_form_class(self):
+        return forms.InternalClientEventAuthorisationForm
+
+    def get_context_data(self, **kwargs):
+        context = super(EventAuthorise, self).get_context_data(**kwargs)
+        context['event'] = self.event
+
+        context['tos_url'] = settings.TERMS_OF_HIRE_URL
+        return context
+
+    def get(self, request, *args, **kwargs):
+        if self.get_object() is not None and self.get_object().pk is not None:
+            if self.event.authorised:
+                messages.add_message(self.request, messages.WARNING,
+                                     "This event has already been authorised. "
+                                     "Reauthorising is not necessary at this time.")
+            else:
+                messages.add_message(self.request, messages.WARNING,
+                                     "This event has already been authorised, but the amount has changed. " +
+                                     "Please check the amount and reauthorise.")
+        return super(EventAuthorise, self).get(request, *args, **kwargs)
+
+    def get_form(self, **kwargs):
+        form = super(EventAuthorise, self).get_form(**kwargs)
+        form.instance.event = self.event
+        form.instance.email = self.request.email
+        form.instance.sent_by = self.request.sent_by
+        return form
+
+    def dispatch(self, request, *args, **kwargs):
+        # Verify our signature matches up and all is well with the integrity of the URL
+        try:
+            data = signing.loads(kwargs.get('hmac'))
+            assert int(kwargs.get('pk')) == int(data.get('pk'))
+            request.email = data['email']
+            request.sent_by = models.Profile.objects.get(pk=data['sent_by'])
+        except (signing.BadSignature, AssertionError, KeyError, models.Profile.DoesNotExist):
+            raise SuspiciousOperation(
+                "This URL is invalid. Please ask your TEC contact for a new URL")
+        return super(EventAuthorise, self).dispatch(request, *args, **kwargs)
+
+
+class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMixin):
+    model = models.Event
+    form_class = forms.EventAuthorisationRequestForm
+    template_name = 'RIGS/eventauthorisation_request.html'
+
+    @method_decorator(decorators.nottinghamtec_address_required)
+    def dispatch(self, *args, **kwargs):
+        return super(EventAuthorisationRequest, self).dispatch(*args, **kwargs)
+
+    @property
+    def object(self):
+        return self.get_object()
+
+    def get_success_url(self):
+        if self.request.is_ajax():
+            url = reverse_lazy('closemodal')
+            messages.info(self.request, "location.reload()")
+        else:
+            url = reverse_lazy('event_detail', kwargs={
+                'pk': self.object.pk,
+            })
+            messages.add_message(self.request, messages.SUCCESS, "Authorisation request successfully sent.")
+        return url
+
+    def form_valid(self, form):
+        email = form.cleaned_data['email']
+        event = self.object
+        event.auth_request_by = self.request.user
+        event.auth_request_at = datetime.datetime.now()
+        event.auth_request_to = email
+        event.save()
+
+        context = {
+            'object': self.object,
+            'request': self.request,
+            'hmac': signing.dumps({
+                'pk': self.object.pk,
+                'email': email,
+                'sent_by': self.request.user.pk,
+            }),
+        }
+        if email == event.person.email:
+            context['to_name'] = event.person.name
+
+        msg = EmailMultiAlternatives(
+            "N%05d | %s - Event Authorisation Request" % (self.object.pk, self.object.name),
+            get_template("RIGS/eventauthorisation_client_request.txt").render(context),
+            to=[email],
+            reply_to=[self.request.user.email],
+        )
+        css = staticfiles_storage.path('css/email.css')
+        html = premailer.Premailer(get_template("RIGS/eventauthorisation_client_request.html").render(context),
+                                   external_styles=css).transform()
+        msg.attach_alternative(html, 'text/html')
+
+        msg.send()
+
+        return super(EventAuthorisationRequest, self).form_valid(form)
+
+
+class EventAuthoriseRequestEmailPreview(generic.DetailView):
+    template_name = "RIGS/eventauthorisation_client_request.html"
+    model = models.Event
+
+    def render_to_response(self, context, **response_kwargs):
+        from django.contrib.staticfiles.storage import staticfiles_storage
+        css = staticfiles_storage.path('css/email.css')
+        response = super(EventAuthoriseRequestEmailPreview, self).render_to_response(context, **response_kwargs)
+        assert isinstance(response, HttpResponse)
+        response.content = premailer.Premailer(response.rendered_content, external_styles=css).transform()
+        return response
+
+    def get_context_data(self, **kwargs):
+        context = super(EventAuthoriseRequestEmailPreview, self).get_context_data(**kwargs)
+        context['hmac'] = signing.dumps({
+            'pk': self.object.pk,
+            'email': self.request.GET.get('email', 'hello@world.test'),
+            'sent_by': self.request.user.pk,
+        })
+        context['to_name'] = self.request.GET.get('to_name', None)
+        return context

RIGS/signals.py

@@ -0,0 +1,98 @@
+import re
+import urllib.request
+import urllib.error
+import urllib.parse
+from io import BytesIO
+
+from django.db.models.signals import post_save
+from PyPDF2 import PdfFileReader, PdfFileMerger
+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 premailer import Premailer
+from z3c.rml import rml2pdf
+
+from RIGS import models
+
+
+def send_eventauthorisation_success_email(instance):
+    # Generate PDF first to prevent context conflicts
+    context = {
+        'object': instance.event,
+        'fonts': {
+            'opensans': {
+                'regular': 'RIGS/static/fonts/OPENSANS-REGULAR.TTF',
+                'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
+            }
+        },
+        'receipt': True,
+        'current_user': False,
+    }
+
+    template = get_template('RIGS/event_print.xml')
+    merger = PdfFileMerger()
+
+    rml = template.render(context)
+
+    buffer = rml2pdf.parseString(rml)
+    merger.append(PdfFileReader(buffer))
+    buffer.close()
+
+    terms = urllib.request.urlopen(settings.TERMS_OF_HIRE_URL)
+    merger.append(BytesIO(terms.read()))
+
+    merged = BytesIO()
+    merger.write(merged)
+
+    # Produce email content
+    context = {
+        'object': instance,
+    }
+
+    if instance.email == instance.event.person.email:
+        context['to_name'] = instance.event.person.name
+
+    subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
+
+    client_email = EmailMultiAlternatives(
+        subject,
+        get_template("RIGS/eventauthorisation_client_success.txt").render(context),
+        to=[instance.email],
+        reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
+    )
+
+    css = staticfiles_storage.path('css/email.css')
+    html = Premailer(get_template("RIGS/eventauthorisation_client_success.html").render(context),
+                     external_styles=css).transform()
+    client_email.attach_alternative(html, 'text/html')
+
+    escapedEventName = re.sub('[^a-zA-Z0-9 \n\.]', '', instance.event.name)
+
+    client_email.attach('N%05d - %s - CONFIRMATION.pdf' % (instance.event.pk, escapedEventName),
+                        merged.getvalue(),
+                        'application/pdf'
+                        )
+
+    if instance.event.mic:
+        mic_email_address = instance.event.mic.email
+    else:
+        mic_email_address = settings.AUTHORISATION_NOTIFICATION_ADDRESS
+
+    mic_email = EmailMessage(
+        subject,
+        get_template("RIGS/eventauthorisation_mic_success.txt").render(context),
+        to=[mic_email_address]
+    )
+
+    # Now we have both emails successfully generated, send them out
+    client_email.send(fail_silently=True)
+    mic_email.send(fail_silently=True)
+
+
+def on_revision_commit(sender, instance, created, **kwargs):
+    if created:
+        send_eventauthorisation_success_email(instance)
+
+
+post_save.connect(on_revision_commit, sender=models.EventAuthorisation)

RIGS/static/css/email.css

@@ -0,0 +1 @@
+body{margin:0px}.main-table{width:100%;border-collapse:collapse}.client-header{background-image:url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");background-color:#222;background-repeat:no-repeat;background-position:center;width:100%;margin-bottom:28px}.client-header .logos{width:100%;max-width:640px}.client-header img{height:110px}.content-container{width:100%}.content-container .content{font-family:"Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;width:100%;max-width:600px;padding:10px;text-align:left}.content-container .content .button-container{width:100%}.content-container .content .button-container .button{padding:6px 12px;background-color:#357ebf;border-radius:4px}.content-container .content .button-container .button a{color:#fff;text-decoration:none}

RIGS/static/js/affix.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.3.2
+ * Bootstrap: affix.js v3.3.7
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -21,14 +21,14 @@
       .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
     this.$element     = $(element)
-    this.affixed      =
+    this.affixed      = null
-    this.unpin        =
+    this.unpin        = null
     this.pinnedOffset = null
 
     this.checkPosition()
   }
 
-  Affix.VERSION  = '3.3.2'
+  Affix.VERSION  = '3.3.7'
 
   Affix.RESET    = 'affix affix-top affix-bottom'
 
@@ -78,7 +78,7 @@
     var offset       = this.options.offset
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
-    var scrollHeight = $('body').height()
+    var scrollHeight = Math.max($(document).height(), $(document.body).height())
 
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
     if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)

RIGS/static/js/ajax-bootstrap-select.js

@@ -3,16 +3,16 @@
  *
  * Extends existing [Bootstrap Select] implementations by adding the ability to search via AJAX requests as you type. Originally for CROSCON.
  *
- * @version 1.3.1
+ * @version 1.4.1
  * @author Adam Heim - https://github.com/truckingsim
  * @link https://github.com/truckingsim/Ajax-Bootstrap-Select
- * @copyright 2015 Adam Heim
+ * @copyright 2017 Adam Heim
  * @license Released under the MIT license.
  *
  * Contributors:
  *   Mark Carver - https://github.com/markcarver
  *
- * Last build: 2015-01-06 8:43:11 PM EST
+ * Last build: 2017-07-21 1:08:54 PM GMT-0400
  */
 !(function ($, window) {
 
@@ -186,10 +186,25 @@ var AjaxBootstrapSelect = function (element, options) {
     if (dataKeys.length) {
         // Object containing the data attribute options.
         var dataOptions = {};
+        var flattenedOptions = ['locale'];
         for (i = 0, l = dataKeys.length; i < l; i++) {
             var name = dataKeys[i].replace(/^abs([A-Z])/, matchToLowerCase).replace(/([A-Z])/g, '-$1').toLowerCase();
+            var keys = name.split('-');
+
+            // Certain options should be flattened to a single object
+            // and not fully expanded (such as Locale).
+            if (keys[0] && keys.length > 1 && flattenedOptions.indexOf(keys[0]) !== -1) {
+                var newKeys = [keys.shift()];
+                var property = '';
+                // Combine the remaining keys as a single property.
+                for (var ii = 0; ii < keys.length; ii++) {
+                    property += (ii === 0 ? keys[ii] : keys[ii].charAt(0).toUpperCase() + keys[ii].slice(1));
+                }
+                newKeys.push(property);
+                keys = newKeys;
+            }
             this.log(this.LOG_DEBUG, 'Processing data attribute "data-abs-' + name + '":', data[dataKeys[i]]);
-            expandObject(name.split('-'), data[dataKeys[i]], dataOptions);
+            expandObject(keys, data[dataKeys[i]], dataOptions);
         }
         this.options = $.extend(true, {}, this.options, dataOptions);
         this.log(this.LOG_DEBUG, 'Merged in the data attribute options: ', dataOptions, this.options);
@@ -316,6 +331,12 @@ AjaxBootstrapSelect.prototype.init = function () {
             return;
         }
 		
+        // Don't process if below minimum query length
+        if (query.length < plugin.options.minLength) {
+            plugin.list.setStatus(plugin.t('statusTooShort'));
+            return;
+        }
+
         // Clear out any existing timer.
         clearTimeout(requestDelayTimer);
 
@@ -573,8 +594,25 @@ var AjaxBootstrapSelectList = function (plugin) {
     this.title = null;
     this.selectedTextFormat = plugin.selectpicker.options.selectedTextFormat;
 
+    // Save initial options
+    var initial_options = [];
+    plugin.$element.find('option').each(function() {
+        var $option = $(this);
+        var value = $option.attr('value');
+        initial_options.push({
+            value: value,
+            text: $option.text(),
+            'class': $option.attr('class') || '',
+            data: $option.data() || {},
+            preserved: plugin.options.preserveSelected,
+            selected: !!$option.attr('selected')
+        });
+    });
+    this.cacheSet(/*query=*/'', initial_options);
+
     // Preserve selected options.
     if (plugin.options.preserveSelected) {
+        that.selected = initial_options;
         plugin.$element.on('change.abs.preserveSelected', function (e) {
             var $selected = plugin.$element.find(':selected');
             that.selected = [];
@@ -644,7 +682,7 @@ AjaxBootstrapSelectList.prototype.build = function (data) {
         }
 
         // Set various properties.
-        $option.val(item.value).text(item.text);
+        $option.val(item.value).text(item.text).attr('title', item.text);
         if (item['class'].length) {
             $option.attr('class', item['class']);
         }
@@ -732,7 +770,13 @@ AjaxBootstrapSelectList.prototype.refresh = function (triggerChange) {
     if (!this.plugin.$element.find('option').length && emptyTitle && emptyTitle.length) {
         this.setTitle(emptyTitle);
     }
-    else if (this.title) {
+    else if (
+        this.title ||
+        (
+            this.selectedTextFormat !== 'static' && 
+            this.selectedTextFormat !== this.plugin.selectpicker.options.selectedTextFormat
+        )
+    ) {
         this.restoreTitle();
     }
     this.plugin.selectpicker.refresh();
@@ -1224,6 +1268,14 @@ $.fn.ajaxSelectPicker.defaults = {
         }
     },
 
+	/**
+ 	 * @member $.fn.ajaxSelectPicker.defaults
+	 * @cfg {Number} minLength = 0
+	 * @markdown
+	 * Invoke a request for empty search values.
+	 */
+    minLength: 0,
+
     /**
      * @member $.fn.ajaxSelectPicker.defaults
      * @cfg {String} ajaxSearchUrl
@@ -1296,8 +1348,7 @@ $.fn.ajaxSelectPicker.defaults = {
      *     39: "right",
      *     38: "up",
      *     40: "down",
-     *     91: "meta",
+     *     91: "meta"
-     *     229: "unknown"
      * }
      * ```
      */
@@ -1311,8 +1362,7 @@ $.fn.ajaxSelectPicker.defaults = {
         39: "right",
         38: "up",
         40: "down",
-        91: "meta",
+        91: "meta"
-        229: "unknown"
     },
 
     /**
@@ -1547,7 +1597,15 @@ $.fn.ajaxSelectPicker.locale['en-US'] = {
      * @markdown
      * The text to use in the status container when a request is being initiated.
      */
-    statusSearching: 'Searching...'
+    statusSearching: 'Searching...',
+
+	/**
+     * @member $.fn.ajaxSelectPicker.locale
+     * @cfg {String} statusToShort = 'Please enter more characters'
+     * @markdown
+     * The text used in the status container when the request returns no results.
+     */
+    statusTooShort: 'Please enter more characters'
 };
 $.fn.ajaxSelectPicker.locale.en = $.fn.ajaxSelectPicker.locale['en-US'];
 

RIGS/static/js/alert.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.3.2
+ * Bootstrap: alert.js v3.3.7
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -18,7 +18,7 @@
     $(el).on('click', dismiss, this.close)
   }
 
-  Alert.VERSION = '3.3.2'
+  Alert.VERSION = '3.3.7'
 
   Alert.TRANSITION_DURATION = 150
 
@@ -31,7 +31,7 @@
       selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
     }
 
-    var $parent = $(selector)
+    var $parent = $(selector === '#' ? [] : selector)
 
     if (e) e.preventDefault()
 

RIGS/static/js/button.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: button.js v3.3.2
+ * Bootstrap: button.js v3.3.7
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -19,7 +19,7 @@
     this.isLoading = false
   }
 
-  Button.VERSION  = '3.3.2'
+  Button.VERSION  = '3.3.7'
 
   Button.DEFAULTS = {
     loadingText: 'loading...'
@@ -31,7 +31,7 @@
     var val  = $el.is('input') ? 'val' : 'html'
     var data = $el.data()
 
-    state = state + 'Text'
+    state += 'Text'
 
     if (data.resetText == null) $el.data('resetText', $el[val]())
 
@@ -41,10 +41,10 @@
 
       if (state == 'loadingText') {
         this.isLoading = true
-        $el.addClass(d).attr(d, d)
+        $el.addClass(d).attr(d, d).prop(d, true)
       } else if (this.isLoading) {
         this.isLoading = false
-        $el.removeClass(d).removeAttr(d)
+        $el.removeClass(d).removeAttr(d).prop(d, false)
       }
     }, this), 0)
   }
@@ -56,15 +56,19 @@
     if ($parent.length) {
       var $input = this.$element.find('input')
       if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+        if ($input.prop('checked')) changed = false
-        else $parent.find('.active').removeClass('active')
+        $parent.find('.active').removeClass('active')
+        this.$element.addClass('active')
+      } else if ($input.prop('type') == 'checkbox') {
+        if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false
+        this.$element.toggleClass('active')
       }
-      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
+      $input.prop('checked', this.$element.hasClass('active'))
+      if (changed) $input.trigger('change')
     } else {
       this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
+      this.$element.toggleClass('active')
     }
-
-    if (changed) this.$element.toggleClass('active')
   }
 
 
@@ -104,10 +108,15 @@
 
   $(document)
     .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      var $btn = $(e.target)
+      var $btn = $(e.target).closest('.btn')
-      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
       Plugin.call($btn, 'toggle')
+      if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
+        // Prevent double click on radios, and the double selections (so cancellation) on checkboxes
         e.preventDefault()
+        // The target component still receive the focus
+        if ($btn.is('input,button')) $btn.trigger('focus')
+        else $btn.find('input:visible,button:visible').first().trigger('focus')
+      }
     })
     .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
       $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))

RIGS/static/js/carousel.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.3.2
+ * Bootstrap: carousel.js v3.3.7
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -17,10 +17,10 @@
     this.$element    = $(element)
     this.$indicators = this.$element.find('.carousel-indicators')
     this.options     = options
-    this.paused      =
+    this.paused      = null
-    this.sliding     =
+    this.sliding     = null
-    this.interval    =
+    this.interval    = null
-    this.$active     =
+    this.$active     = null
     this.$items      = null
 
     this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
@@ -30,7 +30,7 @@
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
 
-  Carousel.VERSION  = '3.3.2'
+  Carousel.VERSION  = '3.3.7'
 
   Carousel.TRANSITION_DURATION = 600
 

RIGS/static/js/collapse.js

@@ -1,11 +1,12 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.3.2
+ * Bootstrap: collapse.js v3.3.7
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
+/* jshint latedef: false */
 
 +function ($) {
   'use strict';
@@ -16,7 +17,8 @@
   var Collapse = function (element, options) {
     this.$element      = $(element)
     this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.$trigger      = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
+    this.$trigger      = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
+                           '[data-toggle="collapse"][data-target="#' + element.id + '"]')
     this.transitioning = null
 
     if (this.options.parent) {
@@ -28,13 +30,12 @@
     if (this.options.toggle) this.toggle()
   }
 
-  Collapse.VERSION  = '3.3.2'
+  Collapse.VERSION  = '3.3.7'
 
   Collapse.TRANSITION_DURATION = 350
 
   Collapse.DEFAULTS = {
-    toggle: true,
+    toggle: true
-    trigger: '[data-toggle="collapse"]'
   }
 
   Collapse.prototype.dimension = function () {
@@ -172,7 +173,7 @@
       var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-      if (!data && options.toggle && option == 'show') options.toggle = false
+      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
       if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
@@ -203,7 +204,7 @@
 
     var $target = getTargetFromTrigger($this)
     var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
+    var option  = data ? 'toggle' : $this.data()
 
     Plugin.call($target, option)
   })

RIGS/static/js/dropdown.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.3.2
+ * Bootstrap: dropdown.js v3.3.7
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -19,7 +19,41 @@
     $(element).on('click.bs.dropdown', this.toggle)
   }
 
-  Dropdown.VERSION = '3.3.2'
+  Dropdown.VERSION = '3.3.7'
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+    }
+
+    var $parent = selector && $(selector)
+
+    return $parent && $parent.length ? $parent : $this.parent()
+  }
+
+  function clearMenus(e) {
+    if (e && e.which === 3) return
+    $(backdrop).remove()
+    $(toggle).each(function () {
+      var $this         = $(this)
+      var $parent       = getParent($this)
+      var relatedTarget = { relatedTarget: this }
+
+      if (!$parent.hasClass('open')) return
+
+      if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
+
+      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+
+      if (e.isDefaultPrevented()) return
+
+      $this.attr('aria-expanded', 'false')
+      $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
+    })
+  }
 
   Dropdown.prototype.toggle = function (e) {
     var $this = $(this)
@@ -34,7 +68,10 @@
     if (!isActive) {
       if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
         // if mobile we use a backdrop because click events don't delegate
-        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
+        $(document.createElement('div'))
+          .addClass('dropdown-backdrop')
+          .insertAfter($(this))
+          .on('click', clearMenus)
       }
 
       var relatedTarget = { relatedTarget: this }
@@ -48,7 +85,7 @@
 
       $parent
         .toggleClass('open')
-        .trigger('shown.bs.dropdown', relatedTarget)
+        .trigger($.Event('shown.bs.dropdown', relatedTarget))
     }
 
     return false
@@ -67,13 +104,13 @@
     var $parent  = getParent($this)
     var isActive = $parent.hasClass('open')
 
-    if ((!isActive && e.which != 27) || (isActive && e.which == 27)) {
+    if (!isActive && e.which != 27 || isActive && e.which == 27) {
       if (e.which == 27) $parent.find(toggle).trigger('focus')
       return $this.trigger('click')
     }
 
-    var desc = ' li:not(.divider):visible a'
+    var desc = ' li:not(.disabled):visible a'
-    var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc)
+    var $items = $parent.find('.dropdown-menu' + desc)
 
     if (!$items.length) return
 
@@ -86,38 +123,6 @@
     $items.eq(index).trigger('focus')
   }
 
-  function clearMenus(e) {
-    if (e && e.which === 3) return
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $this         = $(this)
-      var $parent       = getParent($this)
-      var relatedTarget = { relatedTarget: this }
-
-      if (!$parent.hasClass('open')) return
-
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this.attr('aria-expanded', 'false')
-      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
-    })
-  }
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
 
   // DROPDOWN PLUGIN DEFINITION
   // ==========================
@@ -155,7 +160,6 @@
     .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
     .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
     .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-    .on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-    .on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
 
 }(jQuery);

RIGS/static/js/interaction.js

@@ -1,8 +1,8 @@
 function setupItemTable(items_json) {
-  objectitems = JSON.parse(items_json);
+    objectitems = JSON.parse(items_json)
     $.each(objectitems, function (key, val) {
         objectitems[key] = JSON.parse(val);
-  });
+    })
     newitem = -1;
 }
 
@@ -33,7 +33,7 @@ function updatePrices() {
 }
 
 $('#item-table').on('click', '.item-delete', function () {
-  delete objectitems[$(this).data('pk')];
+    delete objectitems[$(this).data('pk')]
     $('#item-' + $(this).data('pk')).remove();
     updatePrices();
 });
@@ -73,8 +73,8 @@ $('body').on('submit', '#item-form', function (e) {
     var fields;
     if (pk == newitem--) {
         // Create the new data structure and add it on.
-    fields = {};
+        fields = new Object();
-    fields['name'] = $('#item_name').val();
+        fields['name'] = $('#item_name').val()
         fields['description'] = $('#item_description').val();
         fields['cost'] = $('#item_cost').val();
         fields['quantity'] = $('#item_quantity').val();
@@ -86,7 +86,7 @@ $('body').on('submit', '#item-form', function (e) {
 
         fields['order'] = order;
 
-    objectitems[pk] = {};
+        objectitems[pk] = new Object();
         objectitems[pk]['fields'] = fields;
 
         // Add the new table
@@ -96,7 +96,7 @@ $('body').on('submit', '#item-form', function (e) {
         // Existing item
         // update data structure
         fields = objectitems[pk].fields;
-    fields.name = $('#item_name').val();
+        fields.name = $('#item_name').val()
         fields.description = $('#item_description').val();
         fields.cost = $('#item_cost').val();
         fields.quantity = $('#item_quantity').val();
@@ -129,7 +129,7 @@ $("#item-table tbody").sortable({
     helper: fixHelper,
     update: function (e, ui) {
         info = $(this).sortable("toArray");
-    itemorder = [];
+        itemorder = new Array();
         $.each(info, function (key, value) {
             pk = $('#' + value).data('pk');
             objectitems[pk].fields.order = key;

RIGS/static/js/modal.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.3.5
+ * Bootstrap: modal.js v3.3.7
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -33,7 +33,7 @@
     }
   }
 
-  Modal.VERSION  = '3.3.5'
+  Modal.VERSION  = '3.3.7'
 
   Modal.TRANSITION_DURATION = 300
   Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -140,7 +140,9 @@
     $(document)
       .off('focusin.bs.modal') // guard against infinite focus loop
       .on('focusin.bs.modal', $.proxy(function (e) {
-        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+        if (document !== e.target &&
+            this.$element[0] !== e.target &&
+            !this.$element.has(e.target).length) {
           this.$element.trigger('focus')
         }
       }, this))

RIGS/static/js/popover.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.3.2
+ * Bootstrap: popover.js v3.3.7
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -19,7 +19,7 @@
 
   if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  Popover.VERSION  = '3.3.2'
+  Popover.VERSION  = '3.3.7'
 
   Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
     placement: 'right',
@@ -75,11 +75,6 @@
     return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
   }
 
-  Popover.prototype.tip = function () {
-    if (!this.$tip) this.$tip = $(this.options.template)
-    return this.$tip
-  }
-
 
   // POPOVER PLUGIN DEFINITION
   // =========================
@@ -90,7 +85,7 @@
       var data    = $this.data('bs.popover')
       var options = typeof option == 'object' && option
 
-      if (!data && option == 'destroy') return
+      if (!data && /destroy|hide/.test(option)) return
       if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
       if (typeof option == 'string') data[option]()
     })

RIGS/static/js/scrollspy.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.3.2
+ * Bootstrap: scrollspy.js v3.3.7
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -14,10 +14,8 @@
   // ==========================
 
   function ScrollSpy(element, options) {
-    var process  = $.proxy(this.process, this)
+    this.$body          = $(document.body)
-
+    this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
-    this.$body          = $('body')
-    this.$scrollElement = $(element).is('body') ? $(window) : $(element)
     this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
     this.selector       = (this.options.target || '') + ' .nav li > a'
     this.offsets        = []
@@ -25,12 +23,12 @@
     this.activeTarget   = null
     this.scrollHeight   = 0
 
-    this.$scrollElement.on('scroll.bs.scrollspy', process)
+    this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
     this.refresh()
     this.process()
   }
 
-  ScrollSpy.VERSION  = '3.3.2'
+  ScrollSpy.VERSION  = '3.3.7'
 
   ScrollSpy.DEFAULTS = {
     offset: 10
@@ -41,19 +39,18 @@
   }
 
   ScrollSpy.prototype.refresh = function () {
+    var that          = this
     var offsetMethod  = 'offset'
     var offsetBase    = 0
 
-    if (!$.isWindow(this.$scrollElement[0])) {
-      offsetMethod = 'position'
-      offsetBase   = this.$scrollElement.scrollTop()
-    }
-
     this.offsets      = []
     this.targets      = []
     this.scrollHeight = this.getScrollHeight()
 
-    var self     = this
+    if (!$.isWindow(this.$scrollElement[0])) {
+      offsetMethod = 'position'
+      offsetBase   = this.$scrollElement.scrollTop()
+    }
 
     this.$body
       .find(this.selector)
@@ -69,8 +66,8 @@
       })
       .sort(function (a, b) { return a[0] - b[0] })
       .each(function () {
-        self.offsets.push(this[0])
+        that.offsets.push(this[0])
-        self.targets.push(this[1])
+        that.targets.push(this[1])
       })
   }
 
@@ -99,7 +96,7 @@
     for (i = offsets.length; i--;) {
       activeTarget != targets[i]
         && scrollTop >= offsets[i]
-        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
         && this.activate(targets[i])
     }
   }

RIGS/static/js/tab.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.3.2
+ * Bootstrap: tab.js v3.3.7
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -14,10 +14,12 @@
   // ====================
 
   var Tab = function (element) {
+    // jscs:disable requireDollarBeforejQueryAssignment
     this.element = $(element)
+    // jscs:enable requireDollarBeforejQueryAssignment
   }
 
-  Tab.VERSION = '3.3.2'
+  Tab.VERSION = '3.3.7'
 
   Tab.TRANSITION_DURATION = 150
 
@@ -65,7 +67,7 @@
     var $active    = container.find('> .active')
     var transition = callback
       && $.support.transition
-      && (($active.length && $active.hasClass('fade')) || !!container.find('> .fade').length)
+      && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
 
     function next() {
       $active
@@ -88,7 +90,7 @@
         element.removeClass('fade')
       }
 
-      if (element.parent('.dropdown-menu')) {
+      if (element.parent('.dropdown-menu').length) {
         element
           .closest('li.dropdown')
             .addClass('active')

RIGS/static/js/tooltip.js

@@ -1,9 +1,9 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.3.2
+ * Bootstrap: tooltip.js v3.3.7
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
@@ -15,17 +15,18 @@
   // ===============================
 
   var Tooltip = function (element, options) {
-    this.type       =
+    this.type       = null
-    this.options    =
+    this.options    = null
-    this.enabled    =
+    this.enabled    = null
-    this.timeout    =
+    this.timeout    = null
-    this.hoverState =
+    this.hoverState = null
     this.$element   = null
+    this.inState    = null
 
     this.init('tooltip', element, options)
   }
 
-  Tooltip.VERSION  = '3.3.2'
+  Tooltip.VERSION  = '3.3.7'
 
   Tooltip.TRANSITION_DURATION = 150
 
@@ -50,7 +51,12 @@
     this.type      = type
     this.$element  = $(element)
     this.options   = this.getOptions(options)
-    this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport)
+    this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
+    this.inState   = { click: false, hover: false, focus: false }
+
+    if (this.$element[0] instanceof document.constructor && !this.options.selector) {
+      throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
+    }
 
     var triggers = this.options.trigger.split(' ')
 
@@ -105,16 +111,20 @@
     var self = obj instanceof this.constructor ?
       obj : $(obj.currentTarget).data('bs.' + this.type)
 
-    if (self && self.$tip && self.$tip.is(':visible')) {
-      self.hoverState = 'in'
-      return
-    }
-
     if (!self) {
       self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
       $(obj.currentTarget).data('bs.' + this.type, self)
     }
 
+    if (obj instanceof $.Event) {
+      self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
+    }
+
+    if (self.tip().hasClass('in') || self.hoverState == 'in') {
+      self.hoverState = 'in'
+      return
+    }
+
     clearTimeout(self.timeout)
 
     self.hoverState = 'in'
@@ -126,6 +136,14 @@
     }, self.options.delay.show)
   }
 
+  Tooltip.prototype.isInStateTrue = function () {
+    for (var key in this.inState) {
+      if (this.inState[key]) return true
+    }
+
+    return false
+  }
+
   Tooltip.prototype.leave = function (obj) {
     var self = obj instanceof this.constructor ?
       obj : $(obj.currentTarget).data('bs.' + this.type)
@@ -135,6 +153,12 @@
       $(obj.currentTarget).data('bs.' + this.type, self)
     }
 
+    if (obj instanceof $.Event) {
+      self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
+    }
+
+    if (self.isInStateTrue()) return
+
     clearTimeout(self.timeout)
 
     self.hoverState = 'out'
@@ -181,6 +205,7 @@
         .data('bs.' + this.type, this)
 
       this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+      this.$element.trigger('inserted.bs.' + this.type)
 
       var pos          = this.getPosition()
       var actualWidth  = $tip[0].offsetWidth
@@ -188,13 +213,12 @@
 
       if (autoPlace) {
         var orgPlacement = placement
-        var $container   = this.options.container ? $(this.options.container) : this.$element.parent()
+        var viewportDim = this.getPosition(this.$viewport)
-        var containerDim = this.getPosition($container)
 
-        placement = placement == 'bottom' && pos.bottom + actualHeight > containerDim.bottom ? 'top'    :
+        placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top'    :
-                    placement == 'top'    && pos.top    - actualHeight < containerDim.top    ? 'bottom' :
+                    placement == 'top'    && pos.top    - actualHeight < viewportDim.top    ? 'bottom' :
-                    placement == 'right'  && pos.right  + actualWidth  > containerDim.width  ? 'left'   :
+                    placement == 'right'  && pos.right  + actualWidth  > viewportDim.width  ? 'left'   :
-                    placement == 'left'   && pos.left   - actualWidth  < containerDim.left   ? 'right'  :
+                    placement == 'left'   && pos.left   - actualWidth  < viewportDim.left   ? 'right'  :
                     placement
 
         $tip
@@ -235,8 +259,8 @@
     if (isNaN(marginTop))  marginTop  = 0
     if (isNaN(marginLeft)) marginLeft = 0
 
-    offset.top  = offset.top  + marginTop
+    offset.top  += marginTop
-    offset.left = offset.left + marginLeft
+    offset.left += marginLeft
 
     // $.fn.offset doesn't round pixel values
     // so we use setOffset directly with our own function B-0
@@ -272,10 +296,10 @@
     this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
   }
 
-  Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
+  Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
     this.arrow()
-      .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
+      .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
-      .css(isHorizontal ? 'top' : 'left', '')
+      .css(isVertical ? 'top' : 'left', '')
   }
 
   Tooltip.prototype.setContent = function () {
@@ -288,14 +312,16 @@
 
   Tooltip.prototype.hide = function (callback) {
     var that = this
-    var $tip = this.tip()
+    var $tip = $(this.$tip)
     var e    = $.Event('hide.bs.' + this.type)
 
     function complete() {
       if (that.hoverState != 'in') $tip.detach()
+      if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary.
         that.$element
           .removeAttr('aria-describedby')
           .trigger('hidden.bs.' + that.type)
+      }
       callback && callback()
     }
 
@@ -305,7 +331,7 @@
 
     $tip.removeClass('in')
 
-    $.support.transition && this.$tip.hasClass('fade') ?
+    $.support.transition && $tip.hasClass('fade') ?
       $tip
         .one('bsTransitionEnd', complete)
         .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
@@ -318,7 +344,7 @@
 
   Tooltip.prototype.fixTitle = function () {
     var $e = this.$element
-    if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') {
+    if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') {
       $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
     }
   }
@@ -338,7 +364,10 @@
       // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
       elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
     }
-    var elOffset  = isBody ? { top: 0, left: 0 } : $element.offset()
+    var isSvg = window.SVGElement && el instanceof window.SVGElement
+    // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
+    // See https://github.com/twbs/bootstrap/issues/20280
+    var elOffset  = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
     var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
     var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
 
@@ -373,7 +402,7 @@
       var rightEdgeOffset = pos.left + viewportPadding + actualWidth
       if (leftEdgeOffset < viewportDimensions.left) { // left overflow
         delta.left = viewportDimensions.left - leftEdgeOffset
-      } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow
+      } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
         delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
       }
     }
@@ -399,7 +428,13 @@
   }
 
   Tooltip.prototype.tip = function () {
-    return (this.$tip = this.$tip || $(this.options.template))
+    if (!this.$tip) {
+      this.$tip = $(this.options.template)
+      if (this.$tip.length != 1) {
+        throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!')
+      }
+    }
+    return this.$tip
   }
 
   Tooltip.prototype.arrow = function () {
@@ -428,14 +463,27 @@
       }
     }
 
+    if (e) {
+      self.inState.click = !self.inState.click
+      if (self.isInStateTrue()) self.enter(self)
+      else self.leave(self)
+    } else {
       self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
     }
+  }
 
   Tooltip.prototype.destroy = function () {
     var that = this
     clearTimeout(this.timeout)
     this.hide(function () {
       that.$element.off('.' + that.type).removeData('bs.' + that.type)
+      if (that.$tip) {
+        that.$tip.detach()
+      }
+      that.$tip = null
+      that.$arrow = null
+      that.$viewport = null
+      that.$element = null
     })
   }
 
@@ -449,7 +497,7 @@
       var data    = $this.data('bs.tooltip')
       var options = typeof option == 'object' && option
 
-      if (!data && option == 'destroy') return
+      if (!data && /destroy|hide/.test(option)) return
       if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
       if (typeof option == 'string') data[option]()
     })

RIGS/static/js/transition.js

@@ -1,8 +1,8 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.3.2
+ * Bootstrap: transition.js v3.3.7
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 

RIGS/static/scss/_bootstrap-variables.scss

@@ -6,6 +6,7 @@ $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")
 // Variables
 // --------------------------------------------------
 
+
 //== Colors
 //
 //## Gray and brand colors for use across Bootstrap.
@@ -22,6 +23,7 @@ $brand-info: #5bc0de !default;
 $brand-warning:         #f0ad4e !default;
 $brand-danger:          #d9534f !default;
 
+
 //== Scaffolding
 //
 //## Settings for some of the most global styles.
@@ -36,6 +38,7 @@ $link-color: $brand-primary !default;
 //** Link hover color set via `darken()` function.
 $link-hover-color:      darken($link-color, 15%) !default;
 
+
 //== Typography
 //
 //## Font, line-height, and color for body text, headings, and more.
@@ -68,6 +71,7 @@ $headings-font-weight: 500 !default;
 $headings-line-height:    1.1 !default;
 $headings-color:          inherit !default;
 
+
 //== Iconography
 //
 //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
@@ -79,6 +83,7 @@ $icon-font-name: "glyphicons-halflings-regular" !default;
 //** Element ID within SVG icon file.
 $icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
+
 //== Components
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -112,6 +117,7 @@ $caret-width-base: 4px !default;
 //** Carets increase slightly in size for larger components.
 $caret-width-large:         5px !default;
 
+
 //== Tables
 //
 //## Customizes the `.table` component with basic values, each used across all table variations.
@@ -132,6 +138,7 @@ $table-bg-active: $table-bg-hover !default;
 //** Border color for table and cell borders.
 $table-border-color:            #ddd !default;
 
+
 //== Buttons
 //
 //## For each of Bootstrap's buttons, define text, background and border color.
@@ -164,6 +171,7 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
 
 $btn-link-disabled-color:        $gray-light !default;
 
+
 //== Forms
 //
 //##
@@ -200,6 +208,7 @@ $input-group-addon-bg: $gray-lighter !default;
 //** Border color for textual input addons
 $input-group-addon-border-color: $input-border !default;
 
+
 //== Dropdowns
 //
 //## Dropdown menu container and contents.
@@ -234,6 +243,7 @@ $dropdown-header-color: $gray-light !default;
 //** Deprecated `$dropdown-caret-color` as of v3.1.0
 $dropdown-caret-color:           #000 !default;
 
+
 //-- Z-index master list
 //
 // Warning: Avoid customizing these values. They're used for a bird's eye view
@@ -249,6 +259,7 @@ $zindex-navbar-fixed: 1030 !default;
 $zindex-modal-background:  1040 !default;
 $zindex-modal:             1050 !default;
 
+
 //== Media queries breakpoints
 //
 //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
@@ -287,6 +298,7 @@ $screen-xs-max: ($screen-sm-min - 1) !default;
 $screen-sm-max:              ($screen-md-min - 1) !default;
 $screen-md-max:              ($screen-lg-min - 1) !default;
 
+
 //== Grid system
 //
 //## Define your custom responsive grid.
@@ -301,6 +313,7 @@ $grid-float-breakpoint: $screen-sm-min !default;
 //** Point at which the navbar begins collapsing.
 $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
 
+
 //== Container sizes
 //
 //## Define the maximum width of `.container` for different screen sizes.
@@ -320,6 +333,7 @@ $container-large-desktop: ((1140px + $grid-gutter-width)) !default;
 //** For `$screen-lg-min` and up.
 $container-lg:                 $container-large-desktop !default;
 
+
 //== Navbar
 //
 //##
@@ -355,6 +369,7 @@ $navbar-default-toggle-hover-bg: #ddd !default;
 $navbar-default-toggle-icon-bar-bg:        #888 !default;
 $navbar-default-toggle-border-color:       #ddd !default;
 
+
 // Inverted navbar
 // Reset inverted navbar basics
 $navbar-inverse-color:                      $gray-light !default;
@@ -380,6 +395,7 @@ $navbar-inverse-toggle-hover-bg: #333 !default;
 $navbar-inverse-toggle-icon-bar-bg:         #fff !default;
 $navbar-inverse-toggle-border-color:        #333 !default;
 
+
 //== Navs
 //
 //##
@@ -410,6 +426,7 @@ $nav-pills-border-radius: $border-radius-base !default;
 $nav-pills-active-link-hover-bg:            $component-active-bg !default;
 $nav-pills-active-link-hover-color:         $component-active-color !default;
 
+
 //== Pagination
 //
 //##
@@ -430,6 +447,7 @@ $pagination-disabled-color: $gray-light !default;
 $pagination-disabled-bg:               #fff !default;
 $pagination-disabled-border:           #ddd !default;
 
+
 //== Pager
 //
 //##
@@ -445,6 +463,7 @@ $pager-active-color: $pagination-active-color !default;
 
 $pager-disabled-color:                 $pagination-disabled-color !default;
 
+
 //== Jumbotron
 //
 //##
@@ -455,6 +474,7 @@ $jumbotron-bg: $gray-lighter !default;
 $jumbotron-heading-color:        inherit !default;
 $jumbotron-font-size:            ceil(($font-size-base * 1.5)) !default;
 
+
 //== Form states and alerts
 //
 //## Define colors for form feedback states and, by default, alerts.
@@ -475,6 +495,7 @@ $state-danger-text: #a94442 !default;
 $state-danger-bg:                #f2dede !default;
 $state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
 
+
 //== Tooltips
 //
 //##
@@ -492,6 +513,7 @@ $tooltip-arrow-width: 5px !default;
 //** Tooltip arrow color
 $tooltip-arrow-color:         $tooltip-bg !default;
 
+
 //== Popovers
 //
 //##
@@ -520,6 +542,7 @@ $popover-arrow-outer-color: fade_in($popover-border-color, 0.05) !default;
 //** Popover outer arrow fallback color
 $popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%) !default;
 
+
 //== Labels
 //
 //##
@@ -542,6 +565,7 @@ $label-color: #fff !default;
 //** Default text color of a linked label
 $label-link-hover-color:      #fff !default;
 
+
 //== Modals
 //
 //##
@@ -574,6 +598,7 @@ $modal-lg: 900px !default;
 $modal-md:                    600px !default;
 $modal-sm:                    300px !default;
 
+
 //== Alerts
 //
 //## Define alert colors, border radius, and padding.
@@ -598,6 +623,7 @@ $alert-danger-bg: $state-danger-bg !default;
 $alert-danger-text:           $state-danger-text !default;
 $alert-danger-border:         $state-danger-border !default;
 
+
 //== Progress bars
 //
 //##
@@ -618,6 +644,7 @@ $progress-bar-danger-bg: $brand-danger !default;
 //** Info progress bar color
 $progress-bar-info-bg:        $brand-info !default;
 
+
 //== List group
 //
 //##
@@ -651,6 +678,7 @@ $list-group-link-color: #555 !default;
 $list-group-link-hover-color:   $list-group-link-color !default;
 $list-group-link-heading-color: #333 !default;
 
+
 //== Panels
 //
 //##
@@ -689,6 +717,7 @@ $panel-danger-text: $state-danger-text !default;
 $panel-danger-border:         $state-danger-border !default;
 $panel-danger-heading-bg:     $state-danger-bg !default;
 
+
 //== Thumbnails
 //
 //##
@@ -707,6 +736,7 @@ $thumbnail-caption-color: $text-color !default;
 //** Padding around the thumbnail caption
 $thumbnail-caption-padding:   9px !default;
 
+
 //== Wells
 //
 //##
@@ -714,6 +744,7 @@ $thumbnail-caption-padding: 9px !default;
 $well-bg:                     #f5f5f5 !default;
 $well-border:                 darken($well-bg, 7%) !default;
 
+
 //== Badges
 //
 //##
@@ -732,6 +763,7 @@ $badge-font-weight: bold !default;
 $badge-line-height:           1 !default;
 $badge-border-radius:         10px !default;
 
+
 //== Breadcrumbs
 //
 //##
@@ -747,6 +779,7 @@ $breadcrumb-active-color: $gray-light !default;
 //** Textual separator for between breadcrumb elements
 $breadcrumb-separator:          "/" !default;
 
+
 //== Carousel
 //
 //##
@@ -763,6 +796,7 @@ $carousel-indicator-border-color: #fff !default;
 
 $carousel-caption-color:                      #fff !default;
 
+
 //== Close
 //
 //##
@@ -771,6 +805,7 @@ $close-font-weight: bold !default;
 $close-color:                 #000 !default;
 $close-text-shadow:           0 1px 0 #fff !default;
 
+
 //== Code
 //
 //##
@@ -786,6 +821,7 @@ $pre-color: $gray-dark !default;
 $pre-border-color:            #ccc !default;
 $pre-scrollable-max-height:   340px !default;
 
+
 //== Type
 //
 //##

RIGS/static/scss/email.scss

@@ -0,0 +1,64 @@
+$button_color: #357ebf;
+
+body{
+  margin: 0px;
+}
+
+.main-table{
+  width: 100%;
+  border-collapse: collapse;
+  
+}
+
+.client-header {
+  background-image: url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");
+  background-color: #222;
+  background-repeat: no-repeat;
+  background-position: center;
+  
+  width: 100%;
+
+  margin-bottom: 28px;
+
+  .logos{
+    width: 100%;
+    max-width: 640px;
+  }
+
+  img {
+    height: 110px;
+  }
+}
+
+.content-container{
+  width: 100%;
+
+  .content {
+    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    
+    width: 100%;
+    max-width: 600px;
+    padding: 10px;
+    text-align: left;
+
+    .button-container{
+      width: 100%;
+
+      .button {
+        padding: 6px 12px;
+        background-color: $button_color;
+        border-radius: 4px;
+
+        a {
+          color: #fff;
+          text-decoration: none;
+        }
+        
+      }
+
+    }
+
+  }
+}
+
+

RIGS/static/scss/screen.scss

@@ -6,6 +6,7 @@
 @import "jq-ui-bootstrap/_autocomplete";
 @import "jq-ui-bootstrap/_menu";
 @import "jq-ui-bootstrap/_tooltip";
+
 @import "compass/css3/animation";
 @import "compass/css3/transform";
 
@@ -133,8 +134,7 @@ ins {
       100% {
           @include rotate(-320deg);
           opacity: 0;
-    }
+      };
-  ;
   }
 
   @include keyframes(spinoffPulse) {
@@ -144,7 +144,48 @@ ins {
 
       100% {
           @include rotate(360deg);
-    }
+      };
-  ;
+  }
+}
+
+html.embedded{
+  min-height:100%;
+  display: table;
+  width: 100%;
+
+  body{
+    padding:0;
+    display: table-cell;
+    vertical-align: middle;
+    width:100%;
+    background:none;
+  }
+
+  .embed_container{
+    border:5px solid #e9e9e9;
+    padding:12px 0px;
+    min-height:100%;
+    width:100%;
+  }
+
+  .source{
+    background: url('/static/imgs/pyrigs-avatar.png') no-repeat;
+    background-size: 16px 16px;
+    padding-left: 20px;
+    color: #000;
+  }
+
+  h3{
+    margin-top:10px;
+    margin-bottom:5px;
+  }
+
+  p{
+    margin-bottom:2px;
+    font-size: 11px;
+  }
+
+  .event-mic-photo{
+    max-width: 3em;
   }
 }

RIGS/templates/RIGS/activity_feed.html

@@ -25,7 +25,7 @@
       //     }, 10000);
         moment().twitter();
 
-        });
+})
   $(document).ready(function() {
     $(function () {
         $( "#activity" ).hide();

RIGS/templates/RIGS/activity_feed_data.html

@@ -21,27 +21,25 @@
                       <div class="media-left">
                         {% if version.revision.user %}
                           <a href="{% url 'profile_detail' pk=version.revision.user.pk %}" class="modal-href">
-                                <img class="media-object img-rounded"
+                            <img class="media-object img-rounded" src="{{ version.revision.user.profile_picture}}" />
-                                     src="{{ version.revision.user.profile_picture }}"/>
                           </a>
                         {% endif %}
                       </div>
                       <div class="media-body">
                         <h5>{{ version.revision.user.name }}
-                        <span class="pull-right"><small><span class="date"
+                          <span class="pull-right"><small><span class="date" data-date="{{version.revision.date_created|date:"c"}}"></span></small></span>
-                                                              data-date="{{ version.revision.date_created|date:"c" }}"></span></small></span>
                         </h5>
 
                 {% endif %}
                       <p>
                       <small>
-                        {% if version.old == None %}
+                        {% if version.changes.old == None %}
                           Created
                         {% else %}
                           Changed {% include 'RIGS/version_changes.html' %} in
                         {% endif %}
                           
-                        {% include 'RIGS/object_button.html' with object=version.new %}
+                        {% include 'RIGS/object_button.html' with object=version.changes.new %}
                         {% if version.revision.comment %}
                           ({{ version.revision.comment }})
                         {% endif %}

RIGS/templates/RIGS/activity_table.html

@@ -67,18 +67,16 @@
                         
                             <tr>
                                 <td>{{ version.revision.date_created }}</td>
-                        <td>
+                                <td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.pk|stringformat:"05d" }}</a></td>
-                            <a href="{{ version.new.get_absolute_url }}">{{ version.new|to_class_name }} {{ version.new.pk|stringformat:"05d" }}</a>
+                           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
-                        </td>
-                        <td>{{ version.version.pk }}|{{ version.revision.pk }}</td>
                                 <td>{{ version.revision.user.name }}</td>
                                 <td>
-                            {% if version.old == None %}
+                                  {% if version.changes.old == None %}
-                                {{ version.new|to_class_name }} Created
+                                    {{version.changes.new|to_class_name}} Created
                                   {% else %}
                                     {% include 'RIGS/version_changes.html' %}
                                   {% endif %}                        </td>
-                        <td>{{ version.revision.comment }}</td>
+                                  <td>{{ version.changes.revision.comment }}</td>
                             </tr>
                         
         			{% endfor %}

RIGS/templates/RIGS/admin_associate_merge.html

@@ -3,8 +3,7 @@
 
 {% block content %}
 <form action="" method="post">{% csrf_token %}
-        <p>The following objects will be merged. Please select the 'master' record which you would like to keep. Other
+    <p>The following objects will be merged. Please select the 'master' record which you would like to keep. Other records will have associated events moved to the 'master' copy, and then will be deleted.</p>
-            records will have associated events moved to the 'master' copy, and then will be deleted.</p>
 
     <table>
     {% for form in forms %}

RIGS/templates/RIGS/calendar.html

@@ -29,12 +29,12 @@
                 'agendaWeek':'week',
                 'agendaDay':'day',
                 'month':'month'
-            };
+            }
             viewFromUrl = {
                 'week':'agendaWeek',
                 'day':'agendaDay',
                 'month':'month'
-            };
+            }
 
             $('#calendar').fullCalendar({
                 editable: false,
@@ -69,17 +69,16 @@
                         },
                         success: function(doc) {
                             var events = [];
-                            colours = {
+                            colours = {'Provisional': '#f0ad4e',
-                                'Provisional': '#f0ad4e',
                                 'Confirmed': '#5cb85c' ,
                                 'Booked': '#5cb85c' ,
                                 'Cancelled': 'grey' ,
                                 'non-rig': '#5bc0de'
                             };
                             $(doc).each(function() {
-                                end = $(this).attr('latest');
+                                end = $(this).attr('latest')
                                 if(end.indexOf("T") < 0){ //If latest does not contain a time
-                                    end = moment(end).add(1, 'days'); //End date is non-inclusive, so add a day
+                                   end = moment(end).add(1, 'days') //End date is non-inclusive, so add a day
                                 }
 
                                 thisEvent = {
@@ -88,7 +87,7 @@
                                     'className': 'modal-href',
                                     'title': $(this).attr('title'),
                                     'url': $(this).attr('url')
-                                };
+                                }
                                
                                 if($(this).attr('is_rig')==true || $(this).attr('status') == "Cancelled"){
                                     thisEvent['color'] = colours[$(this).attr('status')];
@@ -139,29 +138,18 @@
                 }
 
 
+
             });
           
             // set some button listeners
 
-            $('#next-button').click(function () {
+            $('#next-button').click(function(){ $('#calendar').fullCalendar('next') });
-                $('#calendar').fullCalendar('next')
+            $('#prev-button').click(function(){ $('#calendar').fullCalendar('prev') });
-            });
+            $('#today-button').click(function(){ $('#calendar').fullCalendar('today') });
-            $('#prev-button').click(function () {
-                $('#calendar').fullCalendar('prev')
-            });
-            $('#today-button').click(function () {
-                $('#calendar').fullCalendar('today')
-            });
 
-            $('#month-button').click(function () {
+            $('#month-button').click(function(){ $('#calendar').fullCalendar('changeView','month') });
-                $('#calendar').fullCalendar('changeView', 'month')
+            $('#week-button').click(function(){ $('#calendar').fullCalendar('changeView','agendaWeek') });
-            });
+            $('#day-button').click(function(){ $('#calendar').fullCalendar('changeView','agendaDay') });
-            $('#week-button').click(function () {
-                $('#calendar').fullCalendar('changeView', 'agendaWeek')
-            });
-            $('#day-button').click(function () {
-                $('#calendar').fullCalendar('changeView', 'agendaDay')
-            });
 
             $('#go-to-date-input').change(function(){
                 if( moment($('#go-to-date-input').val()).isValid() ){
@@ -220,10 +208,8 @@
                 </div>
 
                 <div class="btn-group">
-                    <button type="button" class="btn btn-default" id="prev-button"><span
+                  <button type="button" class="btn btn-default" id="prev-button"><span class="glyphicon glyphicon-chevron-left"></span></button>
-                            class="glyphicon glyphicon-chevron-left"></span></button>
+                  <button type="button" class="btn btn-default" id="next-button"><span class="glyphicon glyphicon-chevron-right"></span></button>
-                    <button type="button" class="btn btn-default" id="next-button"><span
-                            class="glyphicon glyphicon-chevron-right"></span></button>
                 </div>
 
                 <div class="btn-group">

RIGS/templates/RIGS/client_eventdetails.html

@@ -0,0 +1,78 @@
+<div class="row">
+    <div class="col-sm-12 col-md-6 col-lg-5">
+        <div class="panel panel-default">
+            <div class="panel-heading">Contact Details</div>
+            <div class="panel-body">
+                <dl class="dl-horizontal">
+                    <dt>Person</dt>
+                    <dd>
+                        {% if event.person %}
+                            {{ event.person.name }}
+                        {% endif %}
+                    </dd>
+
+                    <dt>Email</dt>
+                    <dd>
+                        <span class="overflow-ellipsis">{{ event.person.email }}</span>
+                    </dd>
+
+                    <dt>Phone Number</dt>
+                    <dd>{{ event.person.phone }}</dd>
+                </dl>
+            </div>
+        </div>
+        {% if event.organisation %}
+            <div class="panel panel-default">
+                <div class="panel-heading">Organisation</div>
+                <div class="panel-body">
+                    <dl class="dl-horizontal">
+                        <dt>Organisation</dt>
+                        <dd>
+                            {{ event.organisation.name }}
+                        </dd>
+
+                        <dt>Phone Number</dt>
+                        <dd>{{ object.organisation.phone }}</dd>
+                    </dl>
+                </div>
+            </div>
+        {% endif %}
+    </div>
+
+    <div class="col-sm-12 col-md-6 col-lg-7">
+        <div class="panel panel-info">
+            <div class="panel-heading">Event Info</div>
+            <div class="panel-body">
+                <dl class="dl-horizontal">
+                    <dt>Event Venue</dt>
+                    <dd>
+                        {% if object.venue %}
+                            <a href="{% url 'venue_detail' object.venue.pk %}" class="modal-href">
+                                {{ object.venue }}
+                            </a>
+                        {% endif %}
+                    </dd>
+
+                    <dt>Status</dt>
+                    <dd>{{ event.get_status_display }}</dd>
+
+                    <dd>&nbsp;</dd>
+
+                    <dt>Access From</dt>
+                    <dd>{{ event.access_at|date:"D d M Y H:i"|default:"" }}</dd>
+
+                    <dt>Event Starts</dt>
+                    <dd>{{ event.start_date|date:"D d M Y" }} {{ event.start_time|date:"H:i" }}</dd>
+
+                    <dt>Event Ends</dt>
+                    <dd>{{ event.end_date|date:"D d M Y" }} {{ event.end_time|date:"H:i" }}</dd>
+
+                    <dd>&nbsp;</dd>
+
+                    <dt>Event Description</dt>
+                    <dd>{{ event.description|linebreaksbr }}</dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+</div>

RIGS/templates/RIGS/event_archive.html

@@ -11,14 +11,11 @@
             <form class="form-inline">
                 <div class="form-group">
                     <label for="start">Start</label>
-                    <input type="date" name="start" id="start" value="{{ request.GET.start }}" placeholder="Start"
+                    <input type="date" name="start" id="start" value="{{ request.GET.start }}" placeholder="Start" class="form-control" />
-                           class="form-control"/>
                 </div>
                 <div class="form-group">
                     <label for="end">End</label>
-                    <input type="date" name="end" id="end"
+                    <input type="date" name="end" id="end" value="{% if request.GET.end %}{{ request.GET.end }}{% else %}{% now "Y-m-d" %}{% endif %}" placeholder="End" class="form-control" />
-                           value="{% if request.GET.end %}{{ request.GET.end }}{% else %}{% now "Y-m-d" %}{% endif %}"
-                           placeholder="End" class="form-control"/>
                 </div>
                 <div class="form-group">
                     <input type="submit" class="btn btn-primary" />

RIGS/templates/RIGS/event_detail.html

@@ -1,6 +1,5 @@
 {% 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 %} |
+{% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
-    {{ object.name }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -12,34 +11,7 @@
             </h1>
     </div>
         <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
+            {% include 'RIGS/event_detail_buttons.html' %}
-                    <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
-                            class="glyphicon glyphicon-edit"></span> <span
-                            class="hidden-xs">Edit</span></a>
-                    {% if event.is_rig %}
-                        <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
-                                class="glyphicon glyphicon-print"></span> <span
-                                class="hidden-xs">Print</span></a>
-                    {% endif %}
-                    <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
-                            class="glyphicon glyphicon-duplicate"></span> <span
-                            class="hidden-xs">Duplicate</span></a>
-                    {% if event.is_rig %}
-                        {% if perms.RIGS.add_invoice %}
-                            <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
-                        {% if event.invoice and event.invoice.is_closed %}
-                            btn-success
-                        {% elif event.invoice %}
-                            btn-warning
-                        {% else %}
-                            btn-danger
-                        {% endif %}
-                        " title="Invoice Rig"><span
-                                    class="glyphicon glyphicon-gbp"></span>
-                                <span class="hidden-xs">Invoice</span></a>
-                        {% endif %}
-                    {% endif %}
-                </div>
         </div>
 
     {% endif %}
@@ -79,8 +51,7 @@
                             <dt>Organisation</dt>
                             <dd>
                                 {% if object.organisation %}
-                                        <a href="{% url 'organisation_detail' object.organisation.pk %}"
+                                    <a href="{% url 'organisation_detail' object.organisation.pk %}" class="modal-href">
-                                           class="modal-href">
                                         {{ object.organisation }}
                                     </a>
                                 {% endif %}
@@ -99,6 +70,39 @@
                     </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 %}col-md-6 col-lg-7{% endif %}">
@@ -159,17 +163,9 @@
                     <dd>
                         {% if object.based_on %}
                             <a href="{% url 'event_detail' pk=object.based_on.pk %}">
-                                    {% if object.based_on.is_rig %}
+                                {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %}
-                                        N{{ object.based_on.pk|stringformat:"05d" }}
+                                    {{ object.based_on.pk }}{% endif %}
-                                    {% else %}
+                                {{ object.based_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %}
-                                        {{ object.based_on.pk }}
-                                    {% endif %}
-                                    
-                                    {{ object.based_on.name }} 
-
-                                    {% if object.based_on.mic %}
-                                        by {{ object.based_on.mic.name }}
-                                    {% endif %}
                             </a>
                         {% endif %}
                     </dd>
@@ -185,43 +181,33 @@
                     {% endif %}
 
                     {% if event.is_rig %}
+                        <dd>&nbsp;</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 not request.is_ajax %}
     <div class="col-sm-12 text-right">
-                <div class="btn-group btn-page">
+        {% include 'RIGS/event_detail_buttons.html' %}
-                    <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
-                            class="glyphicon glyphicon-edit"></span> <span
-                            class="hidden-xs">Edit</span></a>
-                    {% if event.is_rig %}
-                        <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
-                                class="glyphicon glyphicon-print"></span> <span
-                                class="hidden-xs">Print</span></a>
-                    {% endif %}
-                    <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
-                            class="glyphicon glyphicon-duplicate"></span> <span
-                            class="hidden-xs">Duplicate</span></a>
-                    {% if event.is_rig %}
-                        {% if perms.RIGS.add_invoice %}
-                            <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
-                    {% if event.invoice and event.invoice.is_closed %}
-                        btn-success
-                    {% elif event.invoice %}
-                        btn-warning
-                    {% else %}
-                        btn-danger
-                    {% endif %}
-                    " title="Invoice Rig"><span
-                                    class="glyphicon glyphicon-gbp"></span>
-                                <span class="hidden-xs">Invoice</span></a>
-                        {% endif %}
-                    {% endif %}
-                </div>
     </div>
     {% endif %}
     {% if event.is_rig %}
@@ -239,35 +225,7 @@
         </div>
         {% if not request.is_ajax %}
         <div class="col-sm-12 text-right">
-                    <div class="btn-group btn-page">
+            {% include 'RIGS/event_detail_buttons.html' %}
-                        <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
-                                class="glyphicon glyphicon-edit"></span> <span
-                                class="hidden-xs">Edit</span></a>
-                        {% if event.is_rig %}
-                            <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
-                                    class="glyphicon glyphicon-print"></span> <span
-                                    class="hidden-xs">Print</span></a>
-                        {% endif %}
-                        <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default"
-                           title="Duplicate Rig"><span
-                                class="glyphicon glyphicon-duplicate"></span> <span
-                                class="hidden-xs">Duplicate</span></a>
-                        {% if event.is_rig %}
-                            {% if perms.RIGS.add_invoice %}
-                                <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
-                        {% if event.invoice and event.invoice.is_closed %}
-                            btn-success
-                        {% elif event.invoice %}
-                            btn-warning
-                        {% else %}
-                            btn-danger
-                        {% endif %}
-                        " title="Invoice Rig"><span
-                                        class="glyphicon glyphicon-gbp"></span>
-                                    <span class="hidden-xs">Invoice</span></a>
-                            {% endif %}
-                        {% endif %}
-                    </div>
         </div>
         {% endif %}
     {% endif %}

RIGS/templates/RIGS/event_detail_buttons.html

@@ -0,0 +1,54 @@
+<div class="btn-group btn-page">
+    <a href="{% url 'event_update' event.pk %}" class="btn btn-default"><span
+            class="glyphicon glyphicon-edit"></span> <span
+            class="hidden-xs">Edit</span></a>
+    {% if event.is_rig %}
+        <a href="{% url 'event_print' event.pk %}" target="_blank" class="btn btn-default"><span
+                class="glyphicon glyphicon-print"></span> <span
+                class="hidden-xs">Print</span></a>
+    {% endif %}
+    <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
+            class="glyphicon glyphicon-duplicate"></span> <span
+            class="hidden-xs">Duplicate</span></a>
+    {% if event.is_rig %}
+        {% if event.internal %}
+            <a class="btn btn-default item-add modal-href event-authorise-request
+                    {% if event.authorised %}
+                        btn-success
+                    {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
+                        btn-warning
+                    {% elif event.auth_request_to %}
+                        btn-info
+                    {% endif %}
+                    "
+               href="{% url 'event_authorise_request' object.pk %}">
+                <span class="glyphicon glyphicon-send"></span>
+                <span class="hidden-xs">
+                    {% if event.authorised %}
+                        Authorised
+                    {% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
+                        Authorisation Issue
+                    {% elif event.auth_request_to %}
+                        Awaiting Authorisation
+                    {% else %}
+                        Request Authorisation
+                    {% endif %}
+                </span>
+            </a>
+        {% endif %}
+
+        {% if perms.RIGS.add_invoice %}
+            <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
+                        {% if event.invoice and event.invoice.is_closed %}
+                            btn-success
+                        {% elif event.invoice %}
+                            btn-warning
+                        {% else %}
+                            btn-danger
+                        {% endif %}
+                        " title="Invoice Rig"><span
+                    class="glyphicon glyphicon-gbp"></span>
+                <span class="hidden-xs">Invoice</span></a>
+        {% endif %}
+    {% endif %}
+</div>

RIGS/templates/RIGS/event_embed.html

@@ -0,0 +1,106 @@
+{% extends 'base_embed.html' %}
+{% load static from staticfiles %}
+
+{% block content %}
+
+<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> 
+        </a>
+    </div>
+
+    <div class="col-sm-12">
+       <span class="pull-right">
+            {% if object.mic %}
+                <div class="text-center">
+                    <img src="{{ object.mic.profile_picture }}" class="event-mic-photo img-rounded"/>
+                </div>
+            {% elif object.is_rig %}
+                <span class="glyphicon glyphicon-exclamation-sign"></span>
+            {% endif %}
+        </span>
+        
+        <h3>
+            <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 %}
+                <small>at {{ object.venue }}</small>
+                {% endif %}
+        <br/><small>
+            {{ object.start_date|date:"D d/m/Y" }}
+            {% if object.has_start_time %}
+                {{ object.start_time|date:"H:i" }}
+            {% endif %}
+            {% if object.end_date or object.has_end_time %}
+                &ndash;
+            {% endif %}
+            {% if object.end_date and object.end_date != object.start_date %}
+                 {{ object.end_date|date:"D d/m/Y"  }}
+            {% endif %}
+            {% if object.has_end_time %}
+                {{ object.end_time|date:"H:i" }}
+            {% endif %}
+            </small>
+        </h3>
+
+        <div class="row">
+            <div class="col-xs-6">
+                <p>
+                    <strong>Status:</strong>
+                    {{ object.get_status_display }}
+                </p>
+                <p>
+                    {% if object.is_rig %}
+                        <strong>Client:</strong> {{ object.person.name }}
+                        {% if object.organisation %}
+                        for {{ object.organisation.name }}
+                        {% endif %}
+                        {% if object.dry_hire %}(Dry Hire){% endif %}
+                    {% else %}
+                        <strong>Non-Rig</strong>
+                    {% endif %}
+                </p>
+                <p>
+                    <strong>MIC:</strong>
+                    {% if object.mic %}
+                        {{object.mic.name}}
+                    {% else %}
+                        None
+                    {% endif %}
+                </p>
+            </div>
+            <div class="col-xs-6">
+                
+                {% if object.meet_at %}
+                    <p>
+                        <strong>Crew meet:</strong>
+                        {{ object.meet_at|date:"H:i" }} {{ object.meet_at|date:"(Y-m-d)" }}
+                    </p>
+                {% endif %}
+                {% if object.access_at %}
+                    <p>
+                        <strong>Access at:</strong>
+                        {{ object.access_at|date:"H:i" }} {{ object.access_at|date:"(Y-m-d)" }}
+                    </p>
+                {% endif %}
+                <p>
+                    <strong>Last updated:</strong>
+                    {{ object.last_edited_at }} by "{{ object.last_edited_by.initials }}"
+                </p>
+            </div>
+        </div>
+        {% if object.description %}
+            <p>
+            <strong>Description: </strong>
+            {{ object.description|linebreaksbr }}
+            </p>
+        {% endif %}
+            
+        </table>
+    </div>
+</div>
+
+
+{% endblock %}

RIGS/templates/RIGS/event_form.html

@@ -79,7 +79,6 @@
                 input.setAttribute('value', notADateValue); 
                 return !(input.value === notADateValue);
             }
-
             if(supportsDate()){
                 //Good, we'll use the browser implementation
             }else{
@@ -170,20 +169,16 @@
         <div class="panel panel-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
             <div class="panel-heading">Contact Details</div>
             <div class="panel-body">
-                    <div class="form-group" data-toggle="tooltip"
+                <div class="form-group" data-toggle="tooltip" title="The main contact for the event, can be left blank if purely an organisation">
-                         title="The main contact for the event, can be left blank if purely an organisation">
                     <label for="{{ form.person.id_for_label }}"
                            class="col-sm-4 control-label">{{ form.person.label }}</label>
 
                     <div class="col-sm-8">
                         <div class="row">
                             <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}"
+                                <select id="{{ form.person.id_for_label }}" name="{{ form.person.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='person' %}">
-                                            class="form-control selectpicker" data-live-search="true"
-                                            data-sourceurl="{% url 'api_secure' model='person' %}">
                                     {% if person %}
-                                            <option value="{{ form.person.value }}" selected="selected"
+                                        <option value="{{form.person.value}}" selected="selected" data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
-                                                    data-update_url="{% url 'person_update' form.person.value %}">{{ person }}</option>
                                     {% endif %}
                                 </select>
                             </div>
@@ -193,11 +188,7 @@
                                        data-target="#{{ form.person.id_for_label }}">
                                         <span class="glyphicon glyphicon-plus"></span>
                                     </a>
-                                        <a href="
+                                    <a href="{% if form.person.value %}{% url 'person_update' form.person.value %}{% endif %}" class="btn btn-default modal-href" id="{{ form.person.id_for_label }}-update" data-target="#{{ form.person.id_for_label }}">
-
-                                                {% if form.person.value %}{% url 'person_update' form.person.value %}{% endif %}"
-                                           class="btn btn-default modal-href" id="{{ form.person.id_for_label }}-update"
-                                           data-target="#{{ form.person.id_for_label }}">
                                         <span class="glyphicon glyphicon-pencil"></span>
                                     </a>
                                 </div>
@@ -205,21 +196,16 @@
                         </div>
                     </div>
                 </div>
-                    <div class="form-group" data-toggle="tooltip"
+                <div class="form-group" data-toggle="tooltip" title="The client organisation, leave blank if client is an individual">
-                         title="The client organisation, leave blank if client is an individual">
                     <label for="{{ form.organisation.id_for_label }}"
                            class="col-sm-4 control-label">{{ form.organisation.label }}</label>
 
                     <div class="col-sm-8">
                         <div class="row">
                             <div class="col-sm-9 col-md-7 col-lg-8">
-                                    <select id="{{ form.organisation.id_for_label }}"
+                                <select id="{{ form.organisation.id_for_label }}" name="{{ form.organisation.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" >
-                                            name="{{ form.organisation.name }}" class="form-control selectpicker"
-                                            data-live-search="true"
-                                            data-sourceurl="{% url 'api_secure' model='organisation' %}">
                                     {% if organisation %}
-                                            <option value="{{ form.organisation.value }}" selected="selected"
+                                        <option value="{{form.organisation.value}}" selected="selected" data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
-                                                    data-update_url="{% url 'organisation_update' form.organisation.value %}">{{ organisation }}</option>
                                     {% endif %}
                                 </select>
                             </div>
@@ -229,12 +215,7 @@
                                        data-target="#{{ form.organisation.id_for_label }}">
                                         <span class="glyphicon glyphicon-plus"></span>
                                     </a>
-                                        <a href="
+                                    <a href="{% if form.organisation.value %}{% url 'organisation_update' form.organisation.value %}{% endif %}" class="btn btn-default modal-href" id="{{ form.organisation.id_for_label }}-update" data-target="#{{ form.organisation.id_for_label }}">
-
-                                                {% if form.organisation.value %}{% url 'organisation_update' form.organisation.value %}{% endif %}"
-                                           class="btn btn-default modal-href"
-                                           id="{{ form.organisation.id_for_label }}-update"
-                                           data-target="#{{ form.organisation.id_for_label }}">
                                         <span class="glyphicon glyphicon-pencil"></span>
                                     </a>
                                 </div>
@@ -247,8 +228,7 @@
         <div class="panel panel-default form-hws form-non_rig">
             <div class="panel-heading">Event Description</div>
             <div class="panel-body">
-                    <div class="form-group" data-toggle="tooltip"
+                <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">
-                         title="A short description of the event, shown on rigboard and on paperwork">
                     <label for="{{ form.description.id_for_label }}"
                            class="col-sm-4 control-label">{{ form.description.label }}</label>
 
@@ -267,8 +247,7 @@
             <div class="panel-heading">Event Details</div>
             <div class="panel-body">
                 <div id="form-hws">
-                        <div class="form-group" data-toggle="tooltip"
+                    <div class="form-group" data-toggle="tooltip" title="Name of the event, displays on rigboard and on paperwork">
-                             title="Name of the event, displays on rigboard and on paperwork">
                         <label for="{{ form.name.id_for_label }}"
                                class="col-sm-4 control-label">{{ form.name.label }}</label>
 
@@ -276,20 +255,16 @@
                             {% render_field form.name class+="form-control" %}
                         </div>
                     </div>
-                        <div class="form-group" data-toggle="tooltip"
+                    <div class="form-group" data-toggle="tooltip" title="The venue for the rig, leave blank if unknown (e.g. for a dry hire)">
-                             title="The venue for the rig, leave blank if unknown (e.g. for a dry hire)">
                         <label for="{{ form.venue.id_for_label }}"
                                class="col-sm-4 control-label">{{ form.venue.label }}</label>
 
                         <div class="col-sm-8">
                             <div class="row">
                                 <div class="col-sm-9 col-md-7 col-lg-8">
-                                        <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}"
+                                    <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
-                                                class="form-control selectpicker" data-live-search="true"
-                                                data-sourceurl="{% url 'api_secure' model='venue' %}">
                                     {% if venue %}
-                                                <option value="{{ form.venue.value }}" selected="selected"
+                                        <option value="{{form.venue.value}}" selected="selected" data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
-                                                        data-update_url="{% url 'venue_update' form.venue.value %}">{{ venue }}</option>
                                     {% endif %}
                                     </select>
                                 </div>
@@ -299,12 +274,7 @@
                                            data-target="#{{ form.venue.id_for_label }}">
                                             <span class="glyphicon glyphicon-plus"></span>
                                         </a>
-                                            <a href="
+                                        <a href="{% if object.venue %}{% url 'venue_update' object.venue.pk %}{% endif %}" class="btn btn-default modal-href" id="{{ form.venue.id_for_label }}-update" data-target="#{{ form.venue.id_for_label }}">
-
-                                                    {% if object.venue %}{% url 'venue_update' object.venue.pk %}{% endif %}"
-                                               class="btn btn-default modal-href"
-                                               id="{{ form.venue.id_for_label }}-update"
-                                               data-target="#{{ form.venue.id_for_label }}">
                                             <span class="glyphicon glyphicon-pencil"></span>
                                         </a>
                                     </div>
@@ -318,13 +288,11 @@
 
                         <div class="col-sm-8">
                             <div class="row">
-                                    <div class="col-sm-12 col-md-7" data-toggle="tooltip"
+                                <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="Start date for event, required">
-                                         title="Start date for event, required">
+                                    {% render_field form.start_date class+="form-control" %}
-                                        {% render_field form.start_date type="date" class+="form-control" %}
                                 </div>
-                                    <div class="col-sm-12 col-md-5" data-toggle="tooltip"
+                                <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="Start time of event, can be left blank">
-                                         title="Start time of event, can be left blank">
+                                    {% render_field form.start_time class+="form-control" %}
-                                        {% render_field form.start_time type="time" class+="form-control" %}
                                 </div>
                             </div>
                         </div>
@@ -335,13 +303,11 @@
 
                         <div class="col-sm-8">
                             <div class="row">
-                                    <div class="col-sm-12 col-md-7" data-toggle="tooltip"
+                                <div class="col-sm-12 col-md-7" data-toggle="tooltip" title="End date of event, leave blank if unknown or same as start date">
-                                         title="End date of event, leave blank if unknown or same as start date">
+                                    {% render_field form.end_date class+="form-control" %}
-                                        {% render_field form.end_date type="date" class+="form-control" %}
                                 </div>
-                                    <div class="col-sm-12 col-md-5" data-toggle="tooltip"
+                                <div class="col-sm-12 col-md-5" data-toggle="tooltip" title="End time of event, leave blank if unknown">
-                                         title="End time of event, leave blank if unknown">
+                                    {% render_field form.end_time class+="form-control" %}
-                                        {% render_field form.end_time type="time" class+="form-control" %}
                                 </div>
                             </div>
 
@@ -358,29 +324,26 @@
 
                     {# Rig only information #}
                     <div class="form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
-                            <div class="form-group" data-toggle="tooltip"
+                        <div class="form-group" data-toggle="tooltip" title="The date/time at which TEC have access to the venue">
-                                 title="The date/time at which TEC have access to the venue">
                             <label for="{{ form.access_at.id_for_label }}"
                                    class="col-sm-4 control-label">{{ form.access_at.label }}</label>
 
                             <div class="col-sm-8">
-                                    {% render_field form.access_at type="datetime-local" class+="form-control" %}
+                                {% render_field form.access_at class+="form-control" %}
                             </div>
                         </div>
-                            <div class="form-group" data-toggle="tooltip"
+                        <div class="form-group" data-toggle="tooltip" title="The date/time at which crew should meet for this event">
-                                 title="The date/time at which crew should meet for this event">
                             <label for="{{ form.meet_at.id_for_label }}"
                                    class="col-sm-4 control-label">{{ form.meet_at.label }}</label>
 
                             <div class="col-sm-8">
-                                    {% render_field form.meet_at type="datetime-local" class+="form-control" %}
+                                {% render_field form.meet_at class+="form-control" %}
                             </div>
                         </div>
                         <div class="form-group">
                             <div class="col-sm-offset-4 col-sm-8">
                                 <div class="checkbox">
-                                        <label data-toggle="tooltip"
+                                    <label data-toggle="tooltip" title="Mark this event as a dry-hire, so it needs to be checked in at the end">
-                                               title="Mark this event as a dry-hire, so it needs to be checked in at the end">
                                         {% render_field form.dry_hire %}{{ form.dry_hire.label }}
                                     </label>
                                 </div>
@@ -389,8 +352,7 @@
                     </div>
 
                     {# Status is needed on all events types and it looks good here in the form #}
-                        <div class="form-group" data-toggle="tooltip"
+                    <div class="form-group" data-toggle="tooltip" title="The current status of the event. Only mark as booked once paperwork is received">
-                             title="The current status of the event. Only mark as booked once paperwork is received">
                         <label for="{{ form.status.id_for_label }}"
                                class="col-sm-4 control-label">{{ form.status.label }}</label>
 
@@ -405,39 +367,30 @@
                                    class="col-sm-4 control-label">{{ form.mic.label }}</label>
 
                             <div class="col-sm-8">
-                                    <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}"
+                                <select id="{{ form.mic.id_for_label }}" name="{{ form.mic.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                            class="form-control selectpicker" data-live-search="true"
-                                            data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                     {% if mic %}
-                                            <option value="{{ form.mic.value }}"
+                                        <option value="{{form.mic.value}}" selected="selected" >{{ mic.name }}</option>
-                                                    selected="selected">{{ mic.name }}</option>
                                     {% endif %}
                                 </select>
                             </div>
                         </div>
 
                         {% if object.dry_hire %}
-                                <div class="form-group" data-toggle="tooltip"
+                            <div class="form-group" data-toggle="tooltip" title="The person who checked-in this dry hire">
-                                     title="The person who checked-in this dry hire">
                                 <label for="{{ form.checked_in_by.id_for_label }}"
                                        class="col-sm-4 control-label">{{ form.checked_in_by.label }}</label>
 
                                 <div class="col-sm-8">
-                                        <select id="{{ form.checked_in_by.id_for_label }}"
+                                     <select id="{{ form.checked_in_by.id_for_label }}" name="{{ form.checked_in_by.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
-                                                name="{{ form.checked_in_by.name }}" class="form-control selectpicker"
-                                                data-live-search="true"
-                                                data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
                                         {% if checked_in_by %}
-                                                <option value="{{ form.checked_in_by.value }}"
+                                            <option value="{{form.checked_in_by.value}}" selected="selected" >{{ checked_in_by.name }}</option>
-                                                        selected="selected">{{ checked_in_by.name }}</option>
                                         {% endif %}
                                     </select>
                                 </div>
                             </div>
                         {% endif %}
 
-                            <div class="form-group" data-toggle="tooltip"
+                        <div class="form-group" data-toggle="tooltip" title="The student ID of the client who collected the dry-hire">
-                                 title="The student ID of the client who collected the dry-hire">
                             <label for="{{ form.collector.id_for_label }}"
                                    class="col-sm-4 control-label">{{ form.collector.label }}</label>
 
@@ -445,8 +398,8 @@
                                 {% render_field form.collector class+="form-control" %}
                             </div>
                         </div>
-                            <div class="form-group" data-toggle="tooltip"
+
-                                 title="The purchase order number (for external clients)">
+                        <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
                             <label for="{{ form.purchase_order.id_for_label }}"
                                    class="col-sm-4 control-label">{{ form.purchase_order.label }}</label>
 
@@ -474,8 +427,7 @@
         <div class="panel panel-default form-hws form-is_rig  {% if object.pk and not object.is_rig %}hidden{% endif %}">
             <div class="panel-body">
                 <div class="col-sm-12">
-                        <div class="form-group" data-toggle="tooltip"
+                    <div class="form-group" data-toggle="tooltip" title="Notes on the event. This is only visible to keyholders, and is not displayed on the paperwork">
-                             title="Notes on the event. This is only visible to keyholders, and is not displayed on the paperwork">
                         <label for="{{ form.notes.id_for_label }}">{{ form.notes.label }}</label>
                         {% render_field form.notes class+="form-control" %}
                     </div>

RIGS/templates/RIGS/event_invoice.html

@@ -54,20 +54,22 @@
                         <td><a href="{% url 'event_detail' object.pk %}">N{{ object.pk|stringformat:"05d" }}</a><br>
                             <span class="text-muted">{{ object.get_status_display }}</span></td>
                         <td>{{ object.start_date }}</td>
-                        <td>{{ object.name }}</td>
                         <td>
-                            {% if object.organisation %}
+                            {{ object.name }}
+                            {% if object.is_rig and perms.RIGS.view_event and object.authorised %}
+                                <span class="glyphicon glyphicon-check"></span>
+                            {% endif %}
+                        </td>
+                        <td>
                             {{ object.organisation.name }}
                             <br>
-                                <span class="text-muted">{{ object.organisation.union_account|yesno:'Internal,External' }}</span>
+                            <span class="text-muted">{{ object.internal|yesno:'Internal,External' }}</span>
-                            {% else %}
+                        </td>
-                                {{ object.person.name }}
+                        <td>
-                                <br>
+                            {{ object.sum_total|floatformat:2 }}
-                                <span class="text-muted">External</span>
+                            <br />
-                            {% endif %}
+                            <span class="text-muted">{% if not object.internal %}{{ object.purchase_order }}{% endif %}</span>
-
                         </td>
-                        <td>{{ object.sum_total|floatformat:2 }}</td>
                         <td class="text-center">
                             {% if object.mic %}
                                 {{ object.mic.initials }}<br>
@@ -77,7 +79,9 @@
                             {% endif %}
                         </td>
                         <td class="text-right">
-                            <a href="{% url 'invoice_event' object.pk %}" class="btn btn-default" data-toggle="tooltip"
+                            <a href="{% url 'invoice_event' object.pk %}"
+                               class="btn btn-default"
+                               data-toggle="tooltip"
                                title="'Invoice' this event - click this when paperwork has been sent to treasury">
                                 <span class="glyphicon glyphicon-gbp"></span>
                             </a>

RIGS/templates/RIGS/event_print.xml

@@ -22,22 +22,21 @@
         <paraStyle name="style.Heading2" fontName="OpenSans-Bold" fontSize="10" spaceAfter="2"/>
         <paraStyle name="style.Heading3" fontName="OpenSans" fontSize="10" spaceAfter="0"/>
         <paraStyle name="center" alignment="center"/>
-        <paraStyle name="invoice-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18"
+        <paraStyle name="page-head" alignment="center" fontName="OpenSans-Bold" fontSize="16" leading="18" spaceAfter="0"/>
-                   spaceAfter="0"/>
 
         <paraStyle name="style.event_description" fontName="OpenSans" textColor="DarkGray" />
         <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10" />
         <paraStyle name="style.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
         <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.invoice_titles" fontName="OpenSans-Bold" fontSize="10"/>
+        <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
-        <paraStyle name="style.invoice_numbers" fontName="OpenSans" fontSize="10"/>
+        <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>
              <lineStyle kind="LINEAFTER" colorName="LightGrey" start="0,0" stop="1,0" thickness="1"/> 
         </blockTableStyle>
 
-        <blockTableStyle id="invoiceLayout">
+        <blockTableStyle id="headLayout">
             <blockValign value="top"/>
              
         </blockTableStyle>
@@ -99,16 +98,12 @@
                     <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>
 
                     
+
                     <setFont name="OpenSans" size="10" />
-                {% if not invoice %}
+                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
-                    <drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
-                <drawCenteredString x="302.5" y="38">[Page
-                    <pageNumber/>
-                    of<getName id="lastPage" default="0"/>]
-                </drawCenteredString>
                     <setFont name="OpenSans" size="7" />
-                <drawCenteredString x="302.5" y="26">[Paperwork generated by {{ current_user.name }}
+                    <drawCenteredString x="302.5" y="26">
-                    | {% now "d/m/Y H:i" %} | {{ object.current_version_id }}]
+                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
                     </drawCenteredString>
                 </pageGraphics>
                 
@@ -121,15 +116,10 @@
                     <image file="RIGS/static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
                     
                     <setFont name="OpenSans" size="10"/>
-                {% if not invoice %}
+                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
-                    <drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
-                <drawCenteredString x="302.5" y="38">[Page
-                    <pageNumber/>
-                    of<getName id="lastPage" default="0"/>]
-                </drawCenteredString>
                     <setFont name="OpenSans" size="7" />
-                <drawCenteredString x="302.5" y="26">[Paperwork generated by {{ current_user.name }}
+                    <drawCenteredString x="302.5" y="26">
-                    | {% now "d/m/Y H:i" %} | {{ object.current_version_id }}]
+                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
                     </drawCenteredString>
                 </pageGraphics>
                 <frame id="main" x1="50" y1="65" width="495" height="727"/>

RIGS/templates/RIGS/event_print_page.xml

@@ -1,18 +1,11 @@
 <setNextFrame name="main"/>
 <nextFrame/>
 
-{% if invoice %}
 
-    <blockTable style="invoiceLayout" colWidths="330,165">
+<blockTable style="headLayout" colWidths="330,165">
 <tr>
     <td>
-{% endif %}
+        <h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></h1>
-
-<h1>
-    <b>N{{ object.pk|stringformat:"05d" }}:</b>
-    '{{ object.name }}'
-    <small></small>
-</h1>
 
         <para style="style.event_description">
         <b>{{object.start_date|date:"D jS N Y"}}</b>
@@ -23,46 +16,54 @@
             {{ object.description|default_if_none:""|linebreaksbr }}
                 </para>
         </keepInFrame>
-
-{% if invoice %}
-
     </td>
     <td>
-        <para style="invoice-head">INVOICE</para>
+        {% if invoice %}
+            <para style="page-head">INVOICE</para>
             <spacer length="10"/>
             <blockTable style="eventDetails" colWidths="100,175">
                 <tr>
+                    <td><para style="head_titles">Invoice Number</para></td>
                     <td>
-                    <para style="invoice_titles">Invoice Number</para>
+                        <para style="head_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
-                </td>
-                <td>
-                    <para style="invoice_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
                     </td>
                 </tr>
                 <tr>
+                    <td><para style="head_titles">Invoice Date</para></td>
                     <td>
-                    <para style="invoice_titles">Invoice Date</para>
+                        <para style="head_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
-                </td>
-                <td>
-                    <para style="invoice_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <para style="invoice_titles">PO Number</para>
-                </td>
-                <td>
-                    <para style="invoice_numbers">{{ object.purchase_order|default_if_none:"" }}</para>
                     </td>
                 </tr>
 
+            {% if not object.internal %}
+                <tr>
+                    <td><para style="head_titles">PO</para></td>
+                    <td><para style="head_numbers">{{ object.purchase_order }}</para></td>
+                </tr>
+            {% endif %}
             </blockTable>
+
+        {% elif quote %}
+
+            <para style="page-head">QUOTE</para>
+            <spacer length="10"/>
+            <blockTable style="eventDetails" colWidths="100,175">
+                <tr>
+                    <td><para style="head_titles">Quote Date</para></td>
+                    <td>
+                        <para style="head_numbers">{% now "d/m/Y" %}</para>
                     </td>
                 </tr>
             </blockTable>
 
+        {% elif receipt %}
+
+            <para style="page-head">CONFIRMATION</para>
 
         {% endif %}
+    </td>
+</tr>
+</blockTable>
 
 <spacer length="15"/>
 <blockTable style="eventSpecifics" colWidths="165,165,165">
@@ -117,9 +118,7 @@
                 <h2>Timings</h2>
                 <blockTable style="eventDetails" colWidths="55,75">
                 <tr>
-                <td leftPadding="0" topPadding="0">
+                    <td leftPadding="0" topPadding="0"><h3>Start</h3></td>
-                    <h3>Start</h3>
-                </td>
                     <td>
                         <para style="times">{{ object.start_time|time:"H:i" }}
                             {{ object.start_date|date:"d/m/Y" }}
@@ -127,9 +126,7 @@
                     </td>
                 </tr>
                 <tr>
-                <td leftPadding="0">
+                    <td leftPadding="0"><h3>End</h3></td>
-                    <h3>End</h3>
-                </td>
                     <td>
                         <para style="times">{{ object.end_time|default_if_none:""|time:"H:i" }}
                             {{ object.end_date|date:"d/m/Y" }}
@@ -138,9 +135,7 @@
                 </tr>
                 {% if object.access_at and not invoice%}
                 <tr>
-                    <td leftPadding="0">
+                    <td leftPadding="0"><h3>Access</h3></td>
-                        <h3>Access</h3>
-                    </td>
                     <td>
                         <para style="times">{{ object.access_at|time:"H:i" }}
                             {{ object.access_at|date:"d/m/Y" }}
@@ -205,15 +200,15 @@
 <keepTogether>
     <blockTable style="totalTable" colWidths="300,115,80">
     <tr>
-        <td>{% if not invoice %}VAT Registration Number: 170734807{% endif %}</td>
+        <td>{% if quote %}VAT Registration Number: 170734807{% endif %}</td>
         <td>Total (ex. VAT)</td>
         <td>£ {{ object.sum_total|floatformat:2 }}</td>
     </tr>
     <tr>
         <td>
-            {% if not invoice %}
+            {% if quote %}
                 <para>
-                    <b>The full hire fee is payable at least 10 days before the event.</b>
+                    This quote is valid for 30 days unless otherwise arranged.
                 </para>
             {% endif %}
         </td>
@@ -222,16 +217,16 @@
     </tr>
     <tr>
         <td>
-
+            {% if quote %}
                 <para>
-                {% if invoice %}
+                    <b>The full hire fee is payable at least 10 days before the event.</b>
-                    VAT Registration Number: 170734807
-                {% else %}
-                    <b>This contract is not an invoice.</b>
-                {% endif %}
                 </para>
-
+            {% endif %}
         </td>
+        {% if invoice %}
+            <td>Total</td>
+            <td>£ {{ object.total|floatformat:2 }}</td>
+        {% else %}
             <td>
                 <para>
                     <b>Total</b>
@@ -242,101 +237,120 @@
                     <b>£ {{ object.total|floatformat:2 }}</b>
                 </para>
             </td>
+        {% endif %}
     </tr>
     </blockTable>
 </keepTogether>
-{% if not invoice %}
+
+{% if invoice %}
+    <spacer length="15"/>
     <keepTogether>
-    <blockTable style="infoTable">
+    <h2>Payments</h2>
+    <blockTable style="itemTable" colWidths="300,115,80">
         <tr>
             <td>
+                <para>
+                    <b>Method</b>
+                </para>
+            </td>
+            <td>
+                <para>
+                    <b>Date</b>
+                </para>
+            </td>
+            <td>
+                <para>
+                    <b>Amount</b>
+                </para>
+            </td>
+        </tr>
+        {% for payment in object.invoice.payment_set.all %}
+            <tr>
+                <td>{{ payment.get_method_display }}</td>
+                <td>{{ payment.date }}</td>
+                <td>£ {{ payment.amount|floatformat:2 }}</td>
+            </tr>
+        {% endfor %}
+    </blockTable>
+    <blockTable style="totalTable" colWidths="300,115,80">
+        <tr>
+            <td></td>
+            <td>Payment Total</td>
+            <td>£ {{ object.invoice.payment_total|floatformat:2 }}</td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>
+                <para>
+                    <b>Balance</b> (ex. VAT)
+                </para>
+            </td>
+            <td>
+                <para>
+                    <b>£ {{ object.invoice.balance|floatformat:2 }}</b>
+                </para>
+            </td>
+        </tr>
+    </blockTable>
+    </keepTogether>
+{% endif %}
+
+<keepTogether>
+    <blockTable style="infoTable">>
+    {% if quote %}
+        <tr><td><spacer length="15" /></td></tr>
+        <tr>
+            <td>
+                {% if object.internal %}
                     <para>Bookings will
                         <b>not</b>
-                    be confirmed until payment is received and the contract is signed.
+                        be confirmed until the event is authorised online.
                     </para>
+                {% else %}
+                    <para>Bookings will
+                        <b>not</b>
+                        be confirmed until we have received written confirmation and a Purchase Order.
+                    </para>
+                {% endif %}
             </td>
         </tr>
         <tr>
             <td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
         </tr>
-    </blockTable>
+    {% else %}
-    </keepTogether>
-    <spacer length="15"/>
-    <keepTogether>
-
-    <para style="blockPara">
-        <b>To be signed on booking:</b>
-    </para>
-    {% if object.organisation.union_account %}
-        <para style="blockPara">
-            <i>
-                I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer,
-                or
-                that I have provided written permission from either the President or Treasurer of the hirer stating that
-                I can
-                sign for this invoice.
-            </i>
-        </para>
-        <para style="blockPara">
-            <i>
-                I have read, understood and fully accepted the current conditions of hire. I agree to return any dry
-                hire
-                items to TEC PA &amp; Lighting in the same condition at the end of the hire period.
-            </i>
-        </para>
-
-        <para style="blockPara">
-            <b>
-                Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
-            </b>
-        </para>
-
-        <para style="blockPara">
-            Please return this form directly to TEC PA &amp; Lighting and not the Students' Union Finance Department.
-        </para>
-
-        <blockTable style="signatureTable" colWidths="70,100,325">
         <tr>
-                <td>Account Code</td>
+        <td>
-                <td></td>
+            <para>VAT Registration Number: 170734807</para>
-                <td></td>
+        </td>
+        </tr>
+    {% endif %}
+
+    <tr><td><spacer length="15" /></td></tr>
+
+    <tr>
+        <td>
+            {% if object.internal and object.authorised %}
+                <para>
+                    Event authorised online by {{ object.authorisation.name }} ({{ object.authorisation.email }}) at
+                    {{ object.authorisation.last_edited_at }}.
+                </para>
+
+                <blockTable colWidths="165,165,165">
+                    <tr>
+                        <td><para><b>University ID</b></para></td>
+                        <td><para><b>Account Code</b></para></td>
+                        <td><para><b>Authorised Amount</b></para></td>
+                    </tr>
+                    <tr>
+                        <td>{{ object.authorisation.uni_id }}</td>
+                        <td>{{ object.authorisation.account_code }}</td>
+                        <td>£ {{ object.authorisation.amount|floatformat:2 }}</td>
                     </tr>
                 </blockTable>
-
-    {% else %}
-        <para style="blockPara">
-            <i>
-                I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms
-                a
-                binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire
-                forming
-                an integral part of it.
-            </i>
-        </para>
-
-        <para style="blockPara">
-            <b>
-                Conditions of hire attached and available on the TEC PA &amp; Lighting website. E&amp;OE
-            </b>
-        </para>
-
-        {% include "RIGS/event_print_signature.xml" %}
-        <spacer length="10"/>
-        <para style="blockPara">
-            <b>To be signed on the day of the event/hire:</b>
-        </para>
-        <para style="blockPara">
-            <i>
-                I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry
-                hire
-                items to TEC PA &amp; Lighting in a similar condition at the end of the hire period.
-            </i>
-        </para>
             {% endif %}
-
+        </td>
-    {% include "RIGS/event_print_signature.xml" %}
+    </tr>
+    </blockTable>
 </keepTogether>
-{% endif %}
+
-<namedString id="lastPage">
+<namedString id="lastPage"><pageNumber/></namedString>
-<pageNumber/>
-</namedString>

RIGS/templates/RIGS/event_table.html

@@ -33,13 +33,18 @@
                 </td>
                 <td>
                     <h4>
-                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>{{ event.name }}</a>
+                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>
+                            {{ event.name }}
+                        </a>
                         {% if event.venue %}
                             <small>at {{ event.venue }}</small>
                         {% endif %}
                         {% if event.dry_hire %}
                             <span class="label label-default">Dry Hire</span>
                         {% endif %}
+                        {% if event.is_rig and perms.RIGS.view_event and event.authorised %}
+                            <span class="glyphicon glyphicon-check"></span>
+                        {% endif %}
                     </h4>
                     {% if event.is_rig and not event.cancelled %}
                         <h5>
@@ -69,8 +74,7 @@
                                     {{ event.start_date|date:"(Y-m-d)" }}<br/>
                                 </dd>
                             {% endif %}
-                            {% if event.has_end_time %}
+                            {% if event.has_end_time%}{% if event.start_date != event.end_date or event.start_time != event.end_time %}
-                                {% if event.start_date != event.end_date or event.start_time != event.end_time %}
                                 <dt>Event ends</dt>
                                 <dd>
                                     {{ event.end_time|date:"H:i" }}<br/>

RIGS/templates/RIGS/eventauthorisation_client_request.html

@@ -0,0 +1,41 @@
+{% extends 'base_client_email.html' %}
+
+{% block content %}
+    
+    <p>Hi {{ to_name|default:"there" }},</p>
+
+    <p><b>{{ request.user.get_full_name }}</b> has requested that you authorise <b>N{{ object.pk|stringformat:"05d" }}
+        | {{ object.name }}</b>{% if not to_name %} on behalf of <b>{{ object.person.name }}</b>{% endif %}.</p>
+
+    <p>
+        Please find the link below to complete the event booking process.
+        {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
+            Remember that only Presidents or Treasurers are allowed to sign off payments. You may need to forward
+            this
+            email on.
+        {% endif %}
+    </p>
+
+
+    <table class="button-container" width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td align="center">
+            <table border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td class="button" align="center">
+                  <a href="{{ request.scheme }}://{{ request.get_host }}{% url 'event_authorise' object.pk hmac %}">
+                      Complete Authorisation Form
+                  </a>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+
+
+    <p>Your event will not be booked until you complete this form.</p>
+
+    <p>TEC PA &amp; Lighting<br/>
+
+{% endblock %}

RIGS/templates/RIGS/eventauthorisation_client_request.txt

@@ -0,0 +1,16 @@
+Hi {{ to_name|default:"there" }},
+
+{{ request.user.get_full_name }} has requested that you authorise N{{ object.pk|stringformat:"05d" }}| {{ object.name }}{% if not to_name %} on behalf of {{ object.person.name }}{% endif %}.
+
+            Please find the link below to complete the event booking process.
+            {% if object.event.organisation and object.event.organisation.union_account %}{# internal #}
+                Remember that only Presidents or Treasurers are allowed to sign off payments. You may need to forward
+                this
+                email on.
+            {% endif %}
+
+{{ request.scheme }}://{{ request.get_host }}{% url 'event_authorise' object.pk hmac %}
+
+Please note you event will not be booked until you complete this form.
+
+TEC PA & Lighting

RIGS/templates/RIGS/eventauthorisation_client_success.html

@@ -0,0 +1,21 @@
+{% extends 'base_client_email.html' %}
+
+{% block content %}
+    <p>Hi {{ to_name|default:"there" }},</p>
+
+    <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.last_edited_at }}</b>.
+    </p>
+
+    <p>
+        {% 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.
+            {% else %}{# external #}
+            Your event is now fully booked and our finance department will be contact to arrange payment.
+        {% endif %}
+    </p>
+
+    <p>TEC PA &amp; Lighting</p>
+{% endblock %}

RIGS/templates/RIGS/eventauthorisation_client_success.txt

@@ -0,0 +1,11 @@
+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.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.
+{% else %}{# external #}
+Your event is now fully booked and our finance department will be contact to arrange payment.
+{% endif %}
+
+TEC PA & Lighting

RIGS/templates/RIGS/eventauthorisation_form.html

@@ -0,0 +1,133 @@
+{% extends 'base_client.html' %}
+{% load widget_tweaks %}
+{% load static %}
+
+{% block js %}
+    <script src="{% static "js/tooltip.js" %}"></script>
+    <script>
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip();
+        });
+
+        $('form').on('submit', function () {
+            $('#loading-modal').modal({
+                backdrop: 'static',
+                show: true
+            });
+        });
+    </script>
+{% endblock %}
+
+{% block title %}
+    {% if event.is_rig %}N{{ event.pk|stringformat:"05d" }}{% else %}{{ event.pk }}{% endif %} | {{ event.name }}
+{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-sm-12">
+            <h1>
+                {% if event.is_rig %}N{{ event.pk|stringformat:"05d" }}{% else %}{{ event.pk }}{% endif %}
+                | {{ event.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
+            </h1>
+        </div>
+    </div>
+
+    <div class="row">
+        {% include 'RIGS/client_eventdetails.html' %}
+    </div>
+
+    <div class="row">
+        <div class="col-sm-12">
+            {% with object=event %}
+                {% include 'RIGS/item_table.html' %}
+            {% endwith %}
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="panel panel-default">
+                <div class="panel-heading" id="eventauth">Event Authorisation</div>
+
+                <div class="panel-body">
+                    <form class="form-horizontal itemised_form" role="form" method="POST" action="#eventauth">
+                        {% csrf_token %}
+                        {% include 'form_errors.html' %}
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <p>
+                                    I agree that I am authorised to approve this event. I agree that I am the
+                                    <strong>President/Treasurer or account holder</strong> of the hirer, or that I
+                                    have the written permission of the
+                                    <strong>President/Treasurer or account holder</strong> of the hirer stating that
+                                    I can authorise this event.
+                                </p>
+                            </div>
+
+                            <div class="col-sm-12 col-md-6">
+                                <div class="col-sm-12 form-group" data-toggle="tooltip"
+                                     title="Your name as the person authorising the event.">
+                                    <label for="{{ form.name.id_for_label }}"
+                                           class="col-sm-4 control-label">{{ form.name.label }}</label>
+
+                                    <div class="col-sm-8">
+                                        {% render_field form.name class+="form-control" %}
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-12 form-group" data-toggle="tooltip"
+                                     title="Your Student ID or Staff username as the person authorising the event.">
+                                    <label for="{{ form.uni_id.id_for_label }}"
+                                           class="col-sm-4 control-label">{{ form.uni_id.label }}</label>
+                                    <div class="col-sm-8">
+                                        {% render_field form.uni_id class+="form-control" %}
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-sm-12 col-md-6">
+                                <div class="col-sm-12 form-group" data-toggle="tooltip"
+                                     title="The Students' Union account code you wish this event to be charged to.">
+                                    <label for="{{ form.account_code.id_for_label }}"
+                                           class="col-sm-4 control-label">{{ form.account_code.label }}</label>
+                                    <div class="col-sm-8">
+                                        {% render_field form.account_code class+="form-control" %}
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-12 form-group" data-toggle="tooltip"
+                                     title="The full amount chargable for this event as displayed above, including VAT.">
+                                    <label for="{{ form.amount.id_for_label }}"
+                                           class="col-sm-4 control-label">{{ form.amount.label }}</label>
+                                    <div class="col-sm-8">
+                                        {% render_field form.amount class+="form-control" %}
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="col-sm-12">
+                                <div class="col-sm-12 col-md-8 form-group">
+                                    <div class="col-sm-offset-4 col-sm-8 col-md-offset-3" data-toggle="tooltip"
+                                         title="In order to book an event you must agree to the TEC Terms of Hire.">
+                                        <div class="checkbox">
+                                            <label>
+                                                {% render_field form.tos %} I have read and agree to the TEC
+                                                <a href="{{ tos_url }}">Terms of Hire</a>. E&OE.
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-12 col-md-4 text-right">
+                                    <div class="btn-group">
+                                        <button class="btn btn-primary" type="submit">Authorise</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

RIGS/templates/RIGS/eventauthorisation_mic_success.txt

@@ -0,0 +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.last_edited_at}}.
+
+The TEC Rig Information Gathering System

RIGS/templates/RIGS/eventauthorisation_request.html

@@ -0,0 +1,59 @@
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% load widget_tweaks %}
+
+{% block title %}Request Authorisation{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="alert alert-warning">
+                <h1>Send authorisation request email.</h1>
+                <p>Pressing send will email the address provided. Please triple check everything before continuing.</p>
+            </div>
+
+            <div class="alert alert-info">
+                <dl class="dl-horizontal">
+                    <dt>Person Email</dt>
+                    <dd>{{ object.person.email }}</dd>
+
+                    <dt>Organisation Email</dt>
+                    <dd>{{ object.organisation.email }}</dd>
+                </dl>
+            </div>
+        </div>
+        <div class="col-sm-12 col-md-10 col-md-offset-1">
+            <form action="{{ form.action|default:request.path }}" method="post" class="form-horizontal"
+                  id="auth-request-form">
+                {% csrf_token %}
+
+                <div class="row">
+                    {% include 'form_errors.html' %}
+
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label"
+                               for="{{ form.email.id_for_label }}">{{ form.email.label }}</label>
+
+                        <div class="col-sm-9">
+                            {% render_field form.email type="email" class+="form-control" %}
+                        </div>
+                    </div>
+
+                    <div class="text-right col-sm-3 col-sm-offset-9">
+                        <div class="form-group">
+                            <button type="submit" class="form-control btn btn-primary">
+                                <span class="glyphicon glyphicon-send"></span>
+                                Send
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <script>
+        $('#auth-request-form').on('submit', function () {
+            $('#auth-request-form button').attr('disabled', true);
+        });
+    </script>
+{% endblock %}

RIGS/templates/RIGS/eventauthorisation_request_error.html

@@ -0,0 +1,15 @@
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% load widget_tweaks %}
+
+{% block title %}NottinghamTEC Email Address Required{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="alert alert-warning">
+                <h1>An error occured.</h1>
+                <p>Your RIGS account must have an @nottinghamtec.co.uk email address before you can send emails to clients.</p>
+            </div>
+        </div>
+    </div>
+{% endblock %}

RIGS/templates/RIGS/eventauthorisation_success.html

@@ -0,0 +1,64 @@
+{% extends 'base_client.html' %}
+{% load widget_tweaks %}
+
+{% block title %}
+    {% if event.is_rig %}N{{ event.pk|stringformat:"05d" }}{% else %}{{ event.pk }}{% endif %} | {{ event.name }}
+{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-sm-12">
+            <h1>
+                {% if event.is_rig %}N{{ event.pk|stringformat:"05d" }}{% else %}{{ event.pk }}{% endif %}
+                | {{ event.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
+            </h1>
+        </div>
+    </div>
+
+    {% include 'RIGS/client_eventdetails.html' %}
+
+    <div class="row">
+        <div class="col-sm-12">
+            {% with object=event %}
+                {% include 'RIGS/item_table.html' %}
+            {% endwith %}
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">Event Authorisation</div>
+
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-sm-12 col-md-6">
+                            <dl class="dl-horizontal">
+                                <dt>Name</dt>
+                                <dd>{{ object.name }}</dd>
+
+                                <dt>Email</dt>
+                                <dd>{{ object.email }}</dd>
+
+                                {% if internal %}
+                                    <dt>University ID</dt>
+                                    <dd>{{ object.uni_id }}</dd>
+                                {% endif %}
+                            </dl>
+                        </div>
+
+                        <div class="col-sm-12 col-md-6">
+                            <dl class="dl-horizontal">
+                                <dt>Account code</dt>
+                                <dd>{{ object.account_code }}</dd>
+
+                                <dt>Authorised amount</dt>
+                                <dd>£ {{ object.amount|floatformat:2 }}</dd>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}

RIGS/templates/RIGS/index.html

@@ -3,19 +3,10 @@
 
 {% block content %}
     <div class="col-sm-12">
-        <h1>R
+        <h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
-            <small>ig</small>
-            I
-            <small>nformation</small>
-            G
-            <small>athering</small>
-            S
-            <small>ystem</small>
-        </h1>
     </div>
     <div class="col-sm-12">
-        <p><h4 class="list-group-item-heading" style="margin:0;">Welcome back {{ user.get_full_name }}, there
+        <p><h4 class="list-group-item-heading" style="margin:0;">Welcome back {{ user.get_full_name }}, there are {{ rig_count }} rigs coming up.</h4>
-        are {{ rig_count }} rigs coming up.</h4>
         </p>
     </div>
     <div class="row">
@@ -26,21 +17,17 @@
                  <h4 class="list-group-item-heading">Quick Links</h4>
             </div>
             <div class="list-group">
-                    <a class="list-group-item" href="{% url 'rigboard' %}"><span
+                    <a class="list-group-item" href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span> Rigboard</a>
-                            class="glyphicon glyphicon-list"></span> Rigboard</a>
+                    <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span> Calendar</a>
-                    <a class="list-group-item" href="{% url 'web_calendar' %}"><span
+                    {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span> New Event</a>{% endif %}
-                            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 %}
 
                     <div class="list-group-item default"></div>
 
-                    <a class="list-group-item" href="//members.nottinghamtec.co.uk/forum" target="_blank"><span
+                    <a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Forum</a>
-                            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>
-                    <a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span
+                    <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>
-                            class="glyphicon glyphicon-link"></span> TEC Wiki</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="//members.nottinghamtec.co.uk/price" target="_blank"><span
+                    <a class="list-group-item" href="https://form.jotformeu.com/62203600438344" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
-                            class="glyphicon glyphicon-link"></span> Price List</a>
                 
             </div>
         </div>
@@ -55,8 +42,7 @@
                         <div class="input-group">
                             <input type="search" name="q" class="form-control" placeholder="Search People" />
                             <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span
+                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-                                        class="glyphicon glyphicon-search"></span></button>
                             </span>
                         </div>
                     </form>
@@ -66,8 +52,7 @@
                         <div class="input-group">
                             <input type="search" name="q" class="form-control" placeholder="Search Organisations" />
                             <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span
+                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-                                        class="glyphicon glyphicon-search"></span></button>
                             </span>
                         </div>
                     </form>
@@ -77,8 +62,7 @@
                         <div class="input-group">
                             <input type="search" name="q" class="form-control" placeholder="Search Venues" />
                             <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span
+                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-                                        class="glyphicon glyphicon-search"></span></button>
                             </span>
                         </div>
                     </form>