Merge pull request #277 from nottinghamtec/davidtaylorhq-patch-1

Explicitly define height in oembed JSON

.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

.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>

PyRIGS/decorators.py

@@ -1,15 +1,20 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+
+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 +25,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()))
+                    extra_context = {}
+                    extra_context['oembed_url'] = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], reverse(oembed_view, kwargs=kwargs))
+                    extra_context['login_url'] = "{0}?{1}={2}".format(login_url, REDIRECT_FIELD_NAME, request.get_full_path())
+                    resp = render_to_response('login_redirect.html', extra_context, context_instance=RequestContext(request))
+                    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_to_response('403.html', context_instance=RequestContext(request))
                 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 +57,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_to_response('403.html', context_instance=RequestContext(request))
-            '403.html', context_instance=RequestContext(request))
         error_resp.status_code = 403
 
         if key is None:
@@ -76,5 +78,4 @@ def api_key_required(function):
         if user_object.api_key != key:
             return error_resp
         return function(request, *args, **kwargs)
-
     return wrap

PyRIGS/settings.py

@@ -10,28 +10,22 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get(
+SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get('SECRET_KEY') else 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e'
-    'SECRET_KEY') else 'gxhy(a#5mhp289_=6xx$7jh=eh$ymxg^ymc+di*0c*geiu3p_e'
 
 # 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'))
+STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
-               ) if os.environ.get('STAGING') else False
 
 TEMPLATE_DEBUG = True
 
-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')
@@ -46,6 +40,7 @@ ADMINS = (
     ('Tom Price', 'tomtom5152@gmail.com')
 )
 
+
 # Application definition
 
 INSTALLED_APPS = (
@@ -82,6 +77,7 @@ ROOT_URLCONF = 'PyRIGS.urls'
 
 WSGI_APPLICATION = 'PyRIGS.wsgi.application'
 
+
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 DATABASES = {
@@ -93,7 +89,6 @@ DATABASES = {
 
 if not DEBUG:
     import dj_database_url
-
     DATABASES['default'] = dj_database_url.config()
 
 # Logging 
@@ -151,7 +146,6 @@ RAVEN_CONFIG = {
     # 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
@@ -197,7 +191,7 @@ USE_L10N = True
 
 USE_TZ = True
 
-DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M', '%Y-%m-%dT%H:%M:%S')
+DATETIME_INPUT_FORMATS = ('%Y-%m-%dT%H:%M','%Y-%m-%dT%H:%M:%S')
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.contrib.auth.context_processors.auth",
@@ -210,6 +204,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "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'
@@ -223,6 +218,6 @@ TEMPLATE_DIRS = (
     os.path.join(BASE_DIR,  'templates'),
 )
 
-USE_GRAVATAR = True
+USE_GRAVATAR=True
 
 TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/terms.pdf"

PyRIGS/urls.py

@@ -1,10 +1,10 @@
-from django.conf import settings
 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('',
     # Examples:
@@ -12,14 +12,13 @@ urlpatterns = patterns('',
     # 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()

PyRIGS/wsgi.py

@@ -7,7 +7,6 @@ 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

README.md

@@ -85,6 +85,7 @@ Then load the sample data using the command:
 python manage.py generateSampleData
 ```
 4 user accounts are created for convenience:
+
 |Username |Password |
 |---------|---------|
 |superuser|superuser|

RIGS/admin.py

@@ -1,16 +1,16 @@
-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 _
+import reversion
+
+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
 
 # Register your models here.
 admin.site.register(models.VatRate, reversion.VersionAdmin)
@@ -50,8 +50,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 +58,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 +79,6 @@ class AssociateAdmin(reversion.VersionAdmin):
         else:  # Present the confirmation screen
 
             class TempForm(ModelForm):
-
                 class Meta:
                     model = queryset.model
                     fields = self.merge_fields
@@ -112,22 +106,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/finance.py

@@ -4,13 +4,13 @@ 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
@@ -30,8 +30,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\", " \
@@ -79,8 +78,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 | %s.pdf" % (invoice.pk, escapedEventName)
-            'Content-Disposition'] = "filename=Invoice %05d | %s.pdf" % (invoice.pk, escapedEventName)
         response.write(pdfData)
         return response
 
@@ -94,9 +92,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):
     model = models.Invoice
@@ -104,27 +100,20 @@ 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):
         return self.request.POST.get('next')
 
-
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
     template_name = 'RIGS/invoice_list_archive.html'
@@ -133,7 +122,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,10 +141,8 @@ 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(end_date__lte=datetime.date.today())
             ) & Q(invoice__isnull=True) # Has not already been invoiced
             & Q(is_rig=True) # Is a rig (not non-rig)
             
@@ -178,8 +165,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,10 +174,8 @@ 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(
+        if invoicepk == None:
-                'invoice', None))
-        if invoicepk is None:
             raise Http404()
         invoice = get_object_or_404(models.Invoice, pk=invoicepk)
         initial.update({'invoice': invoice})

RIGS/forms.py

@@ -1,12 +1,12 @@
 __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
 
@@ -17,22 +17,14 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
 
     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 +45,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") + 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 +89,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
 

RIGS/ical.py

@@ -1,18 +1,17 @@
-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, pytz
-
 
 class CalendarICS(ICalFeed):
     """
     A simple event calender
     """
-    # Metadata which is passed on to clients
+    #Metadata which is passed on to clients
     product_id = 'RIGS'
     title = 'RIGS Calendar'
     timezone = settings.TIME_ZONE
@@ -28,32 +27,28 @@ class CalendarICS(ICalFeed):
     def get_object(self, request, *args, **kwargs):
         params = {}
 
-        params['dry-hire'] = request.GET.get('dry-hire', 'true') == 'true'
+        params['dry-hire'] = request.GET.get('dry-hire','true') == 'true'
-        params['non-rig'] = request.GET.get('non-rig', 'true') == 'true'
+        params['non-rig'] = request.GET.get('non-rig','true') == 'true'
-        params['rig'] = request.GET.get('rig', 'true') == 'true'
+        params['rig'] = request.GET.get('rig','true') == 'true'
 
-        params['cancelled'] = request.GET.get('cancelled', 'false') == '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'
-        params['confirmed'] = request.GET.get('confirmed', 'true') == 'true'
 
         return params
 
-    def description(self, 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
 
     def items(self, params):
-        # include events from up to 1 year ago
+        #include events from up to 1 year ago
         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 +59,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 = ''
@@ -98,7 +89,7 @@ class CalendarICS(ICalFeed):
         title += item.name
         
         # Add the status
-        title += ' (' + str(item.get_status_display()) + ')'
+        title += ' ('+str(item.get_status_display())+')'
 
         return title
 
@@ -106,13 +97,12 @@ class CalendarICS(ICalFeed):
         return item.earliest_time
 
     def item_end_datetime(self, item):
-        if isinstance(
+        if type(item.latest_time) is 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
 
-    def item_location(self, item):
+    def item_location(self,item):
         return item.venue
 
     def item_description(self, item):
@@ -121,39 +111,33 @@ class CalendarICS(ICalFeed):
 
         tz = pytz.timezone(self.timezone)
 
-        desc = 'Rig ID = ' + str(item.pk) + '\n'
+        desc = 'Rig ID = '+str(item.pk)+'\n'
         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:
-            desc += 'Event Description:\n' + item.description + '\n\n'
+            desc += 'Event Description:\n'+item.description+'\n\n'
         # 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"
-        desc += 'URL = ' + base_url + str(item.get_absolute_url())
+        desc += 'URL = '+base_url+str(item.get_absolute_url())
         
         return desc
 

RIGS/management/commands/generateSampleData.py

@@ -1,14 +1,12 @@
+from django.core.management.base import BaseCommand, CommandError
+from django.contrib.auth.models import Group, Permission
+from django.db import transaction
+import 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
-
-
 class Command(BaseCommand):
     help = 'Adds sample data to use for testing'
     can_import_settings = True
@@ -21,17 +19,17 @@ class Command(BaseCommand):
     keyholder_group = None
     finance_group = None
 
+
     def handle(self, *args, **options):
         from django.conf import settings
 
         if not (settings.DEBUG or settings.STAGING):
             raise CommandError('You cannot run this command in production')
 
-        random.seed(
+        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')
+            models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
 
             self.setupGenericProfiles()
 
@@ -46,18 +44,7 @@ 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","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"]
-                 "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", "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 +66,7 @@ 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","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"]
-                 "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", "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 +90,7 @@ 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","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"]
-                 "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", "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 +117,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,13 +127,11 @@ 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",
-                                                       email=name.replace(" ", "") + "@example.com",
+                                                        initials="".join([ j[0].upper() for j in name.split() ]))
-                                                       initials="".join([j[0].upper() for j in name.split()]))
             if i % 2 == 0:
                 newProfile.phone = "01234 567894"
 
@@ -195,23 +139,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 +163,16 @@ 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","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"]
-                 "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event", "End of Term Show",
+        descriptions = ["A brief desciption of the event","This event is boring","Probably wont happen","Warning: this has lots of kit"]
-                 "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony",
+        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!"]
-                 "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"]
-        descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen",
-                        "Warning: this has lots of kit"]
-        notes = ["The client came into the office at some point", "Who knows if this will happen",
-                 "Probably should check this event", "Maybe not happening", "Run away!"]
 
-        itemOptions = [
+        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}]
@@ -255,67 +183,66 @@ class Command(BaseCommand):
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
 
-                name = names[i % len(names)]
+                name = names[i%len(names)]
 
                 startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
-                dayDelta = dayDelta + random.randint(0, 3)
+                dayDelta = dayDelta + random.randint(0,3)
 
                 newEvent = models.Event.objects.create(name=name, start_date=startDate)
 
-                if random.randint(0, 2) > 1:  # 1 in 3 have a start time
+                if random.randint(0,2) > 1: # 1 in 3 have a start time
-                    newEvent.start_time = datetime.time(random.randint(15, 20))
+                    newEvent.start_time = datetime.time(random.randint(15,20))
-                    if random.randint(0, 2) > 1:  # of those, 1 in 3 have an end time on the same day
+                    if random.randint(0,2) > 1: # of those, 1 in 3 have an end time on the same day
-                        newEvent.end_time = datetime.time(random.randint(21, 23))
+                        newEvent.end_time = datetime.time(random.randint(21,23))
-                    elif random.randint(0, 1) > 0:  # half of the others finish early the next day
+                    elif random.randint(0,1)>0: # half of the others finish early the next day
                         newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
-                        newEvent.end_time = datetime.time(random.randint(0, 5))
+                        newEvent.end_time = datetime.time(random.randint(0,5))
-                elif random.randint(0, 2) > 1:  # 1 in 3 of the others finish a few days ahead
+                elif random.randint(0,2)>1: # 1 in 3 of the others finish a few days ahead
-                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1, 4))
+                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1,4))
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have MIC
+
+                if random.randint(0,6) > 0: # 5 in 6 have MIC
                     newEvent.mic = random.choice(self.profiles)
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have organisation
+                if random.randint(0,6) > 0: # 5 in 6 have organisation
                     newEvent.organisation = random.choice(self.organisations)
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have person
+                if random.randint(0,6) > 0: # 5 in 6 have person
                     newEvent.person = random.choice(self.people)
 
-                if random.randint(0, 6) > 0:  # 5 in 6 have venue
+                if random.randint(0,6) > 0: # 5 in 6 have venue
                     newEvent.venue = random.choice(self.venues)
 
                 # Could have any status, equally weighted
-                newEvent.status = random.choice(
+                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
+                newEvent.dry_hire = (random.randint(0,7)==0) # 1 in 7 are dry hire
 
-                if random.randint(0, 1) > 0:  # 1 in 2 have description
+                if random.randint(0,1) > 0: # 1 in 2 have description
                     newEvent.description = random.choice(descriptions)
 
-                if random.randint(0, 1) > 0:  # 1 in 2 have notes
+                if random.randint(0,1) > 0: # 1 in 2 have notes
                     newEvent.notes = random.choice(notes)
 
                 newEvent.save()
 
                 # Now add some items
-                for j in range(random.randint(1, 5)):
+                for j in range(random.randint(1,5)):
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    itemData = itemOptions[random.randint(0,len(itemOptions)-1)]
                     newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
                     newItem.save()
 
                 while newEvent.sum_total < 0:
-                    itemData = itemOptions[random.randint(0, len(itemOptions) - 1)]
+                    itemData = itemOptions[random.randint(0,len(itemOptions)-1)]
                     newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
                     newItem.save()
 
             with reversion.create_revision():
                 reversion.set_user(random.choice(self.profiles))
                 if newEvent.start_date < datetime.date.today(): # think about adding an invoice
-                    if random.randint(0, 2) > 0:  # 2 in 3 have had paperwork sent to treasury
+                    if random.randint(0,2) > 0: # 2 in 3 have had paperwork sent to treasury
                         newInvoice = models.Invoice.objects.create(event=newEvent)
                         if newEvent.status is models.Event.CANCELLED: # void cancelled events
                             newInvoice.void = True
-                        elif random.randint(0, 2) > 1:  # 1 in 3 have been paid
+                        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

@@ -5,6 +5,7 @@ from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0002_modelcomment_person'),
     ]

RIGS/migrations/0004_organisation.py

@@ -2,11 +2,11 @@
 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

@@ -5,6 +5,7 @@ from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0004_organisation'),
     ]

RIGS/migrations/0013_auto_20141202_0041.py

@@ -5,6 +5,7 @@ from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0012_auto_20141106_0253'),
     ]

RIGS/migrations/0014_auto_20141208_0220.py

@@ -5,6 +5,7 @@ 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/0019_auto_20150131_1919.py

@@ -5,6 +5,7 @@ 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

@@ -5,6 +5,7 @@ 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

@@ -5,6 +5,7 @@ from django.db import models, migrations
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
         ('RIGS', '0020_auto_20150303_0243'),
     ]

RIGS/migrations/0022_auto_20150424_2104.py

@@ -5,6 +5,7 @@ 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/models.py

@@ -1,11 +1,11 @@
 import datetime
 import hashlib
+import pytz
 import random
 import string
 from collections import Counter
 from decimal import Decimal
 
-import pytz
 import reversion
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
@@ -19,31 +19,22 @@ 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):
         size = 20
         chars = string.ascii_letters + string.digits
         new_api_key = ''.join(random.choice(chars) for x in range(size))
-        return new_api_key
+        return new_api_key;
 
     @property
     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).hexdigest() + "?d=wavatar&s=500"
-                  hashlib.md5(self.email).hexdigest() + "?d=wavatar&s=500"
         return url
 
     @property
@@ -55,8 +46,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
@@ -117,8 +107,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 +118,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 +151,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 +162,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})
@@ -219,8 +205,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 +227,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})
@@ -265,10 +249,7 @@ class EventManager(models.Manager):
                 status=Event.CANCELLED)) |  # Active dry hire
             (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())  # 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')
@@ -276,24 +257,16 @@ class EventManager(models.Manager):
 
     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',
@@ -336,9 +309,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 +325,15 @@ 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,
-        verbose_name='PO')
-    collector = models.CharField(
-        max_length=255,
-        blank=True,
-        null=True,
-        verbose_name='collected by')
 
     # Calculated values
     """
@@ -450,11 +409,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 +419,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:
@@ -499,14 +455,12 @@ class Event(models.Model, RevisionMixin):
 
     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 +489,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):
@@ -604,15 +557,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,6 +1,6 @@
+from RIGS.models import Profile
 from RIGS.forms import ProfileRegistrationFormUniqueEmail
 
-
 def user_created(sender, user, request, **kwargs):
 	form = ProfileRegistrationFormUniqueEmail(request.POST)
 	user.first_name = form.data['first_name']
@@ -9,7 +9,5 @@ def user_created(sender, user, request, **kwargs):
 	user.phone = form.data['phone']
 	user.save()
 
-
 from registration.signals import user_registered
-
 user_registered.connect(user_created)

RIGS/rigboard.py

@@ -1,23 +1,26 @@
+import os
 import cStringIO as StringIO
-import copy
-import datetime
-import re
-import urllib2
 from io import BytesIO
+import urllib2
 
-from PyPDF2 import PdfFileMerger, PdfFileReader
+from django.views import generic
-from django.conf import settings
-from django.contrib import messages
 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.http import HttpResponse
+from django.db.models import Q
+from django.contrib import messages
 from z3c.rml import rml2pdf
+from PyPDF2 import PdfFileMerger, PdfFileReader
+import simplejson
 
 from RIGS import models, forms
+import datetime
+import re
+import copy
 
 __author__ = 'ghost'
 
@@ -33,21 +36,42 @@ class RigboardIndex(generic.TemplateView):
         context['events'] = models.Event.objects.current_events()
         return context
 
-
 class WebCalendar(generic.TemplateView):
     template_name = 'RIGS/calendar.html'
 
     def get_context_data(self, **kwargs):
         context = super(WebCalendar, self).get_context_data(**kwargs)
-        context['view'] = kwargs.get('view', '')
+        context['view'] = kwargs.get('view','')
-        context['date'] = kwargs.get('date', '')
+        context['date'] = kwargs.get('date','')
         return context
 
-
 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,12 +83,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
+
-        # errors but also nice and quick.
+        # Get some other objects to include in the form. Used when there are errors but also nice and quick.
         for field, model in form.related_models.iteritems():
             value = form[field].value()
             if value is not None and value != '':
@@ -85,8 +107,7 @@ 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.iteritems():
             value = form[field].value()
             if value is not None and value != '':
@@ -96,21 +117,17 @@ class EventUpdate(generic.UpdateView):
     def get_success_url(self):
         return reverse_lazy('event_detail', kwargs={'pk': self.object.pk})
 
-
 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
 
-        if self.request.method in (
+        if self.request.method in ('POST', 'PUT'): # This only happens on save (otherwise items won't display in editor)
-            '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
 
@@ -119,7 +136,6 @@ class EventDuplicate(EventUpdate):
         context["duplicate"] = True
         return context
 
-
 class EventPrint(generic.View):
     def get(self, request, pk):
         object = get_object_or_404(models.Event, pk=pk)
@@ -129,6 +145,7 @@ class EventPrint(generic.View):
         merger = PdfFileMerger()
 
         for copy in copies:
+
             context = RequestContext(request, { # this should be outside the loop, but bug in 1.8.2 prevents this
                 'object': object,
                 'fonts': {
@@ -137,12 +154,11 @@ class EventPrint(generic.View):
                         'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
                     }
                 },
-                'copy': copy,
+                'copy':copy,
-                'current_user': request.user,
+                'current_user':request.user,
             })
 
-            # context['copy'] = copy # this is the way to do it once we upgrade
+            # context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3
-            # to Django 1.8.3
 
             rml = template.render(context)
             buffer = StringIO.StringIO()
@@ -163,12 +179,10 @@ 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
 
-
 class EventArchive(generic.ArchiveIndexView):
     model = models.Event
     date_field = "start_date"
@@ -202,9 +216,6 @@ 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

RIGS/static/js/autocompleter.js

@@ -1,37 +1,37 @@
-$(document).ready(function () {
+$(document).ready(function() {
-  clearSelectionLabel = '(no selection)';
+clearSelectionLabel = '(no selection)';
 
-  function changeSelectedValue(obj, pk, text, update_url) { //Pass in JQuery object and new parameters
+function changeSelectedValue(obj,pk,text,update_url) { //Pass in JQuery object and new parameters
     //console.log('Changing selected value');
     obj.find('option').remove();  //Remove all the available options
     obj.append(  //Add the new option
     	$("<option></option>")
-        .attr("value", pk)
+		.attr("value",pk)
 		.text(text)
-        .data('update_url', update_url)
+		.data('update_url',update_url)
 		); 
 	obj.selectpicker('render'); //Re-render the UI
 	obj.selectpicker('refresh'); //Re-render the UI
 	obj.selectpicker('val', pk); //Set the new value to be selected
 	obj.change(); //Trigger the change function manually
-  }
+}
 
-  function refreshUpdateHref(obj) {
+function refreshUpdateHref(obj) {
 	//console.log('Refreshing Update URL');
-    targetObject = $('#' + obj.attr('id') + '-update');
+    targetObject = $('#'+obj.attr('id')+'-update');
 	update_url = $('option:selected', obj).data('update_url');
 
-    if (update_url == "") {  //Probably "clear selection" has been chosen
+	if (update_url=="") {  //Probably "clear selection" has been chosen
 	//	console.log('Trying to disable');
 		targetObject.attr('disabled', true);
 	} else {
 		targetObject.attr('href', update_url);
 		targetObject.attr('disabled', false);
 	}
-  }
+}
 
 
-  $(".selectpicker").each(function () {
+$(".selectpicker").each(function() {
 	
 	var options = {
         ajax: {
@@ -47,27 +47,27 @@ $(document).ready(function () {
         locale: {
             emptyTitle: ''
         },
-      clearOnEmpty: false,
+        clearOnEmpty:false,
         //log: 3,
         preprocessData: function (data) {
             var i, l = data.length, array = [];
             array.push({
                         text: clearSelectionLabel,
                         value: '',
-          data: {
+                        data:{
                         	update_url: '',
-            subtext: ''
+                        	subtext:''
                         }
                     });
 
             if (l) {
-          for (i = 0; i < l; i++) {
+                for(i = 0; i < l; i++){
                     array.push($.extend(true, data[i], {
                         text: data[i]['label'],
                         value: data[i]['pk'],
-              data: {
+                        data:{
                         	update_url: data[i]['update'],
-                subtext: ''
+                        	subtext:''
                         }
                     }));
                 }
@@ -77,27 +77,27 @@ $(document).ready(function () {
     };
     
     $(this).prepend($("<option></option>")
-      .attr("value", '')
+		.attr("value",'')
 		.text(clearSelectionLabel)
-      .data('update_url', ''));  //Add "clear selection" option
+		.data('update_url',''));  //Add "clear selection" option
     	
 
 	$(this).selectpicker().ajaxSelectPicker(options); //Initiaise selectPicker
 
-    $(this).change(function () { //on change, update the edit button href
+	$(this).change(function(){ //on change, update the edit button href
 	//	console.log('Selectbox Changed');
 		refreshUpdateHref($(this));
 	});
 
 	refreshUpdateHref($(this)); //Ensure href is correct at the beginning
 
-  });
+});
 
 //When update/edit modal box submitted
    $('#modal').on('hide.bs.modal', function (e) {
         if (modaltarget != undefined && modalobject != "") {
         	//Update the selector with new values
-      changeSelectedValue($(modaltarget), modalobject[0]['pk'], modalobject[0]['fields']['name'], modalobject[0]['update_url']);
+        	changeSelectedValue($(modaltarget),modalobject[0]['pk'],modalobject[0]['fields']['name'],modalobject[0]['update_url']);
         }
     });
 

RIGS/static/js/interaction.js

@@ -1,17 +1,17 @@
 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;
 }
 
-function nl2br(str, is_xhtml) {
+function nl2br (str, is_xhtml) {
     var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';
-  return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
+    return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ breakTag +'$2');
 }
 
-function escapeHtml(str) {
+function escapeHtml (str) {
     return $('<div/>').text(str).html();
 }
 
@@ -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,17 +86,17 @@ $('body').on('submit', '#item-form', function (e) {
 
         fields['order'] = order;
 
-    objectitems[pk] = {};
+        objectitems[pk] = new Object();
         objectitems[pk]['fields'] = fields;
 
         // Add the new table
         $('#new-item-row').clone().attr('id', 'item-' + pk).data('pk', pk).appendTo('#item-table-body');
-    $('#item-' + pk + ' .item-delete, #item-' + pk + ' .item-edit').data('pk', pk)
+        $('#item-'+pk+' .item-delete, #item-'+pk+' .item-edit').data('pk', pk)
     } else {
         // 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/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.
@@ -207,7 +216,7 @@ $input-group-addon-border-color: $input-border !default;
 //** Background for the dropdown menu.
 $dropdown-bg:                    #fff !default;
 //** Dropdown menu `border-color`.
-$dropdown-border: rgba(0, 0, 0, .15) !default;
+$dropdown-border:                rgba(0,0,0,.15) !default;
 //** Dropdown menu `border-color` **for IE8**.
 $dropdown-fallback-border:       #ccc !default;
 //** Divider color for between dropdown items.
@@ -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
 //
 //##
@@ -501,7 +523,7 @@ $popover-bg: #fff !default;
 //** Popover maximum width
 $popover-max-width:                   276px !default;
 //** Popover border color
-$popover-border-color: rgba(0, 0, 0, .2) !default;
+$popover-border-color:                rgba(0,0,0,.2) !default;
 //** Popover fallback border color
 $popover-fallback-border-color:       #ccc !default;
 
@@ -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
 //
 //##
@@ -557,7 +581,7 @@ $modal-title-line-height: $line-height-base !default;
 //** Background color of modal content area
 $modal-content-bg:                             #fff !default;
 //** Modal content border color
-$modal-content-border-color: rgba(0, 0, 0, .2) !default;
+$modal-content-border-color:                   rgba(0,0,0,.2) !default;
 //** Modal content border color **for IE8**
 $modal-content-fallback-border-color:          #999 !default;
 
@@ -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,11 +779,12 @@ $breadcrumb-active-color: $gray-light !default;
 //** Textual separator for between breadcrumb elements
 $breadcrumb-separator:          "/" !default;
 
+
 //== Carousel
 //
 //##
 
-$carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, .6) !default;
+$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
 
 $carousel-control-color:                      #fff !default;
 $carousel-control-width:                      15% !default;
@@ -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/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";
 
@@ -89,11 +90,11 @@ ins {
   margin: 30px auto 0;
 
   .circle {
-    background-color: rgba(0, 0, 0, 0);
+      background-color: rgba(0,0,0,0);
-    border: 5px solid rgba(0, 183, 229, 0.9);
+      border: 5px solid rgba(0,183,229,0.9);
       opacity: .9;
-    border-right: 5px solid rgba(0, 0, 0, 0);
+      border-right: 5px solid rgba(0,0,0,0);
-    border-left: 5px solid rgba(0, 0, 0, 0);
+      border-left: 5px solid rgba(0,0,0,0);
       border-radius: 50px;
       box-shadow: 0 0 35px #2187e7;
       width: 50px;
@@ -103,11 +104,11 @@ ins {
   }
 
   .circle1 {
-    background-color: rgba(0, 0, 0, 0);
+      background-color: rgba(0,0,0,0);
-    border: 5px solid rgba(0, 183, 229, 0.9);
+      border: 5px solid rgba(0,183,229,0.9);
       opacity: .9;
-    border-left: 5px solid rgba(0, 0, 0, 0);
+      border-left: 5px solid rgba(0,0,0,0);
-    border-right: 5px solid rgba(0, 0, 0, 0);
+      border-right: 5px solid rgba(0,0,0,0);
       border-radius: 50px;
       box-shadow: 0 0 15px #2187e7;
       width: 30px;
@@ -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

@@ -1,14 +1,14 @@
 {% load static %}
 
 {% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
+<script src="{% static "js/tooltip.js" %}"></script>
-    <script src="{% static "js/popover.js" %}"></script>
+<script src="{% static "js/popover.js" %}"></script>
-    <script src="{% static "js/moment.min.js" %}"></script>
+<script src="{% static "js/moment.min.js" %}"></script>
-    <script src="{% static "js/moment-twitter.js" %}"></script>
+<script src="{% static "js/moment-twitter.js" %}"></script>
-    <script>
+<script>
 	$(function () {
-            $('[data-toggle="popover"]').popover().click(function () {
+  $('[data-toggle="popover"]').popover().click(function(){
-                if ($(this).attr('href')) {
+    if($(this).attr('href')){
       window.location.href = $(this).attr('href');
     }
   });
@@ -25,12 +25,12 @@
       //     }, 10000);
         moment().twitter();
 
-        });
+})
-        $(document).ready(function () {
+  $(document).ready(function() {
     $(function () {
-                $("#activity").hide();
+        $( "#activity" ).hide();
-                $("#activity").load("{% url 'activity_feed' %}", function () {
+        $( "#activity" ).load( "{% url 'activity_feed' %}", function() {
-                    $('#activity_loading').slideUp('slow', function () {
+          $('#activity_loading').slideUp('slow',function(){
               $('#activity').slideDown('slow');
           });
 
@@ -45,10 +45,10 @@
         });
     });
   });
-    </script>
+</script>
 {% endblock %}
 
-<div class="panel panel-default">
+    <div class="panel panel-default">
       <div class="panel-heading">
         <h4 class="panel-title">Recent Changes</h4>
       </div>
@@ -62,5 +62,5 @@
         </div>
       </div> 
       
-</div>
+    </div>
 

RIGS/templates/RIGS/activity_feed_data.html

@@ -21,15 +21,13 @@
                       <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 %}

RIGS/templates/RIGS/activity_table.html

@@ -11,8 +11,8 @@
     <script src="{% static "js/moment.min.js" %}"></script>
     <script>
     	$(function () {
-            $('[data-toggle="popover"]').popover().click(function () {
+		  $('[data-toggle="popover"]').popover().click(function(){
-                if ($(this).attr('href')) {
+        if($(this).attr('href')){
           window.location.href = $(this).attr('href');
         }
       });
@@ -42,7 +42,7 @@
 {% endblock %}
 
 {% block content %}
-    <div class="col-sm-12">
+<div class="col-sm-12">
         <div class="row">
             <div class="col-sm-12">
                 <h3>Rigboard Activity Stream</h3>
@@ -67,14 +67,12 @@
                         
                             <tr>
                                 <td>{{ version.revision.date_created }}</td>
-                        <td>
+                                <td><a href="{{ version.new.get_absolute_url }}">{{version.new|to_class_name}} {{ version.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>
                            		<td>{{ version.version.pk }}|{{ version.revision.pk }}</td>
                                 <td>{{ version.revision.user.name }}</td>
                                 <td>
                                   {% if version.old == None %}
-                                {{ version.new|to_class_name }} Created
+                                    {{version.new|to_class_name}} Created
                                   {% else %}
                                     {% include 'RIGS/version_changes.html' %}
                                   {% endif %}                        </td>

RIGS/templates/RIGS/admin_associate_merge.html

@@ -2,16 +2,15 @@
 {% load i18n l10n %}
 
 {% block content %}
-    <form action="" method="post">{% csrf_token %}
+<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 %}
         {% if forloop.first %}
             <tr>
                 <th></th>
-                        <th> ID</th>
+                <th> ID </th>
                 {% for field in form %}
                     <th>{{ field.label }}</th>
                 {% endfor %}
@@ -19,8 +18,8 @@
         {% endif %}     
         
         <tr>
-                    <td><input type="radio" name="master" value="{{ form.instance.pk|unlocalize }}"></td>
+            <td><input type="radio" name="master" value="{{form.instance.pk|unlocalize}}"></td>
-                    <td>{{ form.instance.pk }}</td>
+            <td>{{form.instance.pk}}</td>
             {% for field in form %}
                 <td> {{ field.value }} </td>
             {% endfor %}
@@ -31,11 +30,11 @@
 
     <div>
     {% for obj in queryset %}
-                <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}"/>
+    <input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk|unlocalize }}" />
     {% endfor %}
-            <input type="hidden" name="action" value="merge"/>
+    <input type="hidden" name="action" value="merge" />
-            <input type="hidden" name="post" value="yes"/>
+    <input type="hidden" name="post" value="yes" />
-            <input type="submit" value="Merge them"/>
+    <input type="submit" value="Merge them" />
     </div>
-    </form>
+</form>
 {% endblock %}

RIGS/templates/RIGS/calendar.html

@@ -5,8 +5,8 @@
 {% block title %}Calendar{% endblock %}
 
 {% block css %}
-    <link href="{% static "css/fullcalendar.css" %}" rel='stylesheet'/>
+<link href="{% static "css/fullcalendar.css" %}" rel='stylesheet' />
-    <link href="{% static "css/fullcalendar.print.css" %}" rel='stylesheet' media='print'/>
+<link href="{% static "css/fullcalendar.print.css" %}" rel='stylesheet' media='print' />
 {% endblock %}
 
 {% block js %}
@@ -17,24 +17,24 @@
 
         function getUrlVars() {
             var vars = {};
-            var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
+            var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
             vars[key] = value;
             });
             return vars;
         }
 
-        $(document).ready(function () {
+        $(document).ready(function() {
 
             viewToUrl = {
-                'agendaWeek': 'week',
+                'agendaWeek':'week',
-                'agendaDay': 'day',
+                'agendaDay':'day',
-                'month': 'month'
+                'month':'month'
-            };
+            }
             viewFromUrl = {
-                'week': 'agendaWeek',
+                'week':'agendaWeek',
-                'day': 'agendaDay',
+                'day':'agendaDay',
-                'month': 'month'
+                'month':'month'
-            };
+            }
 
             $('#calendar').fullCalendar({
                 editable: false,
@@ -50,15 +50,15 @@
                         // options apply to agendaWeek and agendaDay views
                     },
                     week: {
-                        columnFormat: 'ddd D/M'
+                        columnFormat:'ddd D/M'
                     },
                     day: {
                         // options apply to basicDay and agendaDay views
                     }
                 },
-                header: false,
+                header:false,
 
-                events: function (start_moment, end_moment, timezone, callback) {
+                events: function(start_moment, end_moment, timezone, callback) {
                     
                     $.ajax({
                         url: '/api/event',
@@ -67,19 +67,18 @@
                             start: moment(start_moment).format("YYYY-MM-DD[T]HH:mm:ss"),
                             end: moment(end_moment).format("YYYY-MM-DD[T]HH:mm:ss")
                         },
-                        success: function (doc) {
+                        success: function(doc) {
                             var events = [];
-                            colours = {
+                            colours = {'Provisional': '#f0ad4e',
-                                'Provisional': '#f0ad4e',
+                                'Confirmed': '#5cb85c' ,
-                                'Confirmed': '#5cb85c',
+                                'Booked': '#5cb85c' ,
-                                'Booked': '#5cb85c',
+                                'Cancelled': 'grey' ,
-                                'Cancelled': 'grey',
                                 'non-rig': '#5bc0de'
                             };
-                            $(doc).each(function () {
+                            $(doc).each(function() {
-                                end = $(this).attr('latest');
+                                end = $(this).attr('latest')
-                                if (end.indexOf("T") < 0) { //If latest does not contain a time
+                                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,11 +87,11 @@
                                     'className': 'modal-href',
                                     'title': $(this).attr('title'),
                                     'url': $(this).attr('url')
-                                };
+                                }
                                
-                                if ($(this).attr('is_rig') == true || $(this).attr('status') == "Cancelled") {
+                                if($(this).attr('is_rig')==true || $(this).attr('status') == "Cancelled"){
                                     thisEvent['color'] = colours[$(this).attr('status')];
-                                } else {
+                                }else{
                                     thisEvent['color'] = colours['non-rig'];
                                 }
                                 
@@ -103,20 +102,20 @@
                     });
                 },
 
-                viewRender: function (view, element) {
+                viewRender: function(view, element){
                     // Set the title of the view
                     $('#calendar-header').text(view.title);
 
                     // Enable/Disable "Today" button as required
-                    if (moment().isBetween(view.intervalStart, view.intervalEnd)) {
+                    if(moment().isBetween(view.intervalStart, view.intervalEnd)){
                         //Today is within the current view
                         $('#today-button').prop('disabled', true);
-                    } else {
+                    }else{
                         $('#today-button').prop('disabled', false);
                     }
 
                     // Set active view select button
-                    switch (view.name) {
+                    switch(view.name){
                         case 'month':
                             $('#month-button').addClass('active');
                             $('#week-button').removeClass('active');
@@ -135,48 +134,37 @@
                             $('#day-button').addClass('active');
                             break;
                     }
-                    history.replaceState(null, null, '{% url 'web_calendar' %}' + viewToUrl[view.name] + '/' + view.intervalStart.format('YYYY-MM-DD') + '/');
+                    history.replaceState(null,null,'{% url 'web_calendar' %}'+viewToUrl[view.name]+'/'+view.intervalStart.format('YYYY-MM-DD')+'/');
                 }
 
 
+
             });
           
             // 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 () {
+            $('#go-to-date-input').change(function(){
-                if (moment($('#go-to-date-input').val()).isValid()) {
+                if( moment($('#go-to-date-input').val()).isValid() ){
                     $('#go-to-date-button').prop('disabled', false);
-                } else {
+                }else{
                     $('#go-to-date-button').prop('disabled', true);
                 }
 
             });
 
-            $('#go-to-date-button').click(function () {
+            $('#go-to-date-button').click(function(){
-                day = moment($('#go-to-date-input').val());
+                day = moment($('#go-to-date-input').val()) ;
-                if (day.isValid()) {
+                if(day.isValid()){
-                    $('#calendar').fullCalendar('gotoDate', day);
+                    $('#calendar').fullCalendar( 'gotoDate', day);
-                } else {
+                }else{
                     alert('Invalid Date');
                 }
             });
@@ -184,12 +172,12 @@
             
             // Go to the initial settings, if they're valid
             view = viewFromUrl['{{view}}'];
-            $('#calendar').fullCalendar('changeView', view);
+            $('#calendar').fullCalendar( 'changeView', view);
 
             day = moment('{{date}}');
-            if (day.isValid()) {
+            if(day.isValid()){
-                $('#calendar').fullCalendar('gotoDate', day);
+                $('#calendar').fullCalendar( 'gotoDate', day);
-            } else {
+            }else{
                 console.log('Supplied date is invalid - using default')
             }
             
@@ -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/event_archive.html

@@ -11,17 +11,14 @@
             <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"/>
+                    <input type="submit" class="btn btn-primary" />
                 </div>
             </form>
         </div>

RIGS/templates/RIGS/event_detail.html

@@ -1,9 +1,8 @@
 {% 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">
+<div class="row">
     {% if not request.is_ajax %}
     <div class="col-sm-12">
             <h1>
@@ -61,13 +60,13 @@
 
                         <dt>Email</dt>
                         <dd>
-                                <a href="mailto:{{ object.person.email }}" target="_blank">
+                            <a href="mailto:{{object.person.email}}" target="_blank">
                                 <span class="overflow-ellipsis">{{ object.person.email }}</span>
                             </a>
                         </dd>
 
                         <dt>Phone Number</dt>
-                            <dd><a href="tel:{{ object.person.phone }}">{{ object.person.phone }}</a></dd>
+                        <dd><a href="tel:{{object.person.phone}}">{{ object.person.phone }}</a></dd>
                     </dl>
                 </div>
             </div>
@@ -79,8 +78,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 %}
@@ -88,7 +86,7 @@
 
                             <dt>Phone Number</dt>
                             <dd>
-                                    <a href="tel:{{ object.person.phone }}">
+                                <a href="tel:{{object.person.phone}}">
                                     {{ object.organisation.phone }}
                                 </a>
                             </dd>
@@ -159,17 +157,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>
@@ -248,8 +238,7 @@
                             class="glyphicon glyphicon-print"></span> <span
                             class="hidden-xs">Print</span></a>
                 {% endif %}
-                        <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default"
+                <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
-                           title="Duplicate Rig"><span
                         class="glyphicon glyphicon-duplicate"></span> <span
                             class="hidden-xs">Duplicate</span></a>
                 {% if event.is_rig %}
@@ -280,7 +269,7 @@
             </div>
         </div>
     {% endif %}
-    </div>
+</div>
 {% endblock %}
 
 {% if request.is_ajax %}

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

@@ -32,12 +32,12 @@
             var id_start = "{{ form.start_date.id_for_label }}";
             var id_end_date = "{{ form.end_date.id_for_label }}";
             var id_end_time = "{{ form.end_time.id_for_label }}";
-            if ($('#' + id_start).val() == $('#' + id_end_date).val()) {
+            if ($('#'+id_start).val() == $('#'+id_end_date).val()) {
-                var end_date = new Date($('#' + id_end_date).val());
+                var end_date = new Date($('#'+id_end_date).val());
                 end_date.setDate(end_date.getDate() + 1);
-                $('#' + id_end_date).val(end_date.getISOString());
+                $('#'+id_end_date).val(end_date.getISOString());
             }
-            $('#' + id_end_time).val('02:00');
+            $('#'+id_end_time).val('02:00');
         }
 
         $(document).ready(function () {
@@ -74,34 +74,33 @@
             function supportsDate() {
                 //return false; //for development
                 var input = document.createElement('input');
-                input.setAttribute('type', 'date');
+                input.setAttribute('type','date');
                 var notADateValue = 'not-a-date';
                 input.setAttribute('value', notADateValue); 
                 return !(input.value === notADateValue);
             }
-
+            if(supportsDate()){
-            if (supportsDate()) {
                 //Good, we'll use the browser implementation
-            } else {
+            }else{
                 //Rubbish browser - do JQuery backup
                 $('<link>')
                   .appendTo('head')
-                        .attr({type: 'text/css', rel: 'stylesheet'})
+                  .attr({type : 'text/css', rel : 'stylesheet'})
                   .attr('href', '{% static "css/bootstrap-datetimepicker.min.css" %}');
                 $.when(
-                        $.getScript("{% static "js/moment.min.js" %}"),
+                    $.getScript( "{% static "js/moment.min.js" %}" ),
-                        $.getScript("{% static "js/bootstrap-datetimepicker.min.js" %}"),
+                    $.getScript( "{% static "js/bootstrap-datetimepicker.min.js" %}" ),
-                        $.Deferred(function (deferred) {
+                    $.Deferred(function( deferred ){
-                            $(deferred.resolve);
+                        $( deferred.resolve );
                     })
-                ).done(function () {
+                ).done(function(){
-                    $('input[type=date]').attr('type', 'text').datetimepicker({
+                    $('input[type=date]').attr('type','text').datetimepicker({
                         format: 'YYYY-MM-DD',
                     });
-                    $('input[type=time]').attr('type', 'text').datetimepicker({
+                    $('input[type=time]').attr('type','text').datetimepicker({
                         format: 'HH:mm',
                     });
-                    $('input[type=datetime-local]').attr('type', 'text').datetimepicker({
+                    $('input[type=datetime-local]').attr('type','text').datetimepicker({
                         format: 'YYYY-MM-DD[T]HH:mm',
                         sideBySide: true,
                     });
@@ -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,12 +288,10 @@
 
                         <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 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 type="time" class+="form-control" %}
                                 </div>
                             </div>
@@ -335,12 +303,10 @@
 
                         <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 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 type="time" class+="form-control" %}
                                 </div>
                             </div>
@@ -358,8 +324,7 @@
 
                     {# 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>
 
@@ -367,8 +332,7 @@
                                 {% render_field form.access_at type="datetime-local" 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>
 
@@ -379,8 +343,7 @@
                         <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,7 @@
                                 {% render_field form.collector class+="form-control" %}
                             </div>
                         </div>
-                            <div class="form-group" data-toggle="tooltip"
+                        <div class="form-group" data-toggle="tooltip" title="The purchase order number (for external clients)">
-                                 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 +426,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

@@ -5,17 +5,17 @@
 {% block title %}Events for Invoice{% endblock %}
 
 {% block js %}
-    <script src="{% static "js/tooltip.js" %}"></script>
+<script src="{% static "js/tooltip.js" %}"></script>
-    <script>
+<script>
     $(function () {
       $('[data-toggle="tooltip"]').tooltip();
     });
-    </script>
+</script>
 {% endblock %}
 
 {% block content %}
     <div class="col-sm-12">
-        <h2>Events for Invoice ({{ count }} Events, £ {{ total|floatformat:2 }})</h2>
+        <h2>Events for Invoice ({{count}} Events, £ {{ total|floatformat:2 }})</h2>
         <p>These events have happened, but paperwork has not yet been sent to treasury</p>
         {% if is_paginated %}
             <div class="col-md-6 col-md-offset-6 col-sm-12 text-right">
@@ -77,8 +77,7 @@
                             {% 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">
-                               title="'Invoice' this event - click this when paperwork has been sent to treasury">
                                 <span class="glyphicon glyphicon-gbp"></span>
                             </a>
                         </td>

RIGS/templates/RIGS/event_print.xml

@@ -16,21 +16,20 @@
             <color id="DarkGray" RGB="#707070"/>
         </initialize>
 
-        <paraStyle name="style.para" fontName="OpenSans"/>
+        <paraStyle name="style.para" fontName="OpenSans" />
         <paraStyle name="blockPara" spaceAfter="5" spaceBefore="5"/>
         <paraStyle name="style.Heading1" fontName="OpenSans" fontSize="16" leading="18" spaceAfter="0"/>
         <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="invoice-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.event_description" fontName="OpenSans" textColor="DarkGray" />
-        <paraStyle name="style.item_description" fontName="OpenSans" textColor="DarkGray" leftIndent="10"/>
+        <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.specific_description" fontName="OpenSans" textColor="DarkGray" fontSize="10" />
-        <paraStyle name="style.times" fontName="OpenSans" fontSize="10"/>
+        <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
-        <paraStyle name="style.invoice_titles" fontName="OpenSans-Bold" fontSize="10"/>
+        <paraStyle name="style.invoice_titles" fontName="OpenSans-Bold" fontSize="10" />
-        <paraStyle name="style.invoice_numbers" fontName="OpenSans" fontSize="10"/>
+        <paraStyle name="style.invoice_numbers" fontName="OpenSans"  fontSize="10" />
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>
@@ -72,7 +71,7 @@
         </blockTableStyle>
 
         <blockTableStyle id="signatureTable">
-            <blockTopPadding length="20"/>
+            <blockTopPadding length="20" />
             <blockLeftPadding start="0,0" stop="0,-1" length="0"/>
             <lineStyle kind="linebelow" start="1,0" stop="1,0" colorName="black"/>
             <lineStyle kind="linebelow" start="3,0" stop="3,0" colorName="black"/>
@@ -80,8 +79,8 @@
         </blockTableStyle>
     </stylesheet>
 
-    <template> {# Note: page is 595x842 points (1 point=1/72in) #}
+    <template > {# Note: page is 595x842 points (1 point=1/72in) #}
-        <pageTemplate id="Headed">
+            <pageTemplate id="Headed" >
                 <pageGraphics>
                     <image file="RIGS/static/imgs/paperwork/corner-tr-su.jpg" x="395" y="642" height="200" width="200"/>
                     <image file="RIGS/static/imgs/paperwork/corner-bl.jpg" x="0" y="0" height="200" width="200"/>
@@ -99,17 +98,12 @@
                     <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>
 
                     
-                <setFont name="OpenSans" size="10"/>
+
-                {% if not invoice %}
+                    <setFont name="OpenSans" size="10" />
-                    <drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
+                    {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
-                <drawCenteredString x="302.5" y="38">[Page
+                    <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
-                    <pageNumber/>
+                    <setFont name="OpenSans" size="7" />
-                    of<getName id="lastPage" default="0"/>]
+                    <drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
-                </drawCenteredString>
-                <setFont name="OpenSans" size="7"/>
-                <drawCenteredString x="302.5" y="26">[Paperwork generated by {{ current_user.name }}
-                    | {% now "d/m/Y H:i" %} | {{ object.current_version_id }}]
-                </drawCenteredString>
                 </pageGraphics>
                 
                 <frame id="main" x1="50" y1="65" width="495" height="645"/>
@@ -121,16 +115,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 %}
+                     {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
-                    <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>
-                <drawCenteredString x="302.5" y="38">[Page
+                    <setFont name="OpenSans" size="7" />
-                    <pageNumber/>
+                    <drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
-                    of<getName id="lastPage" default="0"/>]
-                </drawCenteredString>
-                <setFont name="OpenSans" size="7"/>
-                <drawCenteredString x="302.5" y="26">[Paperwork generated by {{ current_user.name }}
-                    | {% now "d/m/Y H:i" %} | {{ object.current_version_id }}]
-                </drawCenteredString>
                 </pageGraphics>
                 <frame id="main" x1="50" y1="65" width="495" height="727"/>
             </pageTemplate>

RIGS/templates/RIGS/event_print_page.xml

@@ -3,19 +3,15 @@
 
 {% if invoice %}
 
-    <blockTable style="invoiceLayout" colWidths="330,165">
+<blockTable style="invoiceLayout" colWidths="330,165">
-    <tr>
+<tr>
     <td>
-{% endif %}
+        {% endif %}
 
-<h1>
+<h1><b>N{{ object.pk|stringformat:"05d" }}:</b> '{{ object.name }}'<small></small></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>
+<b>{{object.start_date|date:"D jS N Y"}}</b>
 </para>
 
 <keepInFrame>
@@ -32,25 +28,19 @@
         <spacer length="10"/>
         <blockTable style="eventDetails" colWidths="100,175">
             <tr>
-                <td>
+                <td><para style="invoice_titles">Invoice Number</para></td>
-                    <para style="invoice_titles">Invoice Number</para>
-                </td>
                 <td>
                     <para style="invoice_numbers">{{ invoice.pk|stringformat:"05d" }}</para>
                 </td>
             </tr>
             <tr>
-                <td>
+                <td><para style="invoice_titles">Invoice Date</para></td>
-                    <para style="invoice_titles">Invoice Date</para>
-                </td>
                 <td>
                     <para style="invoice_numbers">{{ invoice.invoice_date|date:"d/m/Y" }}</para>
                 </td>
             </tr>
             <tr>
-                <td>
+                <td><para style="invoice_titles">PO Number</para></td>
-                    <para style="invoice_titles">PO Number</para>
-                </td>
                 <td>
                     <para style="invoice_numbers">{{ object.purchase_order|default_if_none:"" }}</para>
                 </td>
@@ -58,15 +48,15 @@
 
         </blockTable>
     </td>
-    </tr>
+</tr>
-    </blockTable>
+</blockTable>
 
 
 {% endif %}
 
 <spacer length="15"/>
 <blockTable style="eventSpecifics" colWidths="165,165,165">
-<tr>
+    <tr>
         <td leftPadding="0">
                 <h2>Hirer</h2>
                 <h3>{{ object.person.name }}</h3>
@@ -117,9 +107,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,20 +115,16 @@
                     </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" }}
                         </para>
                     </td>
                 </tr>
-            {% if object.access_at and not invoice %}
+                {% 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" }}
@@ -151,7 +135,7 @@
                 </blockTable>
         </td>
 
-</tr>
+    </tr>
 </blockTable>
 
 <spacer length="15"/>
@@ -203,7 +187,7 @@
 {% endfor %}
 </blockTable>
 <keepTogether>
-<blockTable style="totalTable" colWidths="300,115,80">
+    <blockTable style="totalTable" colWidths="300,115,80">
     <tr>
         <td>{% if not invoice %}VAT Registration Number: 170734807{% endif %}</td>
         <td>Total (ex. VAT)</td>
@@ -243,7 +227,7 @@
             </para>
         </td>
     </tr>
-</blockTable>
+    </blockTable>
 </keepTogether>
 {% if not invoice %}
     <keepTogether>
@@ -270,17 +254,14 @@
     {% 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,
+            I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer, or
-                or
+            that I have provided written permission from either the President or Treasurer of the hirer stating that I can
-                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
+            I have read, understood and fully accepted the current conditions of hire. I agree to return any dry hire
-                hire
             items to TEC PA &amp; Lighting in the same condition at the end of the hire period.
         </i>
         </para>
@@ -306,10 +287,8 @@
     {% else %}
         <para style="blockPara">
         <i>
-                I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms
+            I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms a
-                a
+            binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire forming
-                binding contract between TEC PA &amp; Lighting and the hirer, the aforementioned conditions of hire
-                forming
             an integral part of it.
         </i>
         </para>
@@ -327,8 +306,7 @@
         </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
+            I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry hire
-                hire
             items to TEC PA &amp; Lighting in a similar condition at the end of the hire period.
         </i>
         </para>
@@ -336,7 +314,5 @@
 
     {% include "RIGS/event_print_signature.xml" %}
     </keepTogether>
-{% endif %}
+    {% endif %}
-<namedString id="lastPage">
+<namedString id="lastPage"><pageNumber/></namedString>
-<pageNumber/>
-</namedString>

RIGS/templates/RIGS/event_table.html

@@ -69,8 +69,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/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>
@@ -53,10 +40,9 @@
                 <div class="list-group-item">
                     <form class="form" role="form" action="{% url 'person_list' %}" method="GET">
                         <div class="input-group">
-                                <input type="search" name="q" class="form-control" placeholder="Search People"/>
+                            <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>
@@ -64,10 +50,9 @@
                 <div class="list-group-item">
                     <form class="form" role="form" action="{% url 'organisation_list' %}" method="GET">
                         <div class="input-group">
-                                <input type="search" name="q" class="form-control" placeholder="Search Organisations"/>
+                            <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>
@@ -75,10 +60,9 @@
                 <div class="list-group-item">
                     <form class="form" role="form" action="{% url 'venue_list' %}" method="GET">
                         <div class="input-group">
-                                <input type="search" name="q" class="form-control" placeholder="Search Venues"/>
+                            <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>
@@ -87,10 +71,10 @@
         </div>
     </div>
     {% if perms.RIGS.view_event %}
-            <div class="col-sm-6">
+    <div class="col-sm-6" >
         {% include 'RIGS/activity_feed.html' %}    
         
     </div>
     {% endif %}
-    </div>
+</div>
 {% endblock %}

RIGS/templates/RIGS/invoice_detail.html

@@ -6,7 +6,7 @@
     <div class="col-sm-12">
         <div class="row">
             <div class="col-sm-8">
-                <h2>Invoice {{ object.pk }} ({{ object.invoice_date|date:"d/m/Y" }})</h2>
+                <h2>Invoice {{ object.pk }} ({{ object.invoice_date|date:"d/m/Y"}})</h2>
             </div>
 
             <div class="col-sm-4 text-right">

RIGS/templates/RIGS/invoice_list.html

@@ -29,8 +29,7 @@
                 {% for object in object_list %}
                     <tr>
                         <td class="{% if object.is_closed %}success{% else %}warning{% endif %}">{{ object.pk }}<br>
-                            <span class="text-muted">{% if object.void %}(VOID){% elif object.is_closed %}
+                        <span class="text-muted">{% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(O/S){% endif %}</span></td>
-                                (PAID){% else %}(O/S){% endif %}</span></td>
                         <td class="
                             {% if object.event.cancelled %}
                                 active text-muted
@@ -44,11 +43,8 @@
                             {% else %}
                                 danger
                             {% endif %}
-                            "><a
+                            "><a href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }} <br>
-                                href="{% url 'event_detail' object.event.pk %}">N{{ object.event.pk|stringformat:"05d" }}</a>: {{ object.event.name }}
+                            <span class="text-muted">{{ object.event.get_status_display }}{% if not object.event.mic %}, No MIC{% endif %}
-                            <br>
-                            <span class="text-muted">{{ object.event.get_status_display }}{% if not object.event.mic %},
-                                No MIC{% endif %}
                             </span></td>
                         </td>
                         <td>{% if object.event.organisation %}

RIGS/templates/RIGS/invoice_list_active.html

@@ -1,13 +1,13 @@
 {% extends 'RIGS/invoice_list.html' %}
 
 {% block title %}
-    Outstanding Invoices
+Outstanding Invoices
 {% endblock %}
 
 {% block heading %}
-    Outstanding Invoices ({{ count }} Events, £ {{ total|floatformat:2 }})
+Outstanding Invoices ({{ count }} Events, £ {{ total|floatformat:2 }})
 {% endblock %}
 
 {% block description %}
-    <p>Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger</p>
+<p>Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger</p>
 {% endblock %}

RIGS/templates/RIGS/invoice_list_archive.html

@@ -1,13 +1,13 @@
 {% extends 'RIGS/invoice_list.html' %}
 
 {% block title %}
-    Invoice Archive
+Invoice Archive
 {% endblock %}
 
 {% block heading %}
-    All Invoices
+All Invoices
 {% endblock %}
 
 {% block description %}
-    <p>This page displays all invoices: outstanding, paid, and void</p>
+<p>This page displays all invoices: outstanding, paid, and void</p>
 {% endblock %}

RIGS/templates/RIGS/item_row.html

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

RIGS/templates/RIGS/item_table.html

@@ -26,23 +26,21 @@
 			<tr>
 				<td rowspan="3" colspan="2"></td>
 				<td>Total (ex. VAT)</td>
-            <td colspan="2">£ <span id="sumtotal">{{ object.sum_total|default:0|floatformat:2 }}</span></td>
+				<td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
 			</tr>
 			<tr>
 				{% if not object.pk %}
-                <td id="vat-rate" data-rate="{{ currentVAT.rate }}">VAT @
+					<td id="vat-rate" data-rate="{{currentVAT.rate}}">VAT @
-                    {{ currentVAT.as_percent|floatformat }}% (TBC)
+						{{currentVAT.as_percent|floatformat}}% (TBC)</td>
-                </td>
 				{% else %}
-                <td id="vat-rate" data-rate="{{ object.vat_rate.rate }}">VAT @
+					<td id="vat-rate" data-rate="{{object.vat_rate.rate}}">VAT @
-                    {{ object.vat_rate.as_percent|floatformat|default:"TBD" }}%
+						{{object.vat_rate.as_percent|floatformat|default:"TBD"}}%</td>
-                </td>
 				{% endif %}
-            <td colspan="2">£ <span id="vat">{{ object.vat|default:0|floatformat:2 }}</span></td>
+				<td colspan="2">£ <span id="vat">{{object.vat|default:0|floatformat:2}}</span></td>
 			</tr>
 			<tr>
 				<td>Total</td>
-            <td colspan="2">£ <span id="total">{{ object.total|default:0|floatformat:2 }}</span></td>
+				<td colspan="2">£ <span id="total">{{object.total|default:0|floatformat:2}}</span></td>
 			</tr>
 		</tfoot>
 	</table>

RIGS/templates/RIGS/object_button.html

@@ -1,6 +1,4 @@
 {% load to_class_name from filters %}
 {# pass in variable "object" to this template #}
 
-<a title="{% if  object.is_rig == False %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{% else %}{{ object|to_class_name }}{% endif %} | '{{ object.name }}'"
+<a title="{% if  object.is_rig == False  %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{{object.name}}'" href="{{ object.get_absolute_url }}">{% if  object.is_rig == False  %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{{object.name}}'</a>
-   href="{{ object.get_absolute_url }}">{% if  object.is_rig == False %}Non-rig{% elif object.dry_hire %}Dry
-    Hire{% elif object.is_rig %}Rig{% else %}{{ object|to_class_name }}{% endif %} | '{{ object.name }}'</a>

RIGS/templates/RIGS/organisation_detail.html

@@ -29,8 +29,7 @@
                         <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
 
                         <dt>Email</dt>
-                        <dd><a href="mailto:{{ object.email }}"><span
+                        <dd><a href="mailto:{{ object.email }}"><span class="overflow-ellipsis">{{ object.email }}</span></a></dd>
-                                class="overflow-ellipsis">{{ object.email }}</span></a></dd>
 
                         <dt>Address</dt>
                         <dd>{{ object.address|linebreaksbr }}</dd>
@@ -51,10 +50,7 @@
                 <div class="panel-body">
                     <div class="list-group">
                         {% for person,count in object.persons %}
-                            <a class="list-group-item"
+                            <a class="list-group-item" href="{% url 'person_detail' person.pk %}">{{ person.pk|stringformat:"05d" }} | {{ person.name }} <span class="badge" title="{{count}} events with {{person.name}} for {{object.name}}">{{count}}</span></a>
-                               href="{% url 'person_detail' person.pk %}">{{ person.pk|stringformat:"05d" }}
-                                | {{ person.name }} <span class="badge"
-                                                          title="{{ count }} events with {{ person.name }} for {{ object.name }}">{{ count }}</span></a>
                         {% endfor %}
                     </div>
                 </div>

RIGS/templates/RIGS/person_detail.html

@@ -29,8 +29,7 @@
                         <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
 
                         <dt>Email</dt>
-                        <dd><a href="mailto:{{ object.email }}"><span
+                        <dd><a href="mailto:{{ object.email }}"><span class="overflow-ellipsis">{{ object.email }}</span></a></dd>
-                                class="overflow-ellipsis">{{ object.email }}</span></a></dd>
 
                         <dt>Address</dt>
                         <dd>{{ object.address|linebreaksbr }}</dd>
@@ -48,10 +47,7 @@
                 <div class="panel-body">
                     <div class="list-group">
                         {% for organisation,count in object.organisations %}
-                            <a class="list-group-item"
+                            <a class="list-group-item" href="{% url 'organisation_detail' organisation.pk %}">{{ organisation.pk|stringformat:"05d" }} | {{ organisation.name }} <span class="badge" title="{{count}} events with {{object.name}} for {{organisation.name}}">{{count}}</span></a>
-                               href="{% url 'organisation_detail' organisation.pk %}">{{ organisation.pk|stringformat:"05d" }}
-                                | {{ organisation.name }} <span class="badge"
-                                                                title="{{ count }} events with {{ object.name }} for {{ organisation.name }}">{{ count }}</span></a>
                         {% endfor %}
                     </div>
                 </div>

RIGS/templates/RIGS/profile_button.html

@@ -1,13 +1,12 @@
 {# pass in variable "profile" to this template #}
 
-<button title="{{ profile.name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true"
+<button title="{{profile.name}}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover focus' data-toggle="popover" data-content='
-        data-trigger='hover focus' data-toggle="popover" data-content='
+<img src="{{profile.profile_picture}}" class="img-responsive img-rounded center-block" style="max-width:4em" />
-<img src="{{ profile.profile_picture }}" class="img-responsive img-rounded center-block" style="max-width:4em" />
         <dl class="dl-vertical">
 			<dt>Email</dt>
-			<dd>{{ profile.email }}</dd>
+			<dd>{{profile.email}}</dd>
 
 			<dt>Phone</dt>
-			<dd>{{ profile.phone }}</dd>
+			<dd>{{profile.phone}}</dd>
 		</dl>
-        '>{{ profile.first_name }}</button>
+        '>{{profile.first_name}}</button>

RIGS/templates/RIGS/profile_detail.html

@@ -1,26 +1,26 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
 
-{% block title %}RIGS Profile {{ object.pk }}{% endblock %}
+{% block title %}RIGS Profile {{object.pk}}{% endblock %}
 
 {% block js %}
     <script>
-        $(document).ready(function () {
+        $(document).ready(function() {
-            $('#urlParamForm').change(function () {
+        	$('#urlParamForm').change(function(){
 	        	url = "?";
-                $('#urlParamForm *').filter(':input').each(function (index, value) {
+	        	$('#urlParamForm *').filter(':input').each(function(index, value){
 				    defaultVal = $(value).data('default');
 				    param = $(value).val();
 				    val = $(value).prop('checked');
 
-                    if (val != defaultVal) {
+				    if(val != defaultVal){
-                        url = url + param + "=" + val + "&";
+					    url = url+param+"="+val+"&";
 					}
 				});
 	        	ics_url = $('#cal-url').data('url') + url.substring(0, url.length - 1);
 				$('#cal-url').text(ics_url);
 
 				gcal_url = $('#gcal-link').data('url') + encodeURIComponent(url.substring(0, url.length - 1));
-                $('#gcal-link').attr('href', gcal_url);
+				$('#gcal-link').attr('href',gcal_url);
 			});
 
 			$('#urlParamForm').change(); //Do the initial setting
@@ -30,11 +30,11 @@
 {% endblock %}
 
 {% block content %}
-    <div class="row">
+<div class="row">
 	<div class="col-md-10 col-md-offset-1">
 		
 		<div class="col-sm-6">
-                <h3>{{ object.name }}</h3>
+			<h3>{{object.name}}</h3>
 		</div>
 		{% if not request.is_ajax %}
 			{% if object.pk == user.pk %}
@@ -53,25 +53,25 @@
 		<div class="col-sm-8	">
 			<dl class="dl-horizontal">
 				<dt>First Name</dt>
-                    <dd>{{ object.first_name }}</dd>
+				<dd>{{object.first_name}}</dd>
 
 				<dt>Last Name</dt>
-                    <dd>{{ object.last_name }}</dd>
+				<dd>{{object.last_name}}</dd>
 
 				<dt>Email</dt>
-                    <dd>{{ object.email }}</dd>
+				<dd>{{object.email}}</dd>
 
 				<dt>Last Login</dt>
-                    <dd>{{ object.last_login|date:"d/m/Y H:i" }}</dd>
+				<dd>{{object.last_login|date:"d/m/Y H:i"}}</dd>
 
 				<dt>Date Joined</dt>
-                    <dd>{{ object.date_joined|date:"d/m/Y H:i" }}</dd>
+				<dd>{{object.date_joined|date:"d/m/Y H:i"}}</dd>
 
 				<dt>Initials</dt>
-                    <dd>{{ object.initials }}</dd>
+				<dd>{{object.initials}}</dd>
 
 				<dt>Phone</dt>
-                    <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
+				<dd><a href="tel:{{ object.phone }}">{{object.phone}}</a></dd>
 			</dl>
 			{% if not request.is_ajax %}
 			{% if object.pk == user.pk %}
@@ -89,7 +89,7 @@
 				<dt>API Key</dt>
 				<dd>
 					{% if user.api_key %}
-                                    {{ user.api_key }}
+						{{user.api_key}}
 					{% else %}
 						No API Key Generated
 					{% endif %}
@@ -104,23 +104,19 @@
 								  <input type="checkbox" value="rig" data-default="true" checked> Rigs
 								</label>
 								<label class="checkbox-inline">
-                                                <input type="checkbox" value="non-rig" data-default="true" checked>
+								  <input type="checkbox" value="non-rig" data-default="true" checked> Non-Rigs
-                                                Non-Rigs
 								</label>
 								<label class="checkbox-inline">
-                                                <input type="checkbox" value="dry-hire" data-default="true" checked>
+								  <input type="checkbox" value="dry-hire" data-default="true" checked> Dry-Hires
-                                                Dry-Hires
 								</label>
 								<label class="checkbox-inline">
-                                                <input type="checkbox" value="cancelled" data-default="false"> Cancelled
+								  <input type="checkbox" value="cancelled" data-default="false" > Cancelled
 								</label>
 								<label class="checkbox-inline">
-                                                <input type="checkbox" value="provisional" data-default="true" checked>
+								  <input type="checkbox" value="provisional" data-default="true" checked> Provisional
-                                                Provisional
 								</label>
 								<label class="checkbox-inline">
-                                                <input type="checkbox" value="confirmed" data-default="true" checked>
+								  <input type="checkbox" value="confirmed" data-default="true" checked> Confirmed/Booked
-                                                Confirmed/Booked
 								</label>
 							</div>
 						</form>
@@ -129,19 +125,9 @@
 				<dt>Calendar URL</dt>
 				<dd>
 					{% if user.api_key %}
-                                    <pre id="cal-url" data-url="http{{ request.is_secure|yesno:"s," }}://
+						<pre id="cal-url" data-url="http{{ request.is_secure|yesno:"s,"}}://{{ request.get_host }}{% url 'ics_calendar' api_pk=user.pk api_key=user.api_key %}"></pre>
-
+						<small><a id="gcal-link" data-url="https://support.google.com/calendar/answer/37100" href="">Click here</a> for instructions on adding to google calendar.<br/>
-
+						To sync from google calendar to mobile device, visit <a href="https://www.google.com/calendar/syncselect" target="_blank">this page</a> on your device and tick "RIGS Calendar".</small>
-
-
-
-                                            {{ request.get_host }}{% url 'ics_calendar' api_pk=user.pk api_key=user.api_key %}"></pre>
-                                    <small><a id="gcal-link" data-url="https://support.google.com/calendar/answer/37100"
-                                              href="">Click here</a> for instructions on adding to google calendar.<br/>
-                                        To sync from google calendar to mobile device, visit <a
-                                                href="https://www.google.com/calendar/syncselect" target="_blank">this
-                                            page</a> on your device and tick "RIGS Calendar".
-                                    </small>
 					{% else %}
 						<pre>No API Key Generated</pre>
 					{% endif %}
@@ -153,7 +139,7 @@
 		
 		<div class="col-sm-3">
 			<div class="center-block">
-                    <img src="{{ object.profile_picture }}" class="img-responsive img-rounded"/>
+				<img src="{{object.profile_picture}}" class="img-responsive img-rounded" />
 		</div>
 
 	</div>
@@ -167,5 +153,5 @@
 	    </div>
 	</div>
 	</div>
-    </div>
+</div>
 {% endblock %}

RIGS/templates/RIGS/profile_form.html

@@ -1,19 +1,17 @@
 {% extends 'base.html' %}
 {% load widget_tweaks %}
 
-{% block title %}Update Profile {{ object.name }}{% endblock %}
+{% block title %}Update Profile {{object.name}}{% endblock %}
 
 {% block content %}
-    <div class="row">
+<div class="row">
 	<div class="col-sm-10 col-sm-offset-1">
 		{% include 'form_errors.html' %}
 		<h3>Update Profile</h3>
 		<div class="col-sm-6">
-                <form action="{{ form.action|default:request.path }}" method="post"
+			<form action="{{form.action|default:request.path}}" method="post" class="form-horizontal">{% csrf_token %}
-                      class="form-horizontal">{% csrf_token %}
 				<div class="form-group">
-                        <label for="{{ form.first_name.id_for_label }}"
+					<label for="{{form.first_name.id_for_label}}" class="col-sm-4 control-label">{{form.first_name.label}}</label>
-                               class="col-sm-4 control-label">{{ form.first_name.label }}</label>
 
 					<div class="col-sm-8">
 						{% render_field form.first_name class+="form-control" placeholder=form.first_name.label %}
@@ -21,8 +19,7 @@
 				</div>
 
 				<div class="form-group">
-                        <label for="{{ form.last_name.id_for_label }}"
+					<label for="{{form.last_name.id_for_label}}" class="col-sm-4 control-label">{{form.last_name.label}}</label>
-                               class="col-sm-4 control-label">{{ form.last_name.label }}</label>
 
 					<div class="col-sm-8">
 						{% render_field form.last_name class+="form-control" placeholder=form.last_name.label %}
@@ -30,8 +27,7 @@
 				</div>
 
 				<div class="form-group">
-                        <label for="{{ form.email.id_for_label }}"
+					<label for="{{form.email.id_for_label}}" class="col-sm-4 control-label">{{form.email.label}}</label>
-                               class="col-sm-4 control-label">{{ form.email.label }}</label>
 
 					<div class="col-sm-8">
 						{% render_field form.email type="email" class+="form-control" placeholder=form.email.label %}
@@ -39,8 +35,7 @@
 				</div>
 
 				<div class="form-group">
-                        <label for="{{ form.initials.id_for_label }}"
+					<label for="{{form.initials.id_for_label}}" class="col-sm-4 control-label">{{form.initials.label}}</label>
-                               class="col-sm-4 control-label">{{ form.initials.label }}</label>
 
 					<div class="col-sm-8">
 						{% render_field form.initials class+="form-control" placeholder=form.initials.label %}
@@ -48,8 +43,7 @@
 				</div>
 
 				<div class="form-group">
-                        <label for="{{ form.phone.id_for_label }}"
+					<label for="{{form.phone.id_for_label}}" class="col-sm-4 control-label">{{form.phone.label}}</label>
-                               class="col-sm-4 control-label">{{ form.phone.label }}</label>
 
 					<div class="col-sm-8">
 						{% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
@@ -65,7 +59,7 @@
 		<div class="col-sm-3 col-sm-offset-2">
 			<div class="center-block">
 				<a href="https://gravatar.com/">
-                        <img src="{{ object.profile_picture }}" class="img-responsive img-rounded"/>
+					<img src="{{object.profile_picture}}" class="img-responsive img-rounded" />
 					<div class="text-center">
 						Images hosted by Gravatar
 					</div>
@@ -73,5 +67,5 @@
 			</div>
 		</div>
 	</div>
-    </div>
+</div>
 {% endblock %}

RIGS/templates/RIGS/venue_detail.html

@@ -29,8 +29,7 @@
                         <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
 
                         <dt>Email</dt>
-                        <dd><a href="mailto:{{ object.email }}"><span
+                        <dd><a href="mailto:{{ object.email }}"><span class="overflow-ellipsis">{{ object.email }}</span></a></dd>
-                                class="overflow-ellipsis">{{ object.email }}</span></a></dd>
 
                         <dt>Address</dt>
                         <dd>{{ object.address|linebreaksbr }}</dd>

RIGS/templates/RIGS/version_changes.html

@@ -1,18 +1,13 @@
 {% for change in version.field_changes %}
 
-    <button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs"
+	<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
-            data-container="body" data-html="true" data-trigger='hover' data-toggle="popover"
-            data-content='{% spaceless %}
         {% include "RIGS/version_changes_change.html" %}
         {% endspaceless %}'>{{ change.field.verbose_name }}</button>
 
 {% endfor %}
 
 {% for itemChange in version.item_changes %}
-    <button title="Changes to item '
+    <button title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
-            {% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'"
-            type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover'
-            data-toggle="popover" data-content='{% spaceless %}
         <ul class="list-group">
         {% for change in itemChange.changes %}
               <li class="list-group-item">
@@ -22,7 +17,5 @@
         {% endfor %}
         </ul>
         
-        {% endspaceless %}'>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}
+        {% endspaceless %}'>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'</button>
-        {{ itemChange.old.name }}{% endif %}'
-    </button>
 {% endfor %}

RIGS/templates/RIGS/version_changes_change.html

@@ -4,18 +4,18 @@
         {% if diff.type == "insert" %}
             <ins>{{ diff.text|linebreaksbr }}</ins>
         {% elif diff.type == "delete" %}
-            <del>{{ diff.text|linebreaksbr }}</del>
+            <del>{{diff.text|linebreaksbr}}</del>
         {% else %}
-            <span>{{ diff.text|linebreaksbr }}</span>
+            <span>{{diff.text|linebreaksbr}}</span>
         {% endif %}
     {% endfor %}
-{% else %}
+    {% else %}
     {% if change.old %}
         <del {% if change.long %}class="overflow-ellipsis"{% endif %}>
             {% if change.linebreaks %}
-                {{ change.old|linebreaksbr }}
+                {{change.old|linebreaksbr}}
             {% else %}
-                {{ change.old }}
+                {{change.old}}
             {% endif %}
         </del>
     {% endif %}
@@ -25,9 +25,9 @@
     {% if change.new %}
         <ins {% if change.long %}class="overflow-ellipsis"{% endif %}>
             {% if change.linebreaks %}
-                {{ change.new|linebreaksbr }}
+                {{change.new|linebreaksbr}}
             {% else %}
-                {{ change.new }}
+                {{change.new}}
             {% endif %}
         </ins>
     {% endif %}

RIGS/templates/RIGS/version_history.html

@@ -3,15 +3,15 @@
 {% load paginator from filters %}
 {% load static %}
 
-{% block title %}{{ object|to_class_name }} {{ object.pk|stringformat:"05d" }} - Revision History{% endblock %}
+{% block title %}{{object|to_class_name}} {{ object.pk|stringformat:"05d" }} - Revision History{% endblock %}
 
 {% block js %}
     <script src="{% static "js/tooltip.js" %}"></script>
     <script src="{% static "js/popover.js" %}"></script>
     <script>
     	$(function () {
-            $('[data-toggle="popover"]').popover().click(function () {
+            $('[data-toggle="popover"]').popover().click(function(){
-                if ($(this).attr('href')) {
+                    if($(this).attr('href')){
                       window.location.href = $(this).attr('href');
                     }
                   });		
@@ -20,12 +20,10 @@
 {% endblock %}
 
 {% block content %}
-    <div class="col-sm-12">
+<div class="col-sm-12">
         <div class="row">
             <div class="col-sm-12">
-                <h3>
+                <h3><a href="{{ object.get_absolute_url }}">{{object|to_class_name}} {{ object.pk|stringformat:"05d" }}</a> - Revision History</h3>
-                    <a href="{{ object.get_absolute_url }}">{{ object|to_class_name }} {{ object.pk|stringformat:"05d" }}</a>
-                    - Revision History</h3>
             </div>
             <div class="text-right col-sm-12">{% paginator %}</div>
         </div>
@@ -49,7 +47,7 @@
                                 <td>{{ version.revision.user.name }}</td>
                                 <td>
                                     {% if version.old == None %}
-                                    {{ object|to_class_name }} Created
+                                        {{object|to_class_name}} Created
                                     {% else %}
                                         {% include 'RIGS/version_changes.html' %}
                                     {% endif %}
@@ -65,5 +63,5 @@
             </table>
          </div>
     <div class="align-right">{% paginator %}</div>
-    </div>
+</div>
 {% endblock %}

RIGS/templatetags/filters.py

@@ -1,21 +1,18 @@
-from django import forms
 from django import template
+from django import forms
 from django.forms.forms import NON_FIELD_ERRORS
 from django.forms.utils import ErrorDict
 
 register = template.Library()
 
-
 @register.filter
 def multiply(value, arg):
-    return value * arg
+    return value*arg
-
 
 @register.filter
 def to_class_name(value):
     return value.__class__.__name__
     
-
 @register.filter
 def nice_errors(form, non_field_msg='General form errors'):
     nice_errors = ErrorDict()
@@ -28,7 +25,6 @@ def nice_errors(form, non_field_msg='General form errors'):
             nice_errors[key] = errors
     return nice_errors
 
-
 def paginator(context, adjacent_pages=3):
     """
     To be used in conjunction with the object_list generic view.
@@ -68,22 +64,20 @@ def paginator(context, adjacent_pages=3):
         dict['previous'] = page.previous_page_number()
 
     return dict
-
-
 register.inclusion_tag('pagination.html', takes_context=True)(paginator)
 
-
 @register.simple_tag
 def url_replace(request, field, value):
+
     dict_ = request.GET.copy()
 
     dict_[field] = value
 
     return dict_.urlencode()
 
-
 @register.simple_tag
 def orderby(request, field, attr):
+
     dict_ = request.GET.copy()
 
     if dict_.__contains__(field) and dict_[field] == attr:

RIGS/test_functional.py

@@ -17,6 +17,7 @@ from RIGS import models
 
 
 class UserRegistrationTest(LiveServerTestCase):
+
     def setUp(self):
         self.browser = webdriver.Firefox()
         self.browser.implicitly_wait(3) # Set implicit wait session wide
@@ -148,14 +149,14 @@ class UserRegistrationTest(LiveServerTestCase):
 
 
 class EventTest(LiveServerTestCase):
+
     def setUp(self):
         self.profile = models.Profile(
             username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
         self.profile.set_password("EventTestPassword")
         self.profile.save()
 
-        self.vatrate = models.VatRate.objects.create(
+        self.vatrate = models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
-            start_at='2014-03-05', rate=0.20, comment='test1')
         
         self.browser = webdriver.Firefox()
         self.browser.implicitly_wait(3) # Set implicit wait session wide
@@ -202,8 +203,7 @@ class EventTest(LiveServerTestCase):
             # Gets redirected to login and back
             self.authenticate('/event/create/')
 
-            # setup WebDriverWait to use later (to wait for animations)
+            wait = WebDriverWait(self.browser, 10) #setup WebDriverWait to use later (to wait for animations)
-            wait = WebDriverWait(self.browser, 10)
 
             wait.until(animation_is_finished())
 
@@ -229,9 +229,7 @@ class EventTest(LiveServerTestCase):
             modal = self.browser.find_element_by_id('modal')
             wait.until(animation_is_finished())
             self.assertTrue(modal.is_displayed())
-            self.assertIn(
+            self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
-                "Add Person",
-                modal.find_element_by_tag_name('h3').text)
 
             # Fill person form out and submit
             modal.find_element_by_xpath(
@@ -256,9 +254,7 @@ class EventTest(LiveServerTestCase):
 
             wait.until(animation_is_finished())
             self.assertTrue(modal.is_displayed())
-            self.assertIn(
+            self.assertIn("Add Person", modal.find_element_by_tag_name('h3').text)
-                "Add Person",
-                modal.find_element_by_tag_name('h3').text)
 
             modal.find_element_by_xpath(
                 '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Person 2")
@@ -294,9 +290,7 @@ class EventTest(LiveServerTestCase):
                 '//a[@data-target="#id_person" and contains(@href, "%s/edit/")]' % person1.pk).click()
             wait.until(animation_is_finished())
             self.assertTrue(modal.is_displayed())
-            self.assertIn(
+            self.assertIn("Edit Person", modal.find_element_by_tag_name('h3').text)
-                "Edit Person",
-                modal.find_element_by_tag_name('h3').text)
             name = modal.find_element_by_xpath(
                 '//div[@id="modal"]//input[@id="id_name"]')
             self.assertEqual(person1.name, name.get_attribute('value'))
@@ -319,8 +313,7 @@ class EventTest(LiveServerTestCase):
             modal = self.browser.find_element_by_id('modal')
             wait.until(animation_is_finished())
             self.assertTrue(modal.is_displayed())
-            self.assertIn("Add Organisation",
+            self.assertIn("Add Organisation", modal.find_element_by_tag_name('h3').text)
-                          modal.find_element_by_tag_name('h3').text)
             modal.find_element_by_xpath(
                 '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Organisation")
             modal.find_element_by_xpath(
@@ -347,9 +340,7 @@ class EventTest(LiveServerTestCase):
             modal = self.browser.find_element_by_id('modal')
             wait.until(animation_is_finished())
             self.assertTrue(modal.is_displayed())
-            self.assertIn(
+            self.assertIn("Add Venue", modal.find_element_by_tag_name('h3').text)
-                "Add Venue",
-                modal.find_element_by_tag_name('h3').text)
             modal.find_element_by_xpath(
                 '//div[@id="modal"]//input[@id="id_name"]').send_keys("Test Venue")
             modal.find_element_by_xpath(
@@ -375,13 +366,11 @@ class EventTest(LiveServerTestCase):
             form.find_element_by_id('id_end_time').send_keys('07:00')
 
             # Add item
-            form.find_element_by_xpath(
+            form.find_element_by_xpath('//button[contains(@class, "item-add")]').click()
-                '//button[contains(@class, "item-add")]').click()
             wait.until(animation_is_finished())
             modal = self.browser.find_element_by_id("itemModal")
             modal.find_element_by_id("item_name").send_keys("Test Item 1")
-            modal.find_element_by_id("item_description").send_keys(
+            modal.find_element_by_id("item_description").send_keys("This is an item description\nthat for reasons unkown spans two lines")
-                "This is an item description\nthat for reasons unkown spans two lines")
             e = modal.find_element_by_id("item_quantity")
             e.click()
             e.send_keys(Keys.UP)
@@ -393,54 +382,35 @@ class EventTest(LiveServerTestCase):
             # Confirm item has been saved to json field
             objectitems = self.browser.execute_script("return objectitems;")
             self.assertEqual(1, len(objectitems))
-            # as we are deliberately creating this we know the ID
+            testitem = objectitems["-1"]['fields'] # as we are deliberately creating this we know the ID
-            testitem = objectitems["-1"]['fields']
             self.assertEqual("Test Item 1", testitem['name'])
-            # test a couple of "worse case" fields
+            self.assertEqual("2", testitem['quantity']) # test a couple of "worse case" fields
-            self.assertEqual("2", testitem['quantity'])
 
             # See new item appear in table
-            row = self.browser.find_element_by_id(
+            row = self.browser.find_element_by_id('item--1') # ID number is known, see above
-                'item--1')  # ID number is known, see above
+            self.assertIn("Test Item 1", row.find_element_by_xpath('//span[@class="name"]').text)
-            self.assertIn(
+            self.assertIn("This is an item description", row.find_element_by_xpath('//div[@class="item-description"]').text)
-                "Test Item 1",
+            self.assertEqual(u'£ 23.95', row.find_element_by_xpath('//tr[@id="item--1"]/td[2]').text)
-                row.find_element_by_xpath('//span[@class="name"]').text)
+            self.assertEqual("2", row.find_element_by_xpath('//td[@class="quantity"]').text)
-            self.assertIn(
+            self.assertEqual(u'£ 47.90', row.find_element_by_xpath('//tr[@id="item--1"]/td[4]').text)
-                "This is an item description",
-                row.find_element_by_xpath('//div[@class="item-description"]').text)
-            self.assertEqual(u'£ 23.95', row.find_element_by_xpath(
-                '//tr[@id="item--1"]/td[2]').text)
-            self.assertEqual("2", row.find_element_by_xpath(
-                '//td[@class="quantity"]').text)
-            self.assertEqual(u'£ 47.90', row.find_element_by_xpath(
-                '//tr[@id="item--1"]/td[4]').text)
 
             # Check totals
-            self.assertEqual(
+            self.assertEqual("47.90", self.browser.find_element_by_id('sumtotal').text)
-                "47.90", self.browser.find_element_by_id('sumtotal').text)
+            self.assertIn("(TBC)", self.browser.find_element_by_id('vat-rate').text)
-            self.assertIn(
+            self.assertEqual("9.58", self.browser.find_element_by_id('vat').text)
-                "(TBC)",
+            self.assertEqual("57.48", self.browser.find_element_by_id('total').text)
-                self.browser.find_element_by_id('vat-rate').text)
-            self.assertEqual(
-                "9.58", self.browser.find_element_by_id('vat').text)
-            self.assertEqual(
-                "57.48", self.browser.find_element_by_id('total').text)
 
             # Attempt to save - missing title
             save.click()
 
             # See error
-            error = self.browser.find_element_by_xpath(
+            error = self.browser.find_element_by_xpath('//div[contains(@class, "alert-danger")]')
-                '//div[contains(@class, "alert-danger")]')
             self.assertTrue(error.is_displayed())
             # Should only have one error message
-            self.assertEqual(
+            self.assertEqual("Name", error.find_element_by_xpath('//dt[1]').text)
-                "Name", error.find_element_by_xpath('//dt[1]').text)
+            self.assertEqual("This field is required.", error.find_element_by_xpath('//dd[1]/ul/li').text)
-            self.assertEqual("This field is required.",
-                             error.find_element_by_xpath('//dd[1]/ul/li').text)
             # don't need error so close it
-            error.find_element_by_xpath(
+            error.find_element_by_xpath('//div[contains(@class, "alert-danger")]//button[@class="close"]').click()
-                '//div[contains(@class, "alert-danger")]//button[@class="close"]').click()
             try:
                 self.assertFalse(error.is_displayed())
             except StaleElementReferenceException:
@@ -461,20 +431,14 @@ class EventTest(LiveServerTestCase):
             # See redirected to success page
             successTitle = self.browser.find_element_by_xpath('//h1').text
             event = models.Event.objects.get(name='Test Event Name')
-            self.assertIn("N0000%d | Test Event Name" % event.pk, successTitle)
+            self.assertIn("N0000%d | Test Event Name"%event.pk, successTitle)
         except WebDriverException:
             # This is a dirty workaround for wercker being a bit funny and not running it correctly.
             # Waiting for wercker to get back to me about this
             pass
 
     def testEventDuplicate(self):
-        testEvent = models.Event.objects.create(
+        testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=6), description="start future no end", purchase_order="TESTPO") 
-            name="TE E1",
-            status=models.Event.PROVISIONAL,
-            start_date=date.today() +
-                       timedelta(
-                           days=6),
-            description="start future no end")
 
         item1 = models.EventItem(
                 event=testEvent,
@@ -492,31 +456,30 @@ class EventTest(LiveServerTestCase):
                 order=2,
             ).save()
 
-        self.browser.get(self.live_server_url + '/event/' +
+        self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk) + '/duplicate/')
-                         str(testEvent.pk) + '/duplicate/')
         self.authenticate('/event/' + str(testEvent.pk) + '/duplicate/')
 
-        # setup WebDriverWait to use later (to wait for animations)
+        wait = WebDriverWait(self.browser, 10) #setup WebDriverWait to use later (to wait for animations)
-        wait = WebDriverWait(self.browser, 10)
 
         save = self.browser.find_element_by_xpath(
             '(//button[@type="submit"])[3]')
         form = self.browser.find_element_by_tag_name('form')
 
+
         # Check the items are visible
-        table = self.browser.find_element_by_id(
+        table = self.browser.find_element_by_id('item-table') # ID number is known, see above
-            'item-table')  # ID number is known, see above
         self.assertIn("Test Item 1", table.text)
         self.assertIn("Test Item 2", table.text)
 
+        # Check the info message is visible
+        self.assertIn("Event data duplicated but not yet saved",self.browser.find_element_by_id('content').text)
+
         # Add item
-        form.find_element_by_xpath(
+        form.find_element_by_xpath('//button[contains(@class, "item-add")]').click()
-            '//button[contains(@class, "item-add")]').click()
         wait.until(animation_is_finished())
         modal = self.browser.find_element_by_id("itemModal")
         modal.find_element_by_id("item_name").send_keys("Test Item 3")
-        modal.find_element_by_id("item_description").send_keys(
+        modal.find_element_by_id("item_description").send_keys("This is an item description\nthat for reasons unkown spans two lines")
-            "This is an item description\nthat for reasons unkown spans two lines")
         e = modal.find_element_by_id("item_quantity")
         e.click()
         e.send_keys(Keys.UP)
@@ -528,35 +491,32 @@ class EventTest(LiveServerTestCase):
         # Attempt to save
         save.click()
 
-        self.assertNotIn(
+        self.assertNotIn("N0000%d"%testEvent.pk, self.browser.find_element_by_xpath('//h1').text)
-            "N0000%d" %
+        self.assertNotIn("Event data duplicated but not yet saved", self.browser.find_element_by_id('content').text) # Check info message not visible
-            testEvent.pk,
-            self.browser.find_element_by_xpath('//h1').text)
 
         # Check the new items are visible
-        table = self.browser.find_element_by_id(
+        table = self.browser.find_element_by_id('item-table') # ID number is known, see above
-            'item-table')  # ID number is known, see above
         self.assertIn("Test Item 1", table.text)
         self.assertIn("Test Item 2", table.text)
         self.assertIn("Test Item 3", table.text)
 
-        infoPanel = self.browser.find_element_by_xpath(
+        infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
-            '//div[contains(text(), "Event Info")]/..')
+        self.assertIn("N0000%d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
-        self.assertIn("N0000%d" % testEvent.pk, infoPanel.find_element_by_xpath(
+        # Check the PO hasn't carried through
-            '//dt[text()="Based On"]/following-sibling::dd[1]').text)
+        self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
 
-        self.browser.get(self.live_server_url + '/event/' +
-                         str(testEvent.pk))  # Go back to the old event
 
-        # Check that based-on hasn't crept into the old event
+
-        infoPanel = self.browser.find_element_by_xpath(
+        self.browser.get(self.live_server_url + '/event/' + str(testEvent.pk)) #Go back to the old event
-            '//div[contains(text(), "Event Info")]/..')
+        
-        self.assertNotIn("N0000%d" % testEvent.pk, infoPanel.find_element_by_xpath(
+        #Check that based-on hasn't crept into the old event
-            '//dt[text()="Based On"]/following-sibling::dd[1]').text)
+        infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
+        self.assertNotIn("N0000%d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)        
+        # Check the PO remains on the old event
+        self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
 
         # Check the items are as they were
-        table = self.browser.find_element_by_id(
+        table = self.browser.find_element_by_id('item-table') # ID number is known, see above
-            'item-table')  # ID number is known, see above
         self.assertIn("Test Item 1", table.text)
         self.assertIn("Test Item 2", table.text)
         self.assertNotIn("Test Item 3", table.text)
@@ -566,8 +526,7 @@ class EventTest(LiveServerTestCase):
         # Gets redirected to login and back
         self.authenticate('/event/create/')
 
-        # setup WebDriverWait to use later (to wait for animations)
+        wait = WebDriverWait(self.browser, 10) #setup WebDriverWait to use later (to wait for animations)
-        wait = WebDriverWait(self.browser, 10)
 
         wait.until(animation_is_finished())
 
@@ -575,8 +534,7 @@ class EventTest(LiveServerTestCase):
         self.browser.find_element_by_xpath('//button[.="Rig"]').click()
 
         form = self.browser.find_element_by_tag_name('form')
-        save = self.browser.find_element_by_xpath(
+        save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-            '(//button[@type="submit"])[3]')
 
         # Set title
         e = self.browser.find_element_by_id('id_name')
@@ -591,16 +549,14 @@ class EventTest(LiveServerTestCase):
 
         # Attempt to save - should fail
         save.click()
-        error = self.browser.find_element_by_xpath(
+        error = self.browser.find_element_by_xpath('//div[contains(@class, "alert-danger")]')
-            '//div[contains(@class, "alert-danger")]')
         self.assertTrue(error.is_displayed())
-        self.assertIn("can't finish before it has started",
+        self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
-                      error.find_element_by_xpath('//dd[1]/ul/li').text)
+
 
         # Same date, end time before start time
         form = self.browser.find_element_by_tag_name('form')
-        save = self.browser.find_element_by_xpath(
+        save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-            '(//button[@type="submit"])[3]')
         form.find_element_by_id('id_start_date').clear()
         form.find_element_by_id('id_start_date').send_keys('3015-04-24')
 
@@ -615,16 +571,14 @@ class EventTest(LiveServerTestCase):
 
         # Attempt to save - should fail
         save.click()
-        error = self.browser.find_element_by_xpath(
+        error = self.browser.find_element_by_xpath('//div[contains(@class, "alert-danger")]')
-            '//div[contains(@class, "alert-danger")]')
         self.assertTrue(error.is_displayed())
-        self.assertIn("can't finish before it has started",
+        self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
-                      error.find_element_by_xpath('//dd[1]/ul/li').text)
+
 
         # Same date, end time before start time
         form = self.browser.find_element_by_tag_name('form')
-        save = self.browser.find_element_by_xpath(
+        save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-            '(//button[@type="submit"])[3]')
         form.find_element_by_id('id_start_date').clear()
         form.find_element_by_id('id_start_date').send_keys('3015-04-24')
 
@@ -637,10 +591,10 @@ class EventTest(LiveServerTestCase):
         form.find_element_by_id('id_end_time').clear()
         form.find_element_by_id('id_end_time').send_keys('06:00')
 
+
         # No end date, end time before start time
         form = self.browser.find_element_by_tag_name('form')
-        save = self.browser.find_element_by_xpath(
+        save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-            '(//button[@type="submit"])[3]')
         form.find_element_by_id('id_start_date').clear()
         form.find_element_by_id('id_start_date').send_keys('3015-04-24')
 
@@ -654,16 +608,14 @@ class EventTest(LiveServerTestCase):
 
         # Attempt to save - should fail
         save.click()
-        error = self.browser.find_element_by_xpath(
+        error = self.browser.find_element_by_xpath('//div[contains(@class, "alert-danger")]')
-            '//div[contains(@class, "alert-danger")]')
         self.assertTrue(error.is_displayed())
-        self.assertIn("can't finish before it has started",
+        self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
-                      error.find_element_by_xpath('//dd[1]/ul/li').text)
+
 
         # 2 dates, end after start
         form = self.browser.find_element_by_tag_name('form')
-        save = self.browser.find_element_by_xpath(
+        save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-            '(//button[@type="submit"])[3]')
         form.find_element_by_id('id_start_date').clear()
         form.find_element_by_id('id_start_date').send_keys('3015-04-24')
 
@@ -680,17 +632,15 @@ class EventTest(LiveServerTestCase):
         # See redirected to success page
         successTitle = self.browser.find_element_by_xpath('//h1').text
         event = models.Event.objects.get(name='Test Event Name')
-        self.assertIn("N0000%d | Test Event Name" % event.pk, successTitle)
+        self.assertIn("N0000%d | Test Event Name"%event.pk, successTitle)
         
     def testRigNonRig(self):
         self.browser.get(self.live_server_url + '/event/create/')
         # Gets redirected to login and back
         self.authenticate('/event/create/')
 
-        # setup WebDriverWait to use later (to wait for animations)
+        wait = WebDriverWait(self.browser, 10) #setup WebDriverWait to use later (to wait for animations)
-        wait = WebDriverWait(self.browser, 10)
+        self.browser.implicitly_wait(3) #Set session-long wait (only works for non-existant DOM objects)
-        # Set session-long wait (only works for non-existant DOM objects)
-        self.browser.implicitly_wait(3)
 
         wait.until(animation_is_finished())
 
@@ -701,8 +651,7 @@ class EventTest(LiveServerTestCase):
         self.browser.find_element_by_xpath('//button[.="Rig"]').click()
 
         form = self.browser.find_element_by_tag_name('form')
-        save = self.browser.find_element_by_xpath(
+        save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
-            '(//button[@type="submit"])[3]')
 
         # Set title
         e = self.browser.find_element_by_id('id_name')
@@ -714,23 +663,16 @@ class EventTest(LiveServerTestCase):
 
         # Save the rig
         save.click()
-        detail_panel = self.browser.find_element_by_xpath(
+        detail_panel = self.browser.find_element_by_xpath("//div[@id='content']/div/div[6]/div/div")
-            "//div[@id='content']/div/div[6]/div/div")
         self.assertTrue(detail_panel.is_displayed())
         self.assertIn("Event Detail", detail_panel.text)
 
     def testEventDetail(self):
         with transaction.atomic(), reversion.create_revision():
-            person = models.Person(
+            person = models.Person(name="Event Detail Person", email="eventdetail@person.tests.rigs", phone="123 123")
-                name="Event Detail Person",
-                email="eventdetail@person.tests.rigs",
-                phone="123 123")
             person.save()
         with transaction.atomic(), reversion.create_revision():
-            organisation = models.Organisation(
+            organisation = models.Organisation(name="Event Detail Organisation", email="eventdetail@organisation.tests.rigs", phone="123 456").save()
-                name="Event Detail Organisation",
-                email="eventdetail@organisation.tests.rigs",
-                phone="123 456").save()
         with transaction.atomic(), reversion.create_revision():
             venue = models.Venue(name="Event Detail Venue").save()
         with transaction.atomic(), reversion.create_revision():
@@ -760,179 +702,56 @@ class EventTest(LiveServerTestCase):
                 order=2,
             ).save()
 
-        self.browser.get(self.live_server_url + '/event/%d' % event.pk)
-        self.authenticate('/event/%d/' % event.pk)
-        self.assertIn("N%05d | %s" % (event.pk, event.name),
-                      self.browser.find_element_by_xpath('//h1').text)
 
-        personPanel = self.browser.find_element_by_xpath(
+        self.browser.get(self.live_server_url + '/event/%d'%event.pk)
-            '//div[contains(text(), "Contact Details")]/..')
+        self.authenticate('/event/%d/'%event.pk)
-        self.assertEqual(person.name, personPanel.find_element_by_xpath(
+        self.assertIn("N%05d | %s"%(event.pk, event.name), self.browser.find_element_by_xpath('//h1').text)
-            '//dt[text()="Person"]/following-sibling::dd[1]').text)
-        self.assertEqual(person.email, personPanel.find_element_by_xpath(
-            '//dt[text()="Email"]/following-sibling::dd[1]').text)
-        self.assertEqual(person.phone, personPanel.find_element_by_xpath(
-            '//dt[text()="Phone Number"]/following-sibling::dd[1]').text)
 
-        organisationPanel = self.browser.find_element_by_xpath(
+        personPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..')
-            '//div[contains(text(), "Contact Details")]/..')
+        self.assertEqual(person.name, personPanel.find_element_by_xpath('//dt[text()="Person"]/following-sibling::dd[1]').text)
+        self.assertEqual(person.email, personPanel.find_element_by_xpath('//dt[text()="Email"]/following-sibling::dd[1]').text)
+        self.assertEqual(person.phone, personPanel.find_element_by_xpath('//dt[text()="Phone Number"]/following-sibling::dd[1]').text)
 
+        organisationPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Contact Details")]/..')
 
 class IcalTest(LiveServerTestCase):
+
     def setUp(self):
         self.all_events = set(range(1, 18))
         self.current_events = (1, 2, 3, 6, 7, 8, 10, 11, 12, 14, 15, 16, 18)
-        self.not_current_events = set(
+        self.not_current_events = set(self.all_events) - set(self.current_events)
-            self.all_events) - set(self.current_events)
 
-        self.vatrate = models.VatRate.objects.create(
+        self.vatrate = models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
-            start_at='2014-03-05', rate=0.20, comment='test1')
         self.profile = models.Profile(
             username="EventTest", first_name="Event", last_name="Test", initials="ETU", is_superuser=True)
         self.profile.set_password("EventTestPassword")
         self.profile.save()
 
-        # produce 7 normal events - 5 current - 1 last week - 1 two years ago -
+        # produce 7 normal events - 5 current - 1 last week - 1 two years ago - 2 provisional - 2 confirmed - 3 booked
-        # 2 provisional - 2 confirmed - 3 booked
+        models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=6), description="start future no end") 
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E2", status=models.Event.PROVISIONAL, start_date=date.today(), description="start today no end")
-            name="TE E1",
+        models.Event.objects.create(name="TE E3", status=models.Event.CONFIRMED, start_date=date.today(), end_date=date.today(), description="start today with end today")
-            status=models.Event.PROVISIONAL,
+        models.Event.objects.create(name="TE E4", status=models.Event.CONFIRMED, start_date=date.today()-timedelta(weeks=104), description="start past 2 years no end")
-            start_date=date.today() +
+        models.Event.objects.create(name="TE E5", status=models.Event.BOOKED, start_date=date.today()-timedelta(days=7), end_date=date.today()-timedelta(days=1), description="start past 1 week with end past")
-                       timedelta(
+        models.Event.objects.create(name="TE E6", status=models.Event.BOOKED, start_date=date.today()-timedelta(days=2), end_date=date.today()+timedelta(days=2), description="start past, end future")
-                           days=6),
+        models.Event.objects.create(name="TE E7", status=models.Event.BOOKED, start_date=date.today()+timedelta(days=2), end_date=date.today()+timedelta(days=2), description="start + end in future")
-            description="start future no end")
-        models.Event.objects.create(
-            name="TE E2",
-            status=models.Event.PROVISIONAL,
-            start_date=date.today(),
-            description="start today no end")
-        models.Event.objects.create(
-            name="TE E3",
-            status=models.Event.CONFIRMED,
-            start_date=date.today(),
-            end_date=date.today(),
-            description="start today with end today")
-        models.Event.objects.create(
-            name="TE E4",
-            status=models.Event.CONFIRMED,
-            start_date=date.today() -
-                       timedelta(
-                           weeks=104),
-            description="start past 2 years no end")
-        models.Event.objects.create(
-            name="TE E5",
-            status=models.Event.BOOKED,
-            start_date=date.today() -
-                       timedelta(
-                           days=7),
-            end_date=date.today() -
-                     timedelta(
-                         days=1),
-            description="start past 1 week with end past")
-        models.Event.objects.create(
-            name="TE E6",
-            status=models.Event.BOOKED,
-            start_date=date.today() -
-                       timedelta(
-                           days=2),
-            end_date=date.today() +
-                     timedelta(
-                         days=2),
-            description="start past, end future")
-        models.Event.objects.create(
-            name="TE E7",
-            status=models.Event.BOOKED,
-            start_date=date.today() +
-                       timedelta(
-                           days=2),
-            end_date=date.today() +
-                     timedelta(
-                         days=2),
-            description="start + end in future")
 
         # 2 cancelled - 1 current
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E8", start_date=date.today()+timedelta(days=2), end_date=date.today()+timedelta(days=2), status=models.Event.CANCELLED, description="cancelled in future")
-            name="TE E8",
+        models.Event.objects.create(name="TE E9", start_date=date.today()-timedelta(days=1), end_date=date.today()+timedelta(days=2), status=models.Event.CANCELLED, description="cancelled and started")
-            start_date=date.today() +
-                       timedelta(
-                           days=2),
-            end_date=date.today() +
-                     timedelta(
-                         days=2),
-            status=models.Event.CANCELLED,
-            description="cancelled in future")
-        models.Event.objects.create(
-            name="TE E9",
-            start_date=date.today() -
-                       timedelta(
-                           days=1),
-            end_date=date.today() +
-                     timedelta(
-                         days=2),
-            status=models.Event.CANCELLED,
-            description="cancelled and started")
 
         # 5 dry hire - 3 current - 1 cancelled
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E10", start_date=date.today(), dry_hire=True, description="dryhire today")
-            name="TE E10",
+        models.Event.objects.create(name="TE E11", start_date=date.today(), dry_hire=True, checked_in_by=self.profile, description="dryhire today, checked in")
-            start_date=date.today(),
+        models.Event.objects.create(name="TE E12", start_date=date.today()-timedelta(days=1), dry_hire=True, status=models.Event.BOOKED, description="dryhire past")
-            dry_hire=True,
+        models.Event.objects.create(name="TE E13", start_date=date.today()-timedelta(days=2), dry_hire=True, checked_in_by=self.profile, description="dryhire past checked in")
-            description="dryhire today")
+        models.Event.objects.create(name="TE E14", start_date=date.today(), dry_hire=True, status=models.Event.CANCELLED, description="dryhire today cancelled")
-        models.Event.objects.create(
-            name="TE E11",
-            start_date=date.today(),
-            dry_hire=True,
-            checked_in_by=self.profile,
-            description="dryhire today, checked in")
-        models.Event.objects.create(
-            name="TE E12",
-            start_date=date.today() -
-                       timedelta(
-                           days=1),
-            dry_hire=True,
-            status=models.Event.BOOKED,
-            description="dryhire past")
-        models.Event.objects.create(
-            name="TE E13",
-            start_date=date.today() -
-                       timedelta(
-                           days=2),
-            dry_hire=True,
-            checked_in_by=self.profile,
-            description="dryhire past checked in")
-        models.Event.objects.create(
-            name="TE E14",
-            start_date=date.today(),
-            dry_hire=True,
-            status=models.Event.CANCELLED,
-            description="dryhire today cancelled")
 
         # 4 non rig - 3 current
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E15", start_date=date.today(), is_rig=False, description="non rig today")
-            name="TE E15",
+        models.Event.objects.create(name="TE E16", start_date=date.today()+timedelta(days=1), is_rig=False, description="non rig tomorrow")
-            start_date=date.today(),
+        models.Event.objects.create(name="TE E17", start_date=date.today()-timedelta(days=1), is_rig=False, description="non rig yesterday")
-            is_rig=False,
+        models.Event.objects.create(name="TE E18", start_date=date.today(), is_rig=False, status=models.Event.CANCELLED, description="non rig today cancelled")
-            description="non rig today")
-        models.Event.objects.create(
-            name="TE E16",
-            start_date=date.today() +
-                       timedelta(
-                           days=1),
-            is_rig=False,
-            description="non rig tomorrow")
-        models.Event.objects.create(
-            name="TE E17",
-            start_date=date.today() -
-                       timedelta(
-                           days=1),
-            is_rig=False,
-            description="non rig yesterday")
-        models.Event.objects.create(
-            name="TE E18",
-            start_date=date.today(),
-            is_rig=False,
-            status=models.Event.CANCELLED,
-            description="non rig today cancelled")
 
         self.browser = webdriver.Firefox()
         self.browser.implicitly_wait(3) # Set implicit wait session wide
@@ -966,34 +785,24 @@ class IcalTest(LiveServerTestCase):
 
         # Completes and comes back to /user/
         # Checks that no api key is displayed
-        self.assertEqual("No API Key Generated", self.browser.find_element_by_xpath(
+        self.assertEqual("No API Key Generated", self.browser.find_element_by_xpath("//div[@id='content']/div/div/div[3]/dl[2]/dd").text)
-            "//div[@id='content']/div/div/div[3]/dl[2]/dd").text)
+        self.assertEqual("No API Key Generated", self.browser.find_element_by_css_selector("pre").text)
-        self.assertEqual("No API Key Generated",
-                         self.browser.find_element_by_css_selector("pre").text)
         
         # Now creates an API key, and check a URL is displayed one
         self.browser.find_element_by_link_text("Generate API Key").click()
-        self.assertIn(
+        self.assertIn("rigs.ics", self.browser.find_element_by_id("cal-url").text)
-            "rigs.ics",
-            self.browser.find_element_by_id("cal-url").text)
         self.assertNotIn("?", self.browser.find_element_by_id("cal-url").text)
         
         # Lets change everything so it's not the default value
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
         self.browser.find_element_by_xpath("//input[@value='non-rig']").click()
-        self.browser.find_element_by_xpath(
+        self.browser.find_element_by_xpath("//input[@value='dry-hire']").click()
-            "//input[@value='dry-hire']").click()
+        self.browser.find_element_by_xpath("//input[@value='cancelled']").click()
-        self.browser.find_element_by_xpath(
+        self.browser.find_element_by_xpath("//input[@value='provisional']").click()
-            "//input[@value='cancelled']").click()
+        self.browser.find_element_by_xpath("//input[@value='confirmed']").click()
-        self.browser.find_element_by_xpath(
-            "//input[@value='provisional']").click()
-        self.browser.find_element_by_xpath(
-            "//input[@value='confirmed']").click()
 
         # and then check the url is correct
-        self.assertIn(
+        self.assertIn("rigs.ics?rig=false&non-rig=false&dry-hire=false&cancelled=true&provisional=false&confirmed=false", self.browser.find_element_by_id("cal-url").text)
-            "rigs.ics?rig=false&non-rig=false&dry-hire=false&cancelled=true&provisional=false&confirmed=false",
-            self.browser.find_element_by_id("cal-url").text)
 
         # Awesome - all seems to work
 
@@ -1006,6 +815,8 @@ class IcalTest(LiveServerTestCase):
         # Now creates an API key, and check a URL is displayed one
         self.browser.find_element_by_link_text("Generate API Key").click()
 
+
+        
         c = Client()
         
         # Default settings - should have all non-cancelled events
@@ -1014,16 +825,17 @@ class IcalTest(LiveServerTestCase):
         response = c.get(icalUrl)
         self.assertEqual(200, response.status_code)
 
-        # Check has entire file
+        #Check has entire file
         self.assertIn("BEGIN:VCALENDAR", response.content)
         self.assertIn("END:VCALENDAR", response.content)
 
-        expectedIn = [1, 2, 3, 5, 6, 7, 10, 11, 12, 13, 15, 16, 17]
+        expectedIn= [1,2,3,5,6,7,10,11,12,13,15,16,17]
-        for test in range(1, 18):
+        for test in range(1,18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertIn("TE E"+str(test)+" ", response.content)
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotIn("TE E"+str(test)+" ", response.content)
+
 
         # Only dry hires
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -1033,72 +845,66 @@ class IcalTest(LiveServerTestCase):
         response = c.get(icalUrl)
         self.assertEqual(200, response.status_code)
 
-        expectedIn = [10, 11, 12, 13]
+        expectedIn= [10,11,12,13]
-        for test in range(1, 18):
+        for test in range(1,18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertIn("TE E"+str(test)+" ", response.content)
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotIn("TE E"+str(test)+" ", response.content)
+
 
         # Only provisional rigs
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
-        self.browser.find_element_by_xpath(
+        self.browser.find_element_by_xpath("//input[@value='dry-hire']").click()
-            "//input[@value='dry-hire']").click()
+        self.browser.find_element_by_xpath("//input[@value='confirmed']").click()
-        self.browser.find_element_by_xpath(
-            "//input[@value='confirmed']").click()
 
         icalUrl = self.browser.find_element_by_id("cal-url").text
         response = c.get(icalUrl)
         self.assertEqual(200, response.status_code)
 
-        expectedIn = [1, 2]
+        expectedIn= [1,2]
-        for test in range(1, 18):
+        for test in range(1,18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertIn("TE E"+str(test)+" ", response.content)
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotIn("TE E"+str(test)+" ", response.content)
 
         # Only cancelled non-rigs
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
         self.browser.find_element_by_xpath("//input[@value='non-rig']").click()
-        self.browser.find_element_by_xpath(
+        self.browser.find_element_by_xpath("//input[@value='provisional']").click()
-            "//input[@value='provisional']").click()
+        self.browser.find_element_by_xpath("//input[@value='cancelled']").click()
-        self.browser.find_element_by_xpath(
-            "//input[@value='cancelled']").click()
 
         icalUrl = self.browser.find_element_by_id("cal-url").text
         response = c.get(icalUrl)
         self.assertEqual(200, response.status_code)
 
-        expectedIn = [18]
+        expectedIn= [18]
-        for test in range(1, 18):
+        for test in range(1,18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertIn("TE E"+str(test)+" ", response.content)
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotIn("TE E"+str(test)+" ", response.content)
 
         # Nothing selected
         self.browser.find_element_by_xpath("//input[@value='non-rig']").click()
-        self.browser.find_element_by_xpath(
+        self.browser.find_element_by_xpath("//input[@value='cancelled']").click()
-            "//input[@value='cancelled']").click()
 
         icalUrl = self.browser.find_element_by_id("cal-url").text
         response = c.get(icalUrl)
         self.assertEqual(200, response.status_code)
 
-        expectedIn = []
+        expectedIn= []
-        for test in range(1, 18):
+        for test in range(1,18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertIn("TE E"+str(test)+" ", response.content)
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotIn("TE E"+str(test)+" ", response.content)
         
         # Wow - that was a lot of tests
 
-
 class animation_is_finished(object):
     """ Checks if animation is done """
-
     def __init__(self):
         pass
 

RIGS/test_models.py

@@ -1,11 +1,9 @@
-from datetime import date, timedelta, datetime, time
-from decimal import *
-
 import pytz
 from django.conf import settings
 from django.test import TestCase
-
 from RIGS import models
+from datetime import date, timedelta, datetime, time
+from decimal import *
 
 
 class ProfileTestCase(TestCase):
@@ -18,10 +16,8 @@ class ProfileTestCase(TestCase):
 
 class VatRateTestCase(TestCase):
     def setUp(self):
-        models.VatRate.objects.create(
+        models.VatRate.objects.create(start_at='2014-03-01', rate=0.20, comment='test1')
-            start_at='2014-03-01', rate=0.20, comment='test1')
+        models.VatRate.objects.create(start_at='2016-03-01', rate=0.15, comment='test2')
-        models.VatRate.objects.create(
-            start_at='2016-03-01', rate=0.15, comment='test2')
 
     def test_find_correct(self):
         r = models.VatRate.objects.find_rate('2015-03-01')
@@ -38,27 +34,18 @@ class EventTestCase(TestCase):
     def setUp(self):
         self.all_events = set(range(1, 18))
         self.current_events = (1, 2, 3, 6, 7, 8, 10, 11, 12, 14, 15, 16, 18)
-        self.not_current_events = set(
+        self.not_current_events = set(self.all_events) - set(self.current_events)
-            self.all_events) - set(self.current_events)
 
-        self.vatrate = models.VatRate.objects.create(
+        self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-            start_at='2014-03-05', rate=0.20, comment='test1')
+        self.profile = models.Profile.objects.create(username="testuser1", email="1@test.com")
-        self.profile = models.Profile.objects.create(
-            username="testuser1", email="1@test.com")
 
         # produce 7 normal events - 5 current
         models.Event.objects.create(name="TE E1", start_date=date.today() + timedelta(days=6),
                                     description="start future no end")
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E2", start_date=date.today(), description="start today no end")
-            name="TE E2",
-            start_date=date.today(),
-            description="start today no end")
         models.Event.objects.create(name="TE E3", start_date=date.today(), end_date=date.today(),
                                     description="start today with end today")
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E4", start_date='2014-03-20', description="start past no end")
-            name="TE E4",
-            start_date='2014-03-20',
-            description="start past no end")
         models.Event.objects.create(name="TE E5", start_date='2014-03-20', end_date='2014-03-21',
                                     description="start past with end past")
         models.Event.objects.create(name="TE E6", start_date=date.today() - timedelta(days=2),
@@ -75,11 +62,7 @@ class EventTestCase(TestCase):
                                     description="cancelled and started")
 
         # 5 dry hire - 3 current
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E10", start_date=date.today(), dry_hire=True, description="dryhire today")
-            name="TE E10",
-            start_date=date.today(),
-            dry_hire=True,
-            description="dryhire today")
         models.Event.objects.create(name="TE E11", start_date=date.today(), dry_hire=True, checked_in_by=self.profile,
                                     description="dryhire today, checked in")
         models.Event.objects.create(name="TE E12", start_date=date.today() - timedelta(days=1), dry_hire=True,
@@ -90,11 +73,7 @@ class EventTestCase(TestCase):
                                     status=models.Event.CANCELLED, description="dryhire today cancelled")
 
         # 4 non rig - 3 current
-        models.Event.objects.create(
+        models.Event.objects.create(name="TE E15", start_date=date.today(), is_rig=False, description="non rig today")
-            name="TE E15",
-            start_date=date.today(),
-            is_rig=False,
-            description="non rig today")
         models.Event.objects.create(name="TE E16", start_date=date.today() + timedelta(days=1), is_rig=False,
                                     description="non rig tomorrow")
         models.Event.objects.create(name="TE E17", start_date=date.today() - timedelta(days=1), is_rig=False,
@@ -104,8 +83,7 @@ class EventTestCase(TestCase):
 
     def test_count(self):
         # Santiy check we have the expected events created
-        self.assertEqual(models.Event.objects.count(), 18,
+        self.assertEqual(models.Event.objects.count(), 18, "Incorrect number of events, check setup")
-                         "Incorrect number of events, check setup")
 
     def test_rig_count(self):
         # by my count this is 7
@@ -115,16 +93,10 @@ class EventTestCase(TestCase):
         current_events = models.Event.objects.current_events()
         self.assertEqual(len(current_events), len(self.current_events))
         for eid in self.current_events:
-            self.assertIn(
+            self.assertIn(models.Event.objects.get(name="TE E%d" % eid), current_events)
-                models.Event.objects.get(
-                    name="TE E%d" %
-                         eid), current_events)
 
         for eid in self.not_current_events:
-            self.assertNotIn(
+            self.assertNotIn(models.Event.objects.get(name="TE E%d" % eid), current_events)
-                models.Event.objects.get(
-                    name="TE E%d" %
-                         eid), current_events)
 
     def test_related_venue(self):
         v1 = models.Venue.objects.create(name="TE V1")
@@ -232,43 +204,29 @@ class EventTestCase(TestCase):
         event.save()
 
     def test_earliest_time(self):
-        event = models.Event(name="TE ET", start_date=date(2016, 0o1, 0o1))
+        event = models.Event(name="TE ET", start_date=date(2016, 01, 01))
 
         # Just a start date
-        self.assertEqual(event.earliest_time, date(2016, 0o1, 0o1))
+        self.assertEqual(event.earliest_time, date(2016, 01, 01))
 
         # With start time
         event.start_time = time(9, 00)
-        self.assertEqual(
+        self.assertEqual(event.earliest_time, self.create_datetime(2016, 1, 1, 9, 00))
-            event.earliest_time,
-            self.create_datetime(
-                2016,
-                1,
-                1,
-                9,
-                00))
 
         # With access time
-        event.access_at = self.create_datetime(2015, 12, 0o3, 9, 57)
+        event.access_at = self.create_datetime(2015, 12, 03, 9, 57)
         self.assertEqual(event.earliest_time, event.access_at)
 
         # With meet time
-        event.meet_at = self.create_datetime(2015, 12, 0o3, 9, 55)
+        event.meet_at = self.create_datetime(2015, 12, 03, 9, 55)
         self.assertEqual(event.earliest_time, event.meet_at)
 
         # Check order isn't important
-        event.start_date = date(2015, 12, 0o3)
+        event.start_date = date(2015, 12, 03)
-        self.assertEqual(
+        self.assertEqual(event.earliest_time, self.create_datetime(2015, 12, 03, 9, 00))
-            event.earliest_time,
-            self.create_datetime(
-                2015,
-                12,
-                0o3,
-                9,
-                00))
 
     def test_latest_time(self):
-        event = models.Event(name="TE LT", start_date=date(2016, 0o1, 0o1))
+        event = models.Event(name="TE LT", start_date=date(2016, 01, 01))
 
         # Just start date
         self.assertEqual(event.latest_time, event.start_date)
@@ -279,48 +237,25 @@ class EventTestCase(TestCase):
 
         # With end time
         event.end_time = time(23, 00)
-        self.assertEqual(
+        self.assertEqual(event.latest_time, self.create_datetime(2016, 1, 2, 23, 00))
-            event.latest_time, self.create_datetime(
-                2016, 1, 2, 23, 00))
 
     def test_in_bounds(self):
         manager = models.Event.objects
         events = [
             manager.create(name="TE IB0", start_date='2016-01-02'),  # yes no
-            manager.create(
+            manager.create(name="TE IB1", start_date='2015-12-31', end_date='2016-01-04'),
-                name="TE IB1",
-                start_date='2015-12-31',
-                end_date='2016-01-04'),
 
             # basic checks
-            manager.create(
+            manager.create(name='TE IB2', start_date='2016-01-02', end_date='2016-01-04'),
-                name='TE IB2',
+            manager.create(name='TE IB3', start_date='2015-12-31', end_date='2016-01-03'),
-                start_date='2016-01-02',
+            manager.create(name='TE IB4', start_date='2016-01-04', access_at='2016-01-03'),
-                end_date='2016-01-04'),
+            manager.create(name='TE IB5', start_date='2016-01-04', meet_at='2016-01-02'),
-            manager.create(
-                name='TE IB3',
-                start_date='2015-12-31',
-                end_date='2016-01-03'),
-            manager.create(
-                name='TE IB4',
-                start_date='2016-01-04',
-                access_at='2016-01-03'),
-            manager.create(
-                name='TE IB5',
-                start_date='2016-01-04',
-                meet_at='2016-01-02'),
 
             # negative check
-            manager.create(
+            manager.create(name='TE IB6', start_date='2015-12-31', end_date='2016-01-01'),
-                name='TE IB6',
-                start_date='2015-12-31',
-                end_date='2016-01-01'),
         ]
 
-        in_bounds = manager.events_in_bounds(
+        in_bounds = manager.events_in_bounds(datetime(2016, 1, 2), datetime(2016, 1, 3))
-            datetime(
-                2016, 1, 2), datetime(
-                2016, 1, 3))
         self.assertIn(events[0], in_bounds)
         self.assertIn(events[1], in_bounds)
         self.assertIn(events[2], in_bounds)
@@ -337,14 +272,11 @@ class EventTestCase(TestCase):
 
 class EventItemTestCase(TestCase):
     def setUp(self):
-        self.e1 = models.Event.objects.create(
+        self.e1 = models.Event.objects.create(name="TI E1", start_date=date.today())
-            name="TI E1", start_date=date.today())
+        self.e2 = models.Event.objects.create(name="TI E2", start_date=date.today())
-        self.e2 = models.Event.objects.create(
-            name="TI E2", start_date=date.today())
 
     def test_item_cost(self):
-        item = models.EventItem.objects.create(
+        item = models.EventItem.objects.create(event=self.e1, name="TI I1", quantity=1, cost=1.00, order=1)
-            event=self.e1, name="TI I1", quantity=1, cost=1.00, order=1)
         self.assertEqual(item.total_cost, 1.00)
 
         item.cost = 2.50
@@ -357,10 +289,8 @@ class EventItemTestCase(TestCase):
         item.delete()
 
     def test_item_order(self):
-        i1 = models.EventItem.objects.create(
+        i1 = models.EventItem.objects.create(event=self.e1, name="TI I1", quantity=1, cost=1.00, order=1)
-            event=self.e1, name="TI I1", quantity=1, cost=1.00, order=1)
+        i2 = models.EventItem.objects.create(event=self.e1, name="TI I2", quantity=1, cost=1.00, order=2)
-        i2 = models.EventItem.objects.create(
-            event=self.e1, name="TI I2", quantity=1, cost=1.00, order=2)
 
         items = self.e1.items.all()
         self.assertListEqual([i1, i2], list(items))
@@ -368,29 +298,17 @@ class EventItemTestCase(TestCase):
 
 class EventPricingTestCase(TestCase):
     def setUp(self):
-        models.VatRate.objects.create(
+        models.VatRate.objects.create(rate=0.20, comment="TP V1", start_at='2013-01-01')
-            rate=0.20, comment="TP V1", start_at='2013-01-01')
+        models.VatRate.objects.create(rate=0.10, comment="TP V2", start_at=date.today() - timedelta(days=1))
-        models.VatRate.objects.create(
+        self.e1 = models.Event.objects.create(name="TP E1", start_date=date.today() - timedelta(days=2))
-            rate=0.10,
+        self.e2 = models.Event.objects.create(name="TP E2", start_date=date.today())
-            comment="TP V2",
-            start_at=date.today() -
-                     timedelta(
-                         days=1))
-        self.e1 = models.Event.objects.create(
-            name="TP E1", start_date=date.today() - timedelta(days=2))
-        self.e2 = models.Event.objects.create(
-            name="TP E2", start_date=date.today())
 
         # Create some items E1, total 70.40
         # Create some items E2, total 381.20
-        self.i1 = models.EventItem.objects.create(
+        self.i1 = models.EventItem.objects.create(event=self.e1, name="TP I1", quantity=1, cost=50.00, order=1)
-            event=self.e1, name="TP I1", quantity=1, cost=50.00, order=1)
+        self.i2 = models.EventItem.objects.create(event=self.e1, name="TP I2", quantity=2, cost=3.20, order=2)
-        self.i2 = models.EventItem.objects.create(
+        self.i3 = models.EventItem.objects.create(event=self.e1, name="TP I3", quantity=7, cost=2.00, order=3)
-            event=self.e1, name="TP I2", quantity=2, cost=3.20, order=2)
+        self.i4 = models.EventItem.objects.create(event=self.e2, name="TP I4", quantity=2, cost=190.60, order=1)
-        self.i3 = models.EventItem.objects.create(
-            event=self.e1, name="TP I3", quantity=7, cost=2.00, order=3)
-        self.i4 = models.EventItem.objects.create(
-            event=self.e2, name="TP I4", quantity=2, cost=190.60, order=1)
 
     # Decimal type is needed here as that is what is returned from the model.
     # Using anything else results in a failure due to floating point arritmetic

RIGS/test_unit.py

@@ -47,10 +47,7 @@ class TestAdminMergeObjects(TestCase):
     def setUp(self):
         self.profile.set_password('testuser')
         self.profile.save()
-        self.assertTrue(
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
-            self.client.login(
-                username=self.profile.username,
-                password='testuser'))
 
     def test_merge_confirmation(self):
         change_url = reverse('admin:RIGS_venue_changelist')
@@ -92,16 +89,10 @@ class TestAdminMergeObjects(TestCase):
         self.assertTrue(models.Venue.objects.get(pk=self.venues[1].pk))
 
         # Check the un-needed venue has been disposed of
-        self.assertRaises(
+        self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk)
-            ObjectDoesNotExist,
-            models.Venue.objects.get,
-            pk=self.venues[2].pk)
 
         # Check the one we didn't delete is still there
-        self.assertEqual(
+        self.assertEqual(models.Venue.objects.get(pk=self.venues[3].pk), self.venues[3])
-            models.Venue.objects.get(
-                pk=self.venues[3].pk),
-            self.venues[3])
 
         # Check the events have been moved to the master venue
         for key, event in self.events.iteritems():
@@ -127,16 +118,10 @@ class TestAdminMergeObjects(TestCase):
         self.assertTrue(models.Person.objects.get(pk=self.persons[1].pk))
 
         # Check the un-needed people have been disposed of
-        self.assertRaises(
+        self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[2].pk)
-            ObjectDoesNotExist,
-            models.Person.objects.get,
-            pk=self.persons[2].pk)
 
         # Check the one we didn't delete is still there
-        self.assertEqual(
+        self.assertEqual(models.Person.objects.get(pk=self.persons[3].pk), self.persons[3])
-            models.Person.objects.get(
-                pk=self.persons[3].pk),
-            self.persons[3])
 
         # Check the events have been moved to the master person
         for key, event in self.events.iteritems():
@@ -159,40 +144,25 @@ class TestAdminMergeObjects(TestCase):
         self.assertContains(response, self.organisations[1].name)
 
         # Check the master copy still exists
-        self.assertTrue(
+        self.assertTrue(models.Organisation.objects.get(pk=self.organisations[1].pk))
-            models.Organisation.objects.get(
-                pk=self.organisations[1].pk))
 
         # Check the un-needed organisations have been disposed of
-        self.assertRaises(
+        self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[2].pk)
-            ObjectDoesNotExist,
-            models.Organisation.objects.get,
-            pk=self.organisations[2].pk)
 
         # Check the one we didn't delete is still there
-        self.assertEqual(
+        self.assertEqual(models.Organisation.objects.get(pk=self.organisations[3].pk), self.organisations[3])
-            models.Organisation.objects.get(
-                pk=self.organisations[3].pk),
-            self.organisations[3])
 
         # Check the events have been moved to the master organisation
         for key, event in self.events.iteritems():
             updatedEvent = models.Event.objects.get(pk=event.pk)
-            if event.organisation == self.organisations[
+            if event.organisation == self.organisations[3]:  # The one we left in place
-                3]:  # The one we left in place
                 continue
             self.assertEqual(updatedEvent.organisation, self.organisations[1])
 
-
 class TestInvoiceDelete(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.profile = models.Profile.objects.create(
+        cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True)
-            username="testuser1",
-            email="1@test.com",
-            is_superuser=True,
-            is_active=True,
-            is_staff=True)
 
         cls.events = {
             1: models.Event.objects.create(name="TE E1", start_date=date.today()),
@@ -205,22 +175,16 @@ class TestInvoiceDelete(TestCase):
         }
 
         cls.payments = {
-            1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34,
+            1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH)
-                                             method=models.Payment.CASH)
         }
 
     def setUp(self):
         self.profile.set_password('testuser')
         self.profile.save()
-        self.assertTrue(
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
-            self.client.login(
-                username=self.profile.username,
-                password='testuser'))
 
     def test_invoice_delete_allowed(self):
-        request_url = reverse(
+        request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[2].pk})
-            'invoice_delete', kwargs={
-                'pk': self.invoices[2].pk})
 
         response = self.client.get(request_url, follow=True)
         self.assertContains(response, "Are you sure")
@@ -232,20 +196,13 @@ class TestInvoiceDelete(TestCase):
         response = self.client.post(request_url, follow=True)
 
         # Check the invoice is deleted
-        self.assertRaises(
+        self.assertRaises(ObjectDoesNotExist, models.Invoice.objects.get, pk=self.invoices[2].pk)
-            ObjectDoesNotExist,
-            models.Invoice.objects.get,
-            pk=self.invoices[2].pk)
 
     def test_invoice_delete_not_allowed(self):
-        request_url = reverse(
+        request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[1].pk})
-            'invoice_delete', kwargs={
-                'pk': self.invoices[1].pk})
 
         response = self.client.get(request_url, follow=True)
-        self.assertContains(
+        self.assertContains(response, "To delete an invoice, delete the payments first.")
-            response,
-            "To delete an invoice, delete the payments first.")
 
         # Check the invoice still exists
         self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
@@ -257,6 +214,87 @@ class TestInvoiceDelete(TestCase):
         self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
 
 
+class TestEmbeddedViews(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True)
+
+        cls.events = {
+            1: models.Event.objects.create(name="TE E1", start_date=date.today()),
+            2: models.Event.objects.create(name="TE E2", start_date=date.today())
+        }
+
+        cls.invoices = {
+            1: models.Invoice.objects.create(event=cls.events[1]),
+            2: models.Invoice.objects.create(event=cls.events[2])
+        }
+
+        cls.payments = {
+            1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH)
+        }
+
+    def setUp(self):
+        self.profile.set_password('testuser')
+        self.profile.save()
+
+    def testLoginRedirect(self):
+        request_url = reverse('event_embed', kwargs={'pk': 1})
+        expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
+
+        # Request the page and check it redirects
+        response = self.client.get(request_url, follow=True)
+        self.assertRedirects(response, expected_url, status_code=302, target_status_code=200)
+
+        # Now login
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+        # And check that it no longer redirects
+        response = self.client.get(request_url, follow=True)
+        self.assertEqual(len(response.redirect_chain), 0)
+
+    def testLoginCookieWarning(self):
+        login_url = reverse('login_embed')
+        response = self.client.post(login_url, follow=True)
+        self.assertContains(response, "Cookies do not seem to be enabled")
+
+    def testXFrameHeaders(self):
+        event_url = reverse('event_embed', kwargs={'pk': 1})
+        login_url = reverse('login_embed')
+
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+        response = self.client.get(event_url, follow=True)
+        with self.assertRaises(KeyError):
+            response._headers["X-Frame-Options"]
+
+        response = self.client.get(login_url, follow=True)
+        with self.assertRaises(KeyError):
+            response._headers["X-Frame-Options"]
+
+    def testOEmbed(self):
+        event_url = reverse('event_detail', kwargs={'pk': 1})
+        event_embed_url = reverse('event_embed', kwargs={'pk': 1})
+        oembed_url = reverse('event_oembed', kwargs={'pk': 1})
+
+        alt_oembed_url = reverse('event_oembed', kwargs={'pk': 999})
+        alt_event_embed_url = reverse('event_embed', kwargs={'pk': 999})
+
+        # Test the meta tag is in place
+        response = self.client.get(event_url, follow=True, HTTP_HOST='example.com')
+        self.assertContains(response, '<link rel="alternate" type="application/json+oembed"')
+        self.assertContains(response, oembed_url)
+
+        # Test that the JSON exists
+        response = self.client.get(oembed_url, follow=True, HTTP_HOST='example.com')
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, event_embed_url)
+
+        # Should also work for non-existant events
+        response = self.client.get(alt_oembed_url, follow=True, HTTP_HOST='example.com')
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, alt_event_embed_url)
+
+
 class TestSampleDataGenerator(TestCase):
     @override_settings(DEBUG=True)
     def test_generate_sample_data(self):
@@ -269,8 +307,4 @@ class TestSampleDataGenerator(TestCase):
     def test_production_exception(self):
         from django.core.management.base import CommandError
 
-        self.assertRaisesRegexp(
+        self.assertRaisesRegexp(CommandError, ".*production", call_command, 'generateSampleData')
-            CommandError,
-            ".*production",
-            call_command,
-            'generateSampleData')

RIGS/urls.py

@@ -1,225 +1,168 @@
 from django.conf.urls import patterns, url
 from django.contrib.auth.decorators import login_required
-from django.views.generic import RedirectView
-
-from PyRIGS.decorators import api_key_required
-from PyRIGS.decorators import permission_required_with_403
 from RIGS import models, views, rigboard, finance, ical, versioning, forms
+from django.views.generic import RedirectView
+from django.views.decorators.clickjacking import xframe_options_exempt
+
+from PyRIGS.decorators import permission_required_with_403
+from PyRIGS.decorators import api_key_required
 
 urlpatterns = patterns('',
                        # Examples:
                        # url(r'^$', 'PyRIGS.views.home', name='home'),
                        # url(r'^blog/', include('blog.urls')),
-                       url('^$', login_required(
+                       url('^$', login_required(views.Index.as_view()), name='index'),
-                           views.Index.as_view()), name='index'),
+                       url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'),
-                       url(r'^closemodal/$',
-                           views.CloseModal.as_view(),
-                           name='closemodal'),
 
                        url('^user/login/$', 'RIGS.views.login', name='login'),
-                       url(r'^user/password_reset/$',
+                       url('^user/login/embed/$', xframe_options_exempt(views.login_embed), name='login_embed'),
-                           'django.contrib.auth.views.password_reset',
+                       url(r'^user/password_reset/$', 'django.contrib.auth.views.password_reset', {'password_reset_form': forms.PasswordReset}),
-                           {'password_reset_form': forms.PasswordReset}),
 
                        # People
                        url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
                            name='person_list'),
                        url(r'^people/add/$',
-                           permission_required_with_403('RIGS.add_person')(
+                           permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()),
-                               views.PersonCreate.as_view()),
                            name='person_create'),
                        url(r'^people/(?P<pk>\d+)/$',
-                           permission_required_with_403('RIGS.view_person')(
+                           permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()),
-                               views.PersonDetail.as_view()),
                            name='person_detail'),
                        url(r'^people/(?P<pk>\d+)/history/$',
-                           permission_required_with_403('RIGS.view_person')(
+                           permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()),
-                               versioning.VersionHistory.as_view()),
                            name='person_history', kwargs={'model': models.Person}),
                        url(r'^people/(?P<pk>\d+)/edit/$',
-                           permission_required_with_403('RIGS.change_person')(
+                           permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()),
-                               views.PersonUpdate.as_view()),
                            name='person_update'),
 
                        # Organisations
                        url(r'^organisations/$',
-                           permission_required_with_403('RIGS.view_organisation')(
+                           permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()),
-                               views.OrganisationList.as_view()),
                            name='organisation_list'),
                        url(r'^organisations/add/$',
-                           permission_required_with_403('RIGS.add_organisation')(
+                           permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()),
-                               views.OrganisationCreate.as_view()),
                            name='organisation_create'),
                        url(r'^organisations/(?P<pk>\d+)/$',
-                           permission_required_with_403('RIGS.view_organisation')(
+                           permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
-                               views.OrganisationDetail.as_view()),
                            name='organisation_detail'),
                        url(r'^organisations/(?P<pk>\d+)/history/$',
-                           permission_required_with_403('RIGS.view_organisation')(
+                           permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()),
-                               versioning.VersionHistory.as_view()),
                            name='organisation_history', kwargs={'model': models.Organisation}),
                        url(r'^organisations/(?P<pk>\d+)/edit/$',
-                           permission_required_with_403('RIGS.change_organisation')(
+                           permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
-                               views.OrganisationUpdate.as_view()),
                            name='organisation_update'),
 
                        # Venues
                        url(r'^venues/$',
-                           permission_required_with_403('RIGS.view_venue')(
+                           permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
-                               views.VenueList.as_view()),
                            name='venue_list'),
                        url(r'^venues/add/$',
-                           permission_required_with_403('RIGS.add_venue')(
+                           permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
-                               views.VenueCreate.as_view()),
                            name='venue_create'),
                        url(r'^venues/(?P<pk>\d+)/$',
-                           permission_required_with_403('RIGS.view_venue')(
+                           permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
-                               views.VenueDetail.as_view()),
                            name='venue_detail'),
                        url(r'^venues/(?P<pk>\d+)/history/$',
-                           permission_required_with_403('RIGS.view_venue')(
+                           permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()),
-                               versioning.VersionHistory.as_view()),
                            name='venue_history', kwargs={'model': models.Venue}),
                        url(r'^venues/(?P<pk>\d+)/edit/$',
-                           permission_required_with_403('RIGS.change_venue')(
+                           permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
-                               views.VenueUpdate.as_view()),
                            name='venue_update'),
 
                        # Rigboard
-                       url(r'^rigboard/$',
+                       url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
-                           login_required(rigboard.RigboardIndex.as_view()),
+                       url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
-                           name='rigboard'),
+                       url(r'^rigboard/calendar/(?P<view>(month|week|day))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
-                       url(r'^rigboard/calendar/$',
+                       url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
-                           login_required()(rigboard.WebCalendar.as_view()),
+                       url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
-                           name='web_calendar'),
-                       url(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
-                           login_required()(rigboard.WebCalendar.as_view()),
-                           name='web_calendar'),
-                       url(
-                           r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
-                           login_required()(
-                               rigboard.WebCalendar.as_view()),
-                           name='web_calendar'),
-                       url(r'^rigboard/archive/$',
-                           RedirectView.as_view(permanent=True,
-                                                pattern_name='event_archive')),
                        url(r'^rigboard/activity/$',
-                           permission_required_with_403('RIGS.view_event')(
+                           permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
-                               versioning.ActivityTable.as_view()),
                            name='activity_table'),
                        url(r'^rigboard/activity/feed/$',
-                           permission_required_with_403('RIGS.view_event')(
+                           permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
-                               versioning.ActivityFeed.as_view()),
                            name='activity_feed'),
 
                        url(r'^event/(?P<pk>\d+)/$',
-                           permission_required_with_403('RIGS.view_event')(
+                           permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(rigboard.EventDetail.as_view()),
-                               rigboard.EventDetail.as_view()),
                            name='event_detail'),
+                       url(r'^event/(?P<pk>\d+)/embed/$',
+                           xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
+                           name='event_embed'),
+                       url(r'^event/(?P<pk>\d+)/oembed_json/$',
+                           rigboard.EventOembed.as_view(),
+                           name='event_oembed'),
                        url(r'^event/(?P<pk>\d+)/print/$',
-                           permission_required_with_403('RIGS.view_event')(
+                           permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
-                               rigboard.EventPrint.as_view()),
                            name='event_print'),
                        url(r'^event/create/$',
-                           permission_required_with_403('RIGS.add_event')(
+                           permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
-                               rigboard.EventCreate.as_view()),
                            name='event_create'),
                        url(r'^event/(?P<pk>\d+)/edit/$',
-                           permission_required_with_403('RIGS.change_event')(
+                           permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
-                               rigboard.EventUpdate.as_view()),
                            name='event_update'),
                        url(r'^event/(?P<pk>\d+)/duplicate/$',
-                           permission_required_with_403('RIGS.add_event')(
+                           permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
-                               rigboard.EventDuplicate.as_view()),
                            name='event_duplicate'),
                        url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
                            name='event_archive'),
 
                        url(r'^event/(?P<pk>\d+)/history/$',
-                           permission_required_with_403('RIGS.view_event')(
+                           permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
-                               versioning.VersionHistory.as_view()),
                            name='event_history', kwargs={'model': models.Event}),
 
+
+
                        # Finance
                        url(r'^invoice/$',
-                           permission_required_with_403('RIGS.view_invoice')(
+                           permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
-                               finance.InvoiceIndex.as_view()),
                            name='invoice_list'),
                        url(r'^invoice/archive/$',
-                           permission_required_with_403('RIGS.view_invoice')(
+                           permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
-                               finance.InvoiceArchive.as_view()),
                            name='invoice_archive'),
                        url(r'^invoice/waiting/$',
-                           permission_required_with_403('RIGS.add_invoice')(
+                           permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
-                               finance.InvoiceWaiting.as_view()),
                            name='invoice_waiting'),
 
                        url(r'^event/(?P<pk>\d+)/invoice/$',
-                           permission_required_with_403('RIGS.add_invoice')(
+                           permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
-                               finance.InvoiceEvent.as_view()),
                            name='invoice_event'),
 
                        url(r'^invoice/(?P<pk>\d+)/$',
-                           permission_required_with_403('RIGS.view_invoice')(
+                           permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
-                               finance.InvoiceDetail.as_view()),
                            name='invoice_detail'),
                        url(r'^invoice/(?P<pk>\d+)/print/$',
-                           permission_required_with_403('RIGS.view_invoice')(
+                           permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
-                               finance.InvoicePrint.as_view()),
                            name='invoice_print'),
                        url(r'^invoice/(?P<pk>\d+)/void/$',
-                           permission_required_with_403('RIGS.change_invoice')(
+                           permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
-                               finance.InvoiceVoid.as_view()),
                            name='invoice_void'),
                        url(r'^invoice/(?P<pk>\d+)/delete/$',
-                           permission_required_with_403('RIGS.change_invoice')(
+                           permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
-                               finance.InvoiceDelete.as_view()),
                            name='invoice_delete'),
                        url(r'^payment/create/$',
-                           permission_required_with_403('RIGS.add_payment')(
+                           permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
-                               finance.PaymentCreate.as_view()),
                            name='payment_create'),
                        url(r'^payment/(?P<pk>\d+)/delete/$',
-                           permission_required_with_403('RIGS.add_payment')(
+                           permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
-                               finance.PaymentDelete.as_view()),
                            name='payment_delete'),
 
                        # User editing
-                       url(r'^user/$',
+                       url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
-                           login_required(views.ProfileDetail.as_view()),
-                           name='profile_detail'),
                        url(r'^user/(?P<pk>\d+)/$',
-                           permission_required_with_403('RIGS.view_profile')(
+                           permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
-                               views.ProfileDetail.as_view()),
                            name='profile_detail'),
                        url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()),
                            name='profile_update_self'),
-                       url(r'^user/reset_api_key$',
+                       url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)), name='reset_api_key'),
-                           login_required(
-                               views.ResetApiKey.as_view(
-                                   permanent=False)),
-                           name='reset_api_key'),
 
                        # ICS Calendar - API key authentication
-                       url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$',
+                       url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), name="ics_calendar"),
-                           api_key_required(ical.CalendarICS()), name="ics_calendar"),
 
                        # API
-                       url(r'^api/(?P<model>\w+)/$',
+                       url(r'^api/(?P<model>\w+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"),
-                           login_required(views.SecureAPIRequest.as_view()),
+                       url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"),
-                           name="api_secure"),
-                       url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$',
-                           login_required(views.SecureAPIRequest.as_view()),
-                           name="api_secure"),
 
                        # Legacy URL's
-                       url(r'^rig/show/(?P<pk>\d+)/$',
+                       url(r'^rig/show/(?P<pk>\d+)/$', RedirectView.as_view(permanent=True, pattern_name='event_detail')),
-                           RedirectView.as_view(permanent=True,
+                       url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
-                                                pattern_name='event_detail')),
+                       url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
-                       url(r'^bookings/$',
-                           RedirectView.as_view(permanent=True,
-                                                pattern_name='rigboard')),
-                       url(r'^bookings/past/$',
-                           RedirectView.as_view(permanent=True,
-                                                pattern_name='event_archive')),
                        )

RIGS/versioning.py

@@ -1,39 +1,37 @@
-import datetime
 import logging
 
-import reversion
-from diff_match_patch import diff_match_patch
-from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import IntegerField, EmailField, TextField
 from django.shortcuts import get_object_or_404
 from django.views import generic
 
+# Versioning
+import reversion
+from reversion.models import Version
+from django.contrib.contenttypes.models import ContentType  # Used to lookup the content_type
+from django.db.models import IntegerField, EmailField, TextField
+from diff_match_patch import diff_match_patch
+
 from RIGS import models
+import datetime
 
 logger = logging.getLogger('tec.pyrigs')
 
 
 def model_compare(oldObj, newObj, excluded_keys=[]):
-    # recieves two objects of the same model, and compares them. Returns an
+    # recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects
-    # array of FieldCompare objects
     try:
-        # This becomes deprecated in Django 1.8!!!!!!!!!!!!! (but an
+        theFields = oldObj._meta.fields  # This becomes deprecated in Django 1.8!!!!!!!!!!!!! (but an alternative becomes available)
-        # alternative becomes available)
-        theFields = oldObj._meta.fields
     except AttributeError:
         theFields = newObj._meta.fields
 
     class FieldCompare(object):
-
         def __init__(self, field=None, old=None, new=None):
             self.field = field
             self._old = old
             self._new = new
 
         def display_value(self, value):
-            if isinstance(self.field, IntegerField) and len(
+            if isinstance(self.field, IntegerField) and len(self.field.choices) > 0:
-                self.field.choices) > 0:
                 return [x[1] for x in self.field.choices if x[0] == value][0]
             return value
 
@@ -106,15 +104,13 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
 
 
 def compare_event_items(old, new):
-    # Recieves two event version objects and compares their items, returns an
+    # Recieves two event version objects and compares their items, returns an array of ItemCompare objects
-    # array of ItemCompare objects
 
     item_type = ContentType.objects.get_for_model(models.EventItem)
     old_item_versions = old.revision.version_set.filter(content_type=item_type)
     new_item_versions = new.revision.version_set.filter(content_type=item_type)
 
     class ItemCompare(object):
-
         def __init__(self, old=None, new=None, changes=None):
             self.old = old
             self.new = new
@@ -130,25 +126,18 @@ def compare_event_items(old, new):
     for version in new_item_versions:  # go through the new versions
         if version.field_dict["event"] == new.object_id_int:
             try:
-                # see if there's a matching old version
+                compare = item_dict[version.object_id]  # see if there's a matching old version
-                compare = item_dict[version.object_id]
+                compare.new = version.object_version.object  # then add the new version to the dictionary
-                # then add the new version to the dictionary
-                compare.new = version.object_version.object
             except KeyError:  # there's no matching old version, so add this item to the dictionary by itself
                 compare = ItemCompare(new=version.object_version.object)
 
-            # update the dictionary with the changes
+            item_dict[version.object_id] = compare  # update the dictionary with the changes
-            item_dict[version.object_id] = compare
 
     changes = []
     for (_, compare) in item_dict.items():
-        compare.changes = model_compare(
+        compare.changes = model_compare(compare.old, compare.new, ['id', 'event', 'order'])  # see what's changed
-            compare.old, compare.new, [
-                'id', 'event', 'order'])  # see what's changed
         if len(compare.changes) >= 1:
-            # transfer into a sequential array to make it easier to deal with
+            changes.append(compare)  # transfer into a sequential array to make it easier to deal with later
-            # later
-            changes.append(compare)
 
     return changes
 
@@ -169,8 +158,7 @@ def get_previous_version(version):
     thisId = version.object_id
     thisVersionId = version.pk
 
-    versions = reversion.get_for_object_reference(
+    versions = reversion.get_for_object_reference(version.content_type.model_class(), thisId)
-        version.content_type.model_class(), thisId)
 
     try:
         previousVersions = versions.filter(revision_id__lt=version.revision_id).latest(
@@ -185,7 +173,7 @@ def get_changes_for_version(newVersion, oldVersion=None):
     # Pass in a previous version if you already know it (for efficiancy)
     # if not provided then it will be looked up in the database
 
-    if oldVersion is None:
+    if oldVersion == None:
         oldVersion = get_previous_version(newVersion)
 
     modelClass = newVersion.content_type.model_class()
@@ -204,8 +192,7 @@ def get_changes_for_version(newVersion, oldVersion=None):
 
     if oldVersion:
         compare['old'] = oldVersion.object_version.object
-        compare['field_changes'] = model_compare(
+        compare['field_changes'] = model_compare(compare['old'], compare['new'])
-            compare['old'], compare['new'])
         compare['item_changes'] = compare_event_items(oldVersion, newVersion)
 
     return compare
@@ -220,8 +207,7 @@ class VersionHistory(generic.ListView):
         thisModel = self.kwargs['model']
 
         # thisObject = get_object_or_404(thisModel, pk=self.kwargs['pk'])
-        versions = reversion.get_for_object_reference(
+        versions = reversion.get_for_object_reference(thisModel, self.kwargs['pk'])
-            thisModel, self.kwargs['pk'])
 
         return versions
 
@@ -239,8 +225,7 @@ class VersionHistory(generic.ListView):
             if versionNo >= len(versions) - 1:
                 thisItem = get_changes_for_version(thisVersion, None)
             else:
-                thisItem = get_changes_for_version(
+                thisItem = get_changes_for_version(thisVersion, versions[versionNo + 1])
-                    thisVersion, versions[versionNo + 1])
 
             items.append(thisItem)
 
@@ -256,8 +241,7 @@ class ActivityTable(generic.ListView):
     paginate_by = 25
 
     def get_queryset(self):
-        versions = get_versions_for_model(
+        versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation])
-            [models.Event, models.Venue, models.Person, models.Organisation])
         return versions
 
     def get_context_data(self, **kwargs):
@@ -281,17 +265,14 @@ class ActivityFeed(generic.ListView):
     paginate_by = 25
 
     def get_queryset(self):
-        versions = get_versions_for_model(
+        versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation])
-            [models.Event, models.Venue, models.Person, models.Organisation])
         return versions
 
     def get_context_data(self, **kwargs):
         maxTimeDelta = []
 
-        maxTimeDelta.append({'maxAge': datetime.timedelta(
+        maxTimeDelta.append({'maxAge': datetime.timedelta(days=1), 'group': datetime.timedelta(hours=1)})
-            days=1), 'group': datetime.timedelta(hours=1)})
+        maxTimeDelta.append({'maxAge': None, 'group': datetime.timedelta(days=1)})
-        maxTimeDelta.append(
-            {'maxAge': None, 'group': datetime.timedelta(days=1)})
 
         # Call the base implementation first to get a context
         context = super(ActivityFeed, self).get_context_data(**kwargs)
@@ -300,23 +281,19 @@ class ActivityFeed(generic.ListView):
 
         for thisVersion in context['object_list']:
             thisItem = get_changes_for_version(thisVersion, None)
-            if thisItem['item_changes'] or thisItem[
+            if thisItem['item_changes'] or thisItem['field_changes'] or thisItem['old'] == None:
-                'field_changes'] or thisItem['old'] is None:
                 thisItem['withPrevious'] = False
                 if len(items) >= 1:
                     timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem[
                         'revision'].date_created
-                    timeDiff = items[-1]['revision'].date_created - \
+                    timeDiff = items[-1]['revision'].date_created - thisItem['revision'].date_created
-                               thisItem['revision'].date_created
                     timeTogether = False
                     for params in maxTimeDelta:
-                        if params['maxAge'] is None or timeAgo <= params[
+                        if params['maxAge'] is None or timeAgo <= params['maxAge']:
-                            'maxAge']:
                             timeTogether = timeDiff < params['group']
                             break
 
-                    sameUser = thisItem[
+                    sameUser = thisItem['revision'].user == items[-1]['revision'].user
-                                   'revision'].user == items[-1]['revision'].user
                     thisItem['withPrevious'] = timeTogether & sameUser
 
                 items.append(thisItem)

RIGS/views.py

@@ -1,25 +1,25 @@
-import datetime
+from django.core.exceptions import PermissionDenied
-import operator
+from django.http.response import HttpResponseRedirect
-from functools import reduce
+from django.http import HttpResponse
-
+from django.core.urlresolvers import reverse_lazy, reverse, NoReverseMatch
+from django.views import generic
+from django.db.models import Q
+from django.shortcuts import get_object_or_404
+from django.core import serializers
+from django.conf import settings
 import simplejson
 from django.contrib import messages
-from django.core import serializers
+import datetime, pytz
-from django.core.exceptions import PermissionDenied
+import operator
-from django.core.urlresolvers import reverse_lazy, reverse, NoReverseMatch
+from registration.views import RegistrationView
-from django.db.models import Q
+from django.views.decorators.csrf import csrf_exempt
-from django.http import HttpResponse
-from django.http.response import HttpResponseRedirect
-from django.shortcuts import get_object_or_404
-from django.views import generic
 
-from RIGS import models
+
+from RIGS import models, forms
 
 """
 Displays the current rig count along with a few other bits and pieces
 """
-
-
 class Index(generic.TemplateView):
     template_name = 'RIGS/index.html'
 
@@ -28,24 +28,45 @@ class Index(generic.TemplateView):
         context['rig_count'] = models.Event.objects.rig_count()
         return context
 
-
 def login(request, **kwargs):
     if request.user.is_authenticated():
         next = request.REQUEST.get('next', '/')
-        return HttpResponseRedirect(request.REQUEST.get('next', '/'))
+        return HttpResponseRedirect(next)
     else:
         from django.contrib.auth.views import login
 
         return login(request)
 
 
+# This view should be exempt from requiring CSRF token.
+# Then we can check for it and show a nice error
+# Don't worry, django.contrib.auth.views.login will
+# check for it before logging  the user in
+@csrf_exempt
+def login_embed(request, **kwargs):
+    print("Running LOGIN")
+    if request.user.is_authenticated():
+        next = request.REQUEST.get('next', '/')
+        return HttpResponseRedirect(next)
+    else:
+        from django.contrib.auth.views import login
+
+        if request.method == "POST":
+            csrf_cookie = request.COOKIES.get('csrftoken', None)
+
+            if csrf_cookie is None:
+                messages.warning(request, 'Cookies do not seem to be enabled. Try logging in using a new tab.')
+                request.method = 'GET'  # Render the page without trying to login
+
+        return login(request, template_name="registration/login_embed.html")
+
+
+
 """
 Called from a modal window (e.g. when an item is submitted to an event/invoice).
 May optionally also include some javascript in a success message to cause a load of
 the new information onto the page.
 """
-
-
 class CloseModal(generic.TemplateView):
     template_name = 'closemodal.html'
 
@@ -60,8 +81,7 @@ class PersonList(generic.ListView):
     def get_queryset(self):
         q = self.request.GET.get('q', "")
         if len(q) >= 3:
-            object_list = self.model.objects.filter(
+            object_list = self.model.objects.filter(Q(name__icontains=q) | Q(email__icontains=q))
-                Q(name__icontains=q) | Q(email__icontains=q))
         else:
             object_list = self.model.objects.all()
         orderBy = self.request.GET.get('orderBy', None)
@@ -76,22 +96,14 @@ class PersonDetail(generic.DetailView):
 
 class PersonCreate(generic.CreateView):
     model = models.Person
-    fields = ['name', 'phone', 'email', 'address', 'notes']
+    fields = ['name','phone','email','address','notes']
 
     def get_success_url(self):
         if self.request.is_ajax():
             url = reverse_lazy('closemodal')
-            update_url = str(
+            update_url = str(reverse_lazy('person_update',kwargs={'pk':self.object.pk}))
-                reverse_lazy(
+            messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
-                    'person_update', kwargs={
+            messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'")
-                        'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" +
-                          serializers.serialize("json", [self.object]))
-            messages.info(
-                self.request,
-                "modalobject[0]['update_url']='" +
-                update_url +
-                "'")
         else:
             url =  reverse_lazy('person_detail', kwargs={
                 'pk': self.object.pk,
@@ -101,22 +113,14 @@ class PersonCreate(generic.CreateView):
 
 class PersonUpdate(generic.UpdateView):
     model = models.Person
-    fields = ['name', 'phone', 'email', 'address', 'notes']
+    fields = ['name','phone','email','address','notes']
 
     def get_success_url(self):
         if self.request.is_ajax():
             url = reverse_lazy('closemodal')
-            update_url = str(
+            update_url = str(reverse_lazy('person_update',kwargs={'pk':self.object.pk}))
-                reverse_lazy(
+            messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
-                    'person_update', kwargs={
+            messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'")
-                        'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" +
-                          serializers.serialize("json", [self.object]))
-            messages.info(
-                self.request,
-                "modalobject[0]['update_url']='" +
-                update_url +
-                "'")
         else:
             url =  reverse_lazy('person_detail', kwargs={
                 'pk': self.object.pk,
@@ -131,8 +135,7 @@ class OrganisationList(generic.ListView):
     def get_queryset(self):
         q = self.request.GET.get('q', "")
         if len(q) >= 3:
-            object_list = self.model.objects.filter(
+            object_list = self.model.objects.filter(Q(name__icontains=q) | Q(address__icontains=q))
-                Q(name__icontains=q) | Q(address__icontains=q))
         else:
             object_list = self.model.objects.all()
         orderBy = self.request.GET.get('orderBy', "")
@@ -147,23 +150,14 @@ class OrganisationDetail(generic.DetailView):
 
 class OrganisationCreate(generic.CreateView):
     model = models.Organisation
-    fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
+    fields = ['name','phone','email','address','notes','union_account']
 
     def get_success_url(self):
         if self.request.is_ajax():
             url = reverse_lazy('closemodal')
-            update_url = str(
+            update_url = str(reverse_lazy('organisation_update',kwargs={'pk':self.object.pk}))
-                reverse_lazy(
+            messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
-                    'organisation_update',
+            messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'")
-                    kwargs={
-                        'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" +
-                          serializers.serialize("json", [self.object]))
-            messages.info(
-                self.request,
-                "modalobject[0]['update_url']='" +
-                update_url +
-                "'")
         else:
             url =  reverse_lazy('organisation_detail', kwargs={
                 'pk': self.object.pk,
@@ -173,23 +167,14 @@ class OrganisationCreate(generic.CreateView):
 
 class OrganisationUpdate(generic.UpdateView):
     model = models.Organisation
-    fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
+    fields = ['name','phone','email','address','notes','union_account']
 
     def get_success_url(self):
         if self.request.is_ajax():
             url = reverse_lazy('closemodal')
-            update_url = str(
+            update_url = str(reverse_lazy('organisation_update',kwargs={'pk':self.object.pk}))
-                reverse_lazy(
+            messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
-                    'organisation_update',
+            messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'")
-                    kwargs={
-                        'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" +
-                          serializers.serialize("json", [self.object]))
-            messages.info(
-                self.request,
-                "modalobject[0]['update_url']='" +
-                update_url +
-                "'")
         else:
             url =  reverse_lazy('organisation_detail', kwargs={
                 'pk': self.object.pk,
@@ -204,8 +189,7 @@ class VenueList(generic.ListView):
     def get_queryset(self):
         q = self.request.GET.get('q', "")
         if len(q) >= 3:
-            object_list = self.model.objects.filter(
+            object_list = self.model.objects.filter(Q(name__icontains=q) | Q(address__icontains=q))
-                Q(name__icontains=q) | Q(address__icontains=q))
         else:
             object_list = self.model.objects.all()
         orderBy = self.request.GET.get('orderBy', "")
@@ -220,28 +204,14 @@ class VenueDetail(generic.DetailView):
 
 class VenueCreate(generic.CreateView):
     model = models.Venue
-    fields = [
+    fields = ['name','phone','email','address','notes','three_phase_available']
-        'name',
-        'phone',
-        'email',
-        'address',
-        'notes',
-        'three_phase_available']
 
     def get_success_url(self):
         if self.request.is_ajax():
             url = reverse_lazy('closemodal')
-            update_url = str(
+            update_url = str(reverse_lazy('venue_update',kwargs={'pk':self.object.pk}))
-                reverse_lazy(
+            messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
-                    'venue_update', kwargs={
+            messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'")
-                        'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" +
-                          serializers.serialize("json", [self.object]))
-            messages.info(
-                self.request,
-                "modalobject[0]['update_url']='" +
-                update_url +
-                "'")
         else:
             url =  reverse_lazy('venue_detail', kwargs={
                 'pk': self.object.pk,
@@ -251,28 +221,14 @@ class VenueCreate(generic.CreateView):
 
 class VenueUpdate(generic.UpdateView):
     model = models.Venue
-    fields = [
+    fields = ['name','phone','email','address','notes','three_phase_available']
-        'name',
-        'phone',
-        'email',
-        'address',
-        'notes',
-        'three_phase_available']
 
     def get_success_url(self):
         if self.request.is_ajax():
             url = reverse_lazy('closemodal')
-            update_url = str(
+            update_url = str(reverse_lazy('venue_update',kwargs={'pk':self.object.pk}))
-                reverse_lazy(
+            messages.info(self.request, "modalobject="+serializers.serialize("json", [self.object]))
-                    'venue_update', kwargs={
+            messages.info(self.request, "modalobject[0]['update_url']='"+update_url+"'")
-                        'pk': self.object.pk}))
-            messages.info(self.request, "modalobject=" +
-                          serializers.serialize("json", [self.object]))
-            messages.info(
-                self.request,
-                "modalobject[0]['update_url']='" +
-                update_url +
-                "'")
         else:
             url =  reverse_lazy('venue_detail', kwargs={
                 'pk': self.object.pk,
@@ -344,6 +300,7 @@ class SecureAPIRequest(generic.View):
                     qs.append(q)
                 queries.append(reduce(operator.or_, qs))
 
+
             # Build the data response list
             results = []
             query = reduce(operator.and_, queries)
@@ -355,30 +312,24 @@ class SecureAPIRequest(generic.View):
                     'label': o.name,
                 }
                 try: # See if there is a valid update URL
-                    data['update'] = reverse(
+                    data['update'] = reverse("%s_update" % model, kwargs={'pk': o.pk})
-                        "%s_update" %
-                        model, kwargs={
-                            'pk': o.pk})
                 except NoReverseMatch:
                     pass
                 results.append(data)
 
             # return a data response
             json = simplejson.dumps(results)
-            return HttpResponse(
+            return HttpResponse(json, content_type="application/json")  # Always json
-                json, content_type="application/json")  # Always json
 
         start = request.GET.get('start', None)
         end = request.GET.get('end', None)
 
         if model == "event" and start and end:
             # Probably a calendar request
-            start_datetime = datetime.datetime.strptime(
+            start_datetime = datetime.datetime.strptime( start, "%Y-%m-%dT%H:%M:%S" )
-                start, "%Y-%m-%dT%H:%M:%S")
+            end_datetime = datetime.datetime.strptime( end, "%Y-%m-%dT%H:%M:%S" )
-            end_datetime = datetime.datetime.strptime(end, "%Y-%m-%dT%H:%M:%S")
 
-            objects = self.models[model].objects.events_in_bounds(
+            objects = self.models[model].objects.events_in_bounds(start_datetime,end_datetime)
-                start_datetime, end_datetime)
 
             results = []
             for item in objects:
@@ -394,12 +345,10 @@ class SecureAPIRequest(generic.View):
 
                 results.append(data)
             json = simplejson.dumps(results)
-            return HttpResponse(
+            return HttpResponse(json, content_type="application/json")  # Always json
-                json, content_type="application/json")  # Always json
 
         return HttpResponse(model)
 
-
 class ProfileDetail(generic.DetailView):
     model = models.Profile
 
@@ -412,7 +361,6 @@ class ProfileDetail(generic.DetailView):
 
         return self.model.objects.filter(pk=pk)
 
-
 class ProfileUpdateSelf(generic.UpdateView):
     model = models.Profile
     fields = ['first_name', 'last_name', 'email', 'initials', 'phone']
@@ -427,7 +375,6 @@ class ProfileUpdateSelf(generic.UpdateView):
         url =  reverse_lazy('profile_detail')
         return url
 
-
 class ResetApiKey(generic.RedirectView):
     def get_redirect_url(self, *args, **kwargs):
         self.request.user.api_key = self.request.user.make_api_key()

importer.py

@@ -14,11 +14,11 @@ from RIGS import models
 import reversion
 import datetime
 import uuid
+from multiprocessing import Process
 
 # Slight fix for needing to restablish the connection
 connection.close()
 
-
 def fix_email(email):
     if not (email is None or email is "") and ("@" not in email):
         email += "@nottingham.ac.uk"
@@ -110,8 +110,7 @@ def import_organisations(delete=False):
             notes = row[5]
 
         object, created = models.Organisation.objects.get_or_create(pk=row[0], name=row[1], phone=row[2],
-                                                                    address=row[
+                                                                    address=row[3],
-                                                                        3],
                                                                     union_account=row[4], notes=notes)
         if created:
             print("Created: " + object.__str__())
@@ -326,15 +325,13 @@ def import_invoices(delete=False):
             payment.save()
             print(payment)
 
-        if invoice.invoice_date < (
+        if invoice.invoice_date < (datetime.date.today() - datetime.timedelta(days=365)) and invoice.balance:
-                datetime.date.today() - datetime.timedelta(days=365)) and invoice.balance:
             p2 = models.Payment(amount=invoice.balance)
             p2.invoice = invoice
             p2.method = payment.ADJUSTMENT
             p2.date = datetime.date.today()
             p2.save()
 
-
 @transaction.atomic
 def main():
     # processs = []
@@ -360,28 +357,16 @@ def main():
     import_invoices(True)
 
     # Do this before doing non rigs else it gets ugly
-    sql = "SELECT setval(\'\"RIGS_%s_id_seq\"\', (SELECT MAX(id) FROM \"RIGS_%s\"));" % (
+    sql = "SELECT setval(\'\"RIGS_%s_id_seq\"\', (SELECT MAX(id) FROM \"RIGS_%s\"));" % ('event', 'event')
-        'event', 'event')
     cursor = connections['default'].cursor()
     cursor.execute(sql)
     import_nonrigs(False)
 
-    sequences = [
+    sequences = ['profile', 'person', 'organisation', 'vatrate', 'venue', 'event', 'eventitem', 'invoice', 'payment']
-        'profile',
-        'person',
-        'organisation',
-        'vatrate',
-        'venue',
-        'event',
-        'eventitem',
-        'invoice',
-        'payment']
     for seq in sequences:
-        sql = "SELECT setval(\'\"RIGS_%s_id_seq\"\', (SELECT MAX(id) FROM \"RIGS_%s\"));" % (
+        sql = "SELECT setval(\'\"RIGS_%s_id_seq\"\', (SELECT MAX(id) FROM \"RIGS_%s\"));" % (seq, seq)
-            seq, seq)
         cursor = connections['default'].cursor()
         cursor.execute(sql)
 
-
 if __name__ == "__main__":
     main()

templates/base_embed.html

@@ -0,0 +1,49 @@
+{% load static from staticfiles %}
+{% load raven %}
+
+<!DOCTYPE html>
+<html
+        dir="{% if LANGUAGE_BIDI %}rtl{% else %}ltr{% endif %}"
+        xml:lang="{% firstof LANGUAGE_CODE 'en' %}"
+        lang="{% firstof LANGUAGE_CODE 'en' %}"
+        class="embedded">
+<head>
+    <base target="_blank" />
+    <!-- Open all links in a new tab, not in the iframe -->
+
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet'
+          type='text/css'>
+
+    <link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
+
+    <script src="https://code.jquery.com/jquery-1.8.3.min.js"
+            integrity="sha256-YcbK69I5IXQftf/mYD8WY0/KmEDCv1asggHpJk1trM8=" crossorigin="anonymous"></script>
+    <script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script>
+    <script>Raven.config('{% sentry_public_dsn %}').install()</script>
+
+</head>
+
+<body>
+{% include "analytics.html" %}
+
+<div class="embed_container">
+    <div class="container-fluid">
+        {% if messages %}
+            {% for message in messages %}
+                <div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    {{ message }}
+                </div>
+            {% endfor %}
+        {% endif %}
+
+        {% block content %}
+        {% endblock %}
+    </div>
+</div>
+
+{% block js %}
+{% endblock %}
+</body>
+</html>

templates/login_redirect.html

@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+{% load staticfiles %}
+{% block title %}Login Required{% endblock %}
+
+{% block js %}
+	<script>
+	document.location = "{{login_url}}"
+	</script>
+{% endblock %}
+
+{% block extra-head %}
+	{% if oembed_url %}
+	<link rel="alternate" type="application/json+oembed"
+	  href="{{oembed_url}}"
+	  title="RIGS Embed" />
+	{% endif %}
+{% endblock %}
+
+{% block content %}
+    <div class="text-center">
+        <h2>Login is required for this page</h2>
+        <a href="{{login_url}}" class="btn btn-primary">Login</a>
+    </div>
+{% endblock %}

templates/registration/login.html

@@ -3,5 +3,8 @@
 {% block title %}Login{% endblock %}
 
 {% block content %}
+<div class="text-center">
+	<h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
+</div>
 {% include 'registration/loginform.html' %}
 {% endblock %}

templates/registration/login_embed.html

@@ -0,0 +1,34 @@
+{% extends 'base_embed.html' %}
+{% load widget_tweaks %}
+
+{% block title %}Login{% endblock %}
+
+{% block content %}
+<div class="text-center">
+<h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
+</div>
+
+
+{% include 'form_errors.html' %}
+
+
+<div class="col-sm-6 col-sm-offset-3 col-lg-4 col-lg-offset-4">
+
+    <form id="loginForm" action="" method="post" role="form" target="_self">{% csrf_token %}
+        <div class="form-group">
+            <label for="id_username">{{ form.username.label }}</label>
+            {% render_field form.username class+="form-control" placeholder=form.username.label %}
+        </div>
+        <div class="form-group">
+            <label for="{{ form.password.id_for_label }}">{{ form.password.label }}</label>
+            {% render_field form.password class+="form-control" placeholder=form.password.label %}
+        </div>
+        <div class="text-right">
+            <input type="submit" value="Login" class="btn btn-primary"/>
+        </div>
+        <input type="hidden" name="next" value="{{ next }}"/>
+
+    </form>
+</div>
+
+{% endblock %}

templates/registration/loginform.html

@@ -3,7 +3,7 @@
 {% include 'form_errors.html' %}
 <div class="col-sm-6 col-sm-offset-3 col-lg-4 col-lg-offset-4">
 
-    <form action="{% url 'login' %}" method="post" role="form">{% csrf_token %}
+    <form action="{% url 'login' %}" method="post" role="form" target="_self">{% csrf_token %}
         <div class="form-group">
             <label for="id_username">{{ form.username.label }}</label>
             {% render_field form.username class+="form-control" placeholder=form.username.label autofocus="" %}
@@ -12,9 +12,11 @@
             <label for="{{ form.password.id_for_label }}">{{ form.password.label }}</label>
             {% render_field form.password class+="form-control" placeholder=form.password.label %}
         </div>
+        <div class="text-right">
             <a href="{% url 'registration_register' %}" class="btn">Register</a>
             <a href="{% url 'password_reset' %}" class="btn">Forgotten Password</a>
             <input type="submit" value="Login" class="btn btn-primary"/>
             <input type="hidden" name="next" value="{{ next }}"/>
+        </div>
     </form>
 </div>