From 46434977fb4b3f186f0044417f878cb59e890f26 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Apr 2016 04:18:19 +0100 Subject: [PATCH 01/67] Created merge admin action for Person, Venue and Organisation models. Added template. --- RIGS/admin.py | 46 +++++++++++++++++-- .../templates/RIGS/admin_associate_merge.html | 21 +++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 RIGS/templates/RIGS/admin_associate_merge.html diff --git a/RIGS/admin.py b/RIGS/admin.py index 18dc554e..a72c4705 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -4,16 +4,20 @@ from django.contrib.auth.admin import UserAdmin 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 + # Register your models here. -admin.site.register(models.Person, reversion.VersionAdmin) -admin.site.register(models.Organisation, reversion.VersionAdmin) admin.site.register(models.VatRate, reversion.VersionAdmin) -admin.site.register(models.Venue, reversion.VersionAdmin) admin.site.register(models.Event, reversion.VersionAdmin) admin.site.register(models.EventItem, reversion.VersionAdmin) admin.site.register(models.Invoice) admin.site.register(models.Payment) +@admin.register(models.Profile) class ProfileAdmin(UserAdmin): fieldsets = ( (None, {'fields': ('username', 'password')}), @@ -33,4 +37,38 @@ class ProfileAdmin(UserAdmin): form = forms.ProfileChangeForm add_form = forms.ProfileCreationForm -admin.site.register(models.Profile, ProfileAdmin) +@admin.register(models.Person, models.Organisation, models.Venue) +class AssociateAdmin(reversion.VersionAdmin): + list_display = ('id', 'name','number_of_events') + search_fields = ['id','name'] + + actions = ['merge'] + + def number_of_events(self,obj): + return obj.latest_events.count() + + def merge(self, request, queryset): + if request.POST.get('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(request, "An error occured. Did you select a 'master' record?",level=messages.ERROR) + return + + with transaction.atomic(), reversion.create_revision(): + for obj in queryset.exclude(pk = masterObjectPk): + events = obj.event_set.all() + for event in events: + masterObject.event_set.add(event) + obj.delete() + + self.message_user(request, "Objects successfully merged.") + return + else: # Present the confirmation screen + context = { + 'title': _("Are you sure?"), + 'queryset': queryset, + 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME, + } + return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context, current_app=self.admin_site.name) \ No newline at end of file diff --git a/RIGS/templates/RIGS/admin_associate_merge.html b/RIGS/templates/RIGS/admin_associate_merge.html new file mode 100644 index 00000000..e30b2e55 --- /dev/null +++ b/RIGS/templates/RIGS/admin_associate_merge.html @@ -0,0 +1,21 @@ +{% extends "admin/base_site.html" %} +{% load i18n l10n %} + +{% block content %} +
{% csrf_token %} +

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.

+ + {% for item in queryset %} + {{item.pk}} | {{item}}
+ {% endfor %} + +
+ {% for obj in queryset %} + + {% endfor %} + + + +
+
+{% endblock %} \ No newline at end of file From 33ce4b622d3a8e034178f0bee8a10d0f72caea3d Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Apr 2016 04:18:53 +0100 Subject: [PATCH 02/67] Fixed bug with versioning interface when related objects are deleted --- RIGS/versioning.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index 789fc5d7..c537de87 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -92,9 +92,16 @@ def model_compare(oldObj, newObj, excluded_keys=[]): if name in excluded_keys: continue # if we're excluding this field, skip over it - oldValue = getattr(oldObj, name, None) - newValue = getattr(newObj, name, None) + try: + oldValue = getattr(oldObj, name, None) + except ObjectDoesNotExist: + oldValue = None + try: + newValue = getattr(newObj, name, None) + except ObjectDoesNotExist: + newValue = None + try: bothBlank = (not oldValue) and (not newValue) if oldValue != newValue and not bothBlank: From ca6cddb3924bd185532a716ebb12aa9b79f951b7 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Apr 2016 11:50:34 +0100 Subject: [PATCH 03/67] Add comments display to versioning history (because why not). Maybe in future we could have a box people can type in before they save changes to an event... But that's a separate project --- RIGS/admin.py | 3 ++- RIGS/templates/RIGS/activity_feed_data.html | 3 +++ RIGS/templates/RIGS/activity_table.html | 2 ++ RIGS/templates/RIGS/version_history.html | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/RIGS/admin.py b/RIGS/admin.py index a72c4705..d8583e23 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -62,7 +62,8 @@ class AssociateAdmin(reversion.VersionAdmin): for event in events: masterObject.event_set.add(event) obj.delete() - + reversion.set_comment('Merging Objects') + self.message_user(request, "Objects successfully merged.") return else: # Present the confirmation screen diff --git a/RIGS/templates/RIGS/activity_feed_data.html b/RIGS/templates/RIGS/activity_feed_data.html index fc9af87e..e99baf8e 100644 --- a/RIGS/templates/RIGS/activity_feed_data.html +++ b/RIGS/templates/RIGS/activity_feed_data.html @@ -40,6 +40,9 @@ {% endif %} {% include 'RIGS/object_button.html' with object=version.new %} + {% if version.revision.comment %} + ({{ version.revision.comment }}) + {% endif %}

diff --git a/RIGS/templates/RIGS/activity_table.html b/RIGS/templates/RIGS/activity_table.html index bf625e44..1d491663 100644 --- a/RIGS/templates/RIGS/activity_table.html +++ b/RIGS/templates/RIGS/activity_table.html @@ -59,6 +59,7 @@ Version ID User Changes + Comment @@ -75,6 +76,7 @@ {% else %} {% include 'RIGS/version_changes.html' %} {% endif %} + {{ version.revision.comment }} {% endfor %} diff --git a/RIGS/templates/RIGS/version_history.html b/RIGS/templates/RIGS/version_history.html index 163a1ac5..924ea148 100644 --- a/RIGS/templates/RIGS/version_history.html +++ b/RIGS/templates/RIGS/version_history.html @@ -35,6 +35,7 @@ Version ID User Changes + Comment @@ -51,6 +52,9 @@ {% include 'RIGS/version_changes.html' %} {% endif %} + + {{ version.revision.comment }} + {% endif %} {% endfor %} From 03ca65602fd2e41a6556473820fa493c774e97c6 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Apr 2016 12:08:19 +0100 Subject: [PATCH 04/67] Allow sorting by number of events --- RIGS/admin.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RIGS/admin.py b/RIGS/admin.py index d8583e23..9bfcb3eb 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -9,6 +9,7 @@ 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 # Register your models here. admin.site.register(models.VatRate, reversion.VersionAdmin) @@ -44,9 +45,14 @@ class AssociateAdmin(reversion.VersionAdmin): actions = ['merge'] + def get_queryset(self, request): + return super(AssociateAdmin, self).get_queryset(request).annotate(event_count = Count('event')) + def number_of_events(self,obj): return obj.latest_events.count() + number_of_events.admin_order_field = 'event_count' + def merge(self, request, queryset): if request.POST.get('post'): # Has the user confirmed which is the master record? try: From 99dfdcd253a094f3eb4c5613f600024a60ef72a6 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Apr 2016 12:53:04 +0100 Subject: [PATCH 05/67] Make confirmation more useful --- RIGS/admin.py | 35 ++++++++++++++++--- .../templates/RIGS/admin_associate_merge.html | 25 +++++++++++-- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/RIGS/admin.py b/RIGS/admin.py index 9bfcb3eb..0dfafd7a 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -10,6 +10,7 @@ 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 # Register your models here. admin.site.register(models.VatRate, reversion.VersionAdmin) @@ -38,19 +39,19 @@ class ProfileAdmin(UserAdmin): form = forms.ProfileChangeForm add_form = forms.ProfileCreationForm -@admin.register(models.Person, models.Organisation, models.Venue) class AssociateAdmin(reversion.VersionAdmin): list_display = ('id', 'name','number_of_events') search_fields = ['id','name'] - + list_display_links = ['id','name'] actions = ['merge'] + merge_fields = ['name'] + def get_queryset(self, request): return super(AssociateAdmin, self).get_queryset(request).annotate(event_count = Count('event')) def number_of_events(self,obj): return obj.latest_events.count() - number_of_events.admin_order_field = 'event_count' def merge(self, request, queryset): @@ -73,9 +74,35 @@ class AssociateAdmin(reversion.VersionAdmin): self.message_user(request, "Objects successfully merged.") return else: # Present the confirmation screen + + class TempForm(ModelForm): + class Meta: + model = queryset.model + fields = self.merge_fields + + forms = [] + for obj in queryset: + forms.append(TempForm(instance=obj)) + context = { 'title': _("Are you sure?"), 'queryset': queryset, 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME, + 'forms': forms } - return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context, current_app=self.admin_site.name) \ No newline at end of file + return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context, current_app=self.admin_site.name) + +@admin.register(models.Person) +class PersonAdmin(AssociateAdmin): + list_display = ('id', 'name','phone','email','number_of_events') + merge_fields = ['name','phone','email','address','notes'] + +@admin.register(models.Venue) +class VenueAdmin(AssociateAdmin): + list_display = ('id', 'name','phone','email','number_of_events') + merge_fields = ['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 = ['name','phone','email','address','notes','union_account'] \ No newline at end of file diff --git a/RIGS/templates/RIGS/admin_associate_merge.html b/RIGS/templates/RIGS/admin_associate_merge.html index e30b2e55..2128725c 100644 --- a/RIGS/templates/RIGS/admin_associate_merge.html +++ b/RIGS/templates/RIGS/admin_associate_merge.html @@ -5,13 +5,32 @@
{% csrf_token %}

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.

- {% for item in queryset %} - {{item.pk}} | {{item}}
+ + {% for form in forms %} + {% if forloop.first %} + + + + {% for field in form %} + + {% endfor %} + + {% endif %} + + + + + {% for field in form %} + + {% endfor %} + {% endfor %} +
ID {{ field.label }}
{{form.instance.pk}} {{ field.value }}
+
{% for obj in queryset %} - + {% endfor %} From 44ccead0a46daea308a8657815170867f24bb43d Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Apr 2016 15:32:13 +0100 Subject: [PATCH 06/67] Added merge tests I feel like it should be possible to abstract some of these so that they're not copied out for each model, but not sure how to go about it... --- RIGS/test_unit.py | 139 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 RIGS/test_unit.py diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py new file mode 100644 index 00000000..b6fc8edd --- /dev/null +++ b/RIGS/test_unit.py @@ -0,0 +1,139 @@ +from django.core.urlresolvers import reverse +from django.test import TestCase +from datetime import date + +from RIGS import models +from django.core.exceptions import ObjectDoesNotExist + +class TestAdminMergeObjects(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.persons = { + 1: models.Person.objects.create(name="Person 1"), + 2: models.Person.objects.create(name="Person 2"), + 3: models.Person.objects.create(name="Person 3"), + } + + cls.organisations = { + 1: models.Organisation.objects.create(name="Organisation 1"), + 2: models.Organisation.objects.create(name="Organisation 2"), + 3: models.Organisation.objects.create(name="Organisation 3"), + } + + cls.venues = { + 1: models.Venue.objects.create(name="Venue 1"), + 2: models.Venue.objects.create(name="Venue 2"), + 3: models.Venue.objects.create(name="Venue 3"), + } + + cls.events = { + 1: models.Event.objects.create(name="TE E1", start_date=date.today(), person=cls.persons[1], organisation=cls.organisations[3], venue=cls.venues[2]), + 2: models.Event.objects.create(name="TE E2", start_date=date.today(), person=cls.persons[2], organisation=cls.organisations[2], venue=cls.venues[3]), + 3: models.Event.objects.create(name="TE E3", start_date=date.today(), person=cls.persons[3], organisation=cls.organisations[1], venue=cls.venues[1]), + 4: models.Event.objects.create(name="TE E4", start_date=date.today(), person=cls.persons[3], organisation=cls.organisations[3], venue=cls.venues[3]), + } + + def setUp(self): + self.profile.set_password('testuser') + self.profile.save() + self.assertTrue(self.client.login(username=self.profile.username, password='testuser')) + + def test_merge_confirmation(self): + change_url = reverse('admin:RIGS_venue_changelist') + data = { + 'action': 'merge', + '_selected_action': [unicode(val.pk) for key,val in self.venues.iteritems()] + + } + response = self.client.post(change_url, data, follow=True) + + self.assertContains(response, "The following objects will be merged") + for key,venue in self.venues.iteritems(): + self.assertContains(response, venue.name) + + def test_merge_no_master(self): + change_url = reverse('admin:RIGS_venue_changelist') + data = {'action': 'merge', + '_selected_action': [unicode(val.pk) for key,val in self.venues.iteritems()], + 'post':'yes', + } + response = self.client.post(change_url, data, follow=True) + + self.assertContains(response, "An error occured") + + def test_venue_merge(self): + change_url = reverse('admin:RIGS_venue_changelist') + + data = {'action': 'merge', + '_selected_action': [unicode(val.pk) for key,val in self.venues.iteritems()], + 'post':'yes', + 'master':self.venues[1].pk + } + + response = self.client.post(change_url, data, follow=True) + self.assertContains(response, "Objects successfully merged") + self.assertContains(response, self.venues[1].name) + + # Check the master copy still exists + self.assertTrue(models.Venue.objects.get(pk=self.venues[1].pk)) + + # Check the un-needed venues have been disposed of + self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk) + self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[3].pk) + + # Check the events have been moved to the master venue + for key,event in self.events.iteritems(): + updatedEvent = models.Event.objects.get(pk=event.pk) + self.assertEqual(updatedEvent.venue, self.venues[1]) + + def test_person_merge(self): + change_url = reverse('admin:RIGS_person_changelist') + + data = {'action': 'merge', + '_selected_action': [unicode(val.pk) for key,val in self.persons.iteritems()], + 'post':'yes', + 'master':self.persons[1].pk + } + + response = self.client.post(change_url, data, follow=True) + self.assertContains(response, "Objects successfully merged") + self.assertContains(response, self.persons[1].name) + + # Check the master copy still exists + self.assertTrue(models.Person.objects.get(pk=self.persons[1].pk)) + + # Check the un-needed people have been disposed of + self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[2].pk) + self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[3].pk) + + # Check the events have been moved to the master person + for key,event in self.events.iteritems(): + updatedEvent = models.Event.objects.get(pk=event.pk) + self.assertEqual(updatedEvent.person, self.persons[1]) + + def test_organisation_merge(self): + change_url = reverse('admin:RIGS_organisation_changelist') + + data = {'action': 'merge', + '_selected_action': [unicode(val.pk) for key,val in self.organisations.iteritems()], + 'post':'yes', + 'master':self.organisations[1].pk + } + + response = self.client.post(change_url, data, follow=True) + self.assertContains(response, "Objects successfully merged") + self.assertContains(response, self.organisations[1].name) + + # Check the master copy still exists + self.assertTrue(models.Organisation.objects.get(pk=self.organisations[1].pk)) + + # Check the un-needed organisations have been disposed of + self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[2].pk) + self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[3].pk) + + # 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) + self.assertEqual(updatedEvent.organisation, self.organisations[1]) \ No newline at end of file From ebe08c3bf1dc7b3dd9411c0de691bee9a91468eb Mon Sep 17 00:00:00 2001 From: Tom Price Date: Wed, 6 Apr 2016 21:52:25 +0100 Subject: [PATCH 07/67] Update tests to check items that aren't selected aren't affected. PEP8 format the file --- RIGS/test_unit.py | 226 +++++++++++++++++++++++++--------------------- 1 file changed, 122 insertions(+), 104 deletions(-) diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py index b6fc8edd..75fcca5a 100644 --- a/RIGS/test_unit.py +++ b/RIGS/test_unit.py @@ -5,135 +5,153 @@ from datetime import date from RIGS import models from django.core.exceptions import ObjectDoesNotExist + class TestAdminMergeObjects(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) + @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.persons = { - 1: models.Person.objects.create(name="Person 1"), - 2: models.Person.objects.create(name="Person 2"), - 3: models.Person.objects.create(name="Person 3"), - } + cls.persons = { + 1: models.Person.objects.create(name="Person 1"), + 2: models.Person.objects.create(name="Person 2"), + 3: models.Person.objects.create(name="Person 3"), + } - cls.organisations = { - 1: models.Organisation.objects.create(name="Organisation 1"), - 2: models.Organisation.objects.create(name="Organisation 2"), - 3: models.Organisation.objects.create(name="Organisation 3"), - } + cls.organisations = { + 1: models.Organisation.objects.create(name="Organisation 1"), + 2: models.Organisation.objects.create(name="Organisation 2"), + 3: models.Organisation.objects.create(name="Organisation 3"), + } - cls.venues = { - 1: models.Venue.objects.create(name="Venue 1"), - 2: models.Venue.objects.create(name="Venue 2"), - 3: models.Venue.objects.create(name="Venue 3"), - } + cls.venues = { + 1: models.Venue.objects.create(name="Venue 1"), + 2: models.Venue.objects.create(name="Venue 2"), + 3: models.Venue.objects.create(name="Venue 3"), + } - cls.events = { - 1: models.Event.objects.create(name="TE E1", start_date=date.today(), person=cls.persons[1], organisation=cls.organisations[3], venue=cls.venues[2]), - 2: models.Event.objects.create(name="TE E2", start_date=date.today(), person=cls.persons[2], organisation=cls.organisations[2], venue=cls.venues[3]), - 3: models.Event.objects.create(name="TE E3", start_date=date.today(), person=cls.persons[3], organisation=cls.organisations[1], venue=cls.venues[1]), - 4: models.Event.objects.create(name="TE E4", start_date=date.today(), person=cls.persons[3], organisation=cls.organisations[3], venue=cls.venues[3]), - } + cls.events = { + 1: models.Event.objects.create(name="TE E1", start_date=date.today(), person=cls.persons[1], + organisation=cls.organisations[3], venue=cls.venues[2]), + 2: models.Event.objects.create(name="TE E2", start_date=date.today(), person=cls.persons[2], + organisation=cls.organisations[2], venue=cls.venues[3]), + 3: models.Event.objects.create(name="TE E3", start_date=date.today(), person=cls.persons[3], + organisation=cls.organisations[1], venue=cls.venues[1]), + 4: models.Event.objects.create(name="TE E4", start_date=date.today(), person=cls.persons[3], + organisation=cls.organisations[3], venue=cls.venues[3]), + } - def setUp(self): - self.profile.set_password('testuser') - self.profile.save() - self.assertTrue(self.client.login(username=self.profile.username, password='testuser')) + def setUp(self): + self.profile.set_password('testuser') + self.profile.save() + self.assertTrue(self.client.login(username=self.profile.username, password='testuser')) - def test_merge_confirmation(self): - change_url = reverse('admin:RIGS_venue_changelist') - data = { - 'action': 'merge', - '_selected_action': [unicode(val.pk) for key,val in self.venues.iteritems()] + def test_merge_confirmation(self): + change_url = reverse('admin:RIGS_venue_changelist') + data = { + 'action': 'merge', + '_selected_action': [unicode(val.pk) for key, val in self.venues.iteritems()] - } - response = self.client.post(change_url, data, follow=True) + } + response = self.client.post(change_url, data, follow=True) - self.assertContains(response, "The following objects will be merged") - for key,venue in self.venues.iteritems(): - self.assertContains(response, venue.name) + self.assertContains(response, "The following objects will be merged") + for key, venue in self.venues.iteritems(): + self.assertContains(response, venue.name) - def test_merge_no_master(self): - change_url = reverse('admin:RIGS_venue_changelist') - data = {'action': 'merge', - '_selected_action': [unicode(val.pk) for key,val in self.venues.iteritems()], - 'post':'yes', - } - response = self.client.post(change_url, data, follow=True) + def test_merge_no_master(self): + change_url = reverse('admin:RIGS_venue_changelist') + data = {'action': 'merge', + '_selected_action': [unicode(val.pk) for key, val in self.venues.iteritems()], + 'post': 'yes', + } + response = self.client.post(change_url, data, follow=True) - self.assertContains(response, "An error occured") - - def test_venue_merge(self): - change_url = reverse('admin:RIGS_venue_changelist') + self.assertContains(response, "An error occured") - data = {'action': 'merge', - '_selected_action': [unicode(val.pk) for key,val in self.venues.iteritems()], - 'post':'yes', - 'master':self.venues[1].pk - } + def test_venue_merge(self): + change_url = reverse('admin:RIGS_venue_changelist') - response = self.client.post(change_url, data, follow=True) - self.assertContains(response, "Objects successfully merged") - self.assertContains(response, self.venues[1].name) + data = {'action': 'merge', + '_selected_action': [unicode(self.venues[1].pk), unicode(self.venues[2].pk)], + 'post': 'yes', + 'master': self.venues[1].pk + } - # Check the master copy still exists - self.assertTrue(models.Venue.objects.get(pk=self.venues[1].pk)) + response = self.client.post(change_url, data, follow=True) + self.assertContains(response, "Objects successfully merged") + self.assertContains(response, self.venues[1].name) - # Check the un-needed venues have been disposed of - self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk) - self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[3].pk) + # Check the master copy still exists + self.assertTrue(models.Venue.objects.get(pk=self.venues[1].pk)) - # Check the events have been moved to the master venue - for key,event in self.events.iteritems(): - updatedEvent = models.Event.objects.get(pk=event.pk) - self.assertEqual(updatedEvent.venue, self.venues[1]) + # Check the un-needed venue has been disposed of + self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk) - def test_person_merge(self): - change_url = reverse('admin:RIGS_person_changelist') + # Check the one we didn't delete is still there + self.assertEqual(models.Venue.objects.get(pk=self.venues[3].pk), self.venues[3]) - data = {'action': 'merge', - '_selected_action': [unicode(val.pk) for key,val in self.persons.iteritems()], - 'post':'yes', - 'master':self.persons[1].pk - } + # Check the events have been moved to the master venue + for key, event in self.events.iteritems(): + updatedEvent = models.Event.objects.get(pk=event.pk) + if event.venue == self.venues[3]: # The one we left in place + continue + self.assertEqual(updatedEvent.venue, self.venues[1]) - response = self.client.post(change_url, data, follow=True) - self.assertContains(response, "Objects successfully merged") - self.assertContains(response, self.persons[1].name) + def test_person_merge(self): + change_url = reverse('admin:RIGS_person_changelist') - # Check the master copy still exists - self.assertTrue(models.Person.objects.get(pk=self.persons[1].pk)) + data = {'action': 'merge', + '_selected_action': [unicode(self.persons[1].pk), unicode(self.persons[2].pk)], + 'post': 'yes', + 'master': self.persons[1].pk + } - # Check the un-needed people have been disposed of - self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[2].pk) - self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[3].pk) + response = self.client.post(change_url, data, follow=True) + self.assertContains(response, "Objects successfully merged") + self.assertContains(response, self.persons[1].name) - # Check the events have been moved to the master person - for key,event in self.events.iteritems(): - updatedEvent = models.Event.objects.get(pk=event.pk) - self.assertEqual(updatedEvent.person, self.persons[1]) + # Check the master copy still exists + self.assertTrue(models.Person.objects.get(pk=self.persons[1].pk)) - def test_organisation_merge(self): - change_url = reverse('admin:RIGS_organisation_changelist') + # Check the un-needed people have been disposed of + self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[2].pk) - data = {'action': 'merge', - '_selected_action': [unicode(val.pk) for key,val in self.organisations.iteritems()], - 'post':'yes', - 'master':self.organisations[1].pk - } + # Check the one we didn't delete is still there + self.assertEqual(models.Person.objects.get(pk=self.persons[3].pk), self.persons[3]) - response = self.client.post(change_url, data, follow=True) - self.assertContains(response, "Objects successfully merged") - self.assertContains(response, self.organisations[1].name) + # Check the events have been moved to the master person + for key, event in self.events.iteritems(): + updatedEvent = models.Event.objects.get(pk=event.pk) + if event.person == self.persons[3]: # The one we left in place + continue + self.assertEqual(updatedEvent.person, self.persons[1]) - # Check the master copy still exists - self.assertTrue(models.Organisation.objects.get(pk=self.organisations[1].pk)) + def test_organisation_merge(self): + change_url = reverse('admin:RIGS_organisation_changelist') - # Check the un-needed organisations have been disposed of - self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[2].pk) - self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[3].pk) + data = {'action': 'merge', + '_selected_action': [unicode(self.organisations[1].pk), unicode(self.organisations[2].pk)], + 'post': 'yes', + 'master': self.organisations[1].pk + } - # 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) - self.assertEqual(updatedEvent.organisation, self.organisations[1]) \ No newline at end of file + response = self.client.post(change_url, data, follow=True) + self.assertContains(response, "Objects successfully merged") + self.assertContains(response, self.organisations[1].name) + + # Check the master copy still exists + self.assertTrue(models.Organisation.objects.get(pk=self.organisations[1].pk)) + + # Check the un-needed organisations have been disposed of + self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[2].pk) + + # Check the one we didn't delete is still there + self.assertEqual(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[3]: # The one we left in place + continue + self.assertEqual(updatedEvent.organisation, self.organisations[1]) From 823db68a6a534e6f445f456c4893ff83cefaf742 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Wed, 6 Apr 2016 21:53:38 +0100 Subject: [PATCH 08/67] PEP8 format files --- RIGS/admin.py | 49 ++++++++++-------- RIGS/versioning.py | 122 ++++++++++++++++++++++++--------------------- 2 files changed, 92 insertions(+), 79 deletions(-) diff --git a/RIGS/admin.py b/RIGS/admin.py index 0dfafd7a..a351aed0 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -6,7 +6,7 @@ import reversion from django.contrib.admin import helpers from django.template.response import TemplateResponse -from django.contrib import messages +from django.contrib import messages from django.db import transaction from django.core.exceptions import ObjectDoesNotExist from django.db.models import Count @@ -19,16 +19,17 @@ admin.site.register(models.EventItem, reversion.VersionAdmin) admin.site.register(models.Invoice) admin.site.register(models.Payment) + @admin.register(models.Profile) class ProfileAdmin(UserAdmin): fieldsets = ( (None, {'fields': ('username', 'password')}), (_('Personal info'), { - 'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}), + 'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}), (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions')}), (_('Important dates'), { - 'fields': ('last_login', 'date_joined')}), + 'fields': ('last_login', 'date_joined')}), ) add_fieldsets = ( (None, { @@ -39,41 +40,43 @@ class ProfileAdmin(UserAdmin): form = forms.ProfileChangeForm add_form = forms.ProfileCreationForm + class AssociateAdmin(reversion.VersionAdmin): - list_display = ('id', 'name','number_of_events') - search_fields = ['id','name'] - list_display_links = ['id','name'] + list_display = ('id', 'name', 'number_of_events') + search_fields = ['id', 'name'] + list_display_links = ['id', 'name'] actions = ['merge'] merge_fields = ['name'] def get_queryset(self, request): - return super(AssociateAdmin, self).get_queryset(request).annotate(event_count = Count('event')) + return super(AssociateAdmin, self).get_queryset(request).annotate(event_count=Count('event')) - def number_of_events(self,obj): + def number_of_events(self, obj): return obj.latest_events.count() + number_of_events.admin_order_field = 'event_count' def merge(self, request, queryset): - if request.POST.get('post'): # Has the user confirmed which is the master record? + if request.POST.get('post'): # Has the user confirmed which is the master record? try: masterObjectPk = request.POST.get('master') - masterObject = queryset.get(pk = masterObjectPk) + masterObject = queryset.get(pk=masterObjectPk) except ObjectDoesNotExist: - self.message_user(request, "An error occured. Did you select a 'master' record?",level=messages.ERROR) + self.message_user(request, "An error occured. Did you select a 'master' record?", level=messages.ERROR) return with transaction.atomic(), reversion.create_revision(): - for obj in queryset.exclude(pk = masterObjectPk): + for obj in queryset.exclude(pk=masterObjectPk): events = obj.event_set.all() for event in events: masterObject.event_set.add(event) - obj.delete() + obj.delete() reversion.set_comment('Merging Objects') self.message_user(request, "Objects successfully merged.") return - else: # Present the confirmation screen + else: # Present the confirmation screen class TempForm(ModelForm): class Meta: @@ -90,19 +93,23 @@ class AssociateAdmin(reversion.VersionAdmin): 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME, 'forms': forms } - return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context, current_app=self.admin_site.name) + return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context, + current_app=self.admin_site.name) + @admin.register(models.Person) class PersonAdmin(AssociateAdmin): - list_display = ('id', 'name','phone','email','number_of_events') - merge_fields = ['name','phone','email','address','notes'] + list_display = ('id', 'name', 'phone', 'email', 'number_of_events') + merge_fields = ['name', 'phone', 'email', 'address', 'notes'] + @admin.register(models.Venue) class VenueAdmin(AssociateAdmin): - list_display = ('id', 'name','phone','email','number_of_events') - merge_fields = ['name','phone','email','address','notes','three_phase_available'] + list_display = ('id', 'name', 'phone', 'email', 'number_of_events') + merge_fields = ['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 = ['name','phone','email','address','notes','union_account'] \ No newline at end of file + list_display = ('id', 'name', 'phone', 'email', 'number_of_events') + merge_fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account'] diff --git a/RIGS/versioning.py b/RIGS/versioning.py index c537de87..36786a74 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -14,7 +14,7 @@ from django.core.exceptions import ObjectDoesNotExist import reversion import simplejson from reversion.models import Version -from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type +from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.db.models import ForeignKey, IntegerField, EmailField, TextField from diff_match_patch import diff_match_patch @@ -29,11 +29,10 @@ logger = logging.getLogger('tec.pyrigs') def model_compare(oldObj, newObj, excluded_keys=[]): # recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects try: - theFields = oldObj._meta.fields #This becomes deprecated in Django 1.8!!!!!!!!!!!!! (but an alternative becomes available) + theFields = oldObj._meta.fields # This becomes deprecated in Django 1.8!!!!!!!!!!!!! (but an alternative becomes available) except AttributeError: theFields = newObj._meta.fields - class FieldCompare(object): def __init__(self, field=None, old=None, new=None): self.field = field @@ -51,13 +50,13 @@ def model_compare(oldObj, newObj, excluded_keys=[]): @property def new(self): - return self.display_value(self._new) + return self.display_value(self._new) @property def long(self): if isinstance(self.field, EmailField): return True - return False + return False @property def linebreaks(self): @@ -76,21 +75,21 @@ def model_compare(oldObj, newObj, excluded_keys=[]): outputDiffs = [] for (op, data) in diffs: - if op == dmp.DIFF_INSERT: - outputDiffs.append({'type':'insert', 'text':data}) - elif op == dmp.DIFF_DELETE: - outputDiffs.append({'type':'delete', 'text':data}) - elif op == dmp.DIFF_EQUAL: - outputDiffs.append({'type':'equal', 'text':data}) + if op == dmp.DIFF_INSERT: + outputDiffs.append({'type': 'insert', 'text': data}) + elif op == dmp.DIFF_DELETE: + outputDiffs.append({'type': 'delete', 'text': data}) + elif op == dmp.DIFF_EQUAL: + outputDiffs.append({'type': 'equal', 'text': data}) return outputDiffs changes = [] for thisField in theFields: name = thisField.name - + if name in excluded_keys: - continue # if we're excluding this field, skip over it + continue # if we're excluding this field, skip over it try: oldValue = getattr(oldObj, name, None) @@ -101,17 +100,18 @@ def model_compare(oldObj, newObj, excluded_keys=[]): newValue = getattr(newObj, name, None) except ObjectDoesNotExist: newValue = None - + try: bothBlank = (not oldValue) and (not newValue) if oldValue != newValue and not bothBlank: - compare = FieldCompare(thisField,oldValue,newValue) + compare = FieldCompare(thisField, oldValue, newValue) changes.append(compare) - except TypeError: # logs issues with naive vs tz-aware datetimes + except TypeError: # logs issues with naive vs tz-aware datetimes logger.error('TypeError when comparing models') - + return changes + def compare_event_items(old, new): # Recieves two event version objects and compares their items, returns an array of ItemCompare objects @@ -126,39 +126,41 @@ def compare_event_items(old, new): self.changes = changes # Build some dicts of what we have - item_dict = {} # build a list of items, key is the item_pk - for version in old_item_versions: # put all the old versions in a list + item_dict = {} # build a list of items, key is the item_pk + for version in old_item_versions: # put all the old versions in a list compare = ItemCompare(old=version.object_version.object) item_dict[version.object_id] = compare - for version in new_item_versions: # go through the new versions - try: - compare = item_dict[version.object_id] # see if there's a matching old version - compare.new = version.object_version.object # then add the new version to the dictionary - except KeyError: # there's no matching old version, so add this item to the dictionary by itself + for version in new_item_versions: # go through the new versions + try: + compare = item_dict[version.object_id] # see if there's a matching old version + compare.new = version.object_version.object # then add the new version to the dictionary + except KeyError: # there's no matching old version, so add this item to the dictionary by itself compare = ItemCompare(new=version.object_version.object) - - item_dict[version.object_id] = compare # update the dictionary with the changes - changes = [] + item_dict[version.object_id] = compare # update the dictionary with the changes + + changes = [] for (_, compare) in item_dict.items(): - compare.changes = model_compare(compare.old, compare.new, ['id','event','order']) # see what's changed + compare.changes = model_compare(compare.old, compare.new, ['id', 'event', 'order']) # see what's changed if len(compare.changes) >= 1: - changes.append(compare) # transfer into a sequential array to make it easier to deal with later + changes.append(compare) # transfer into a sequential array to make it easier to deal with later return changes + def get_versions_for_model(models): content_types = [] for model in models: content_types.append(ContentType.objects.get_for_model(model)) - + versions = reversion.models.Version.objects.filter( - content_type__in = content_types, + content_type__in=content_types, ).select_related("revision").order_by("-pk") return versions + def get_previous_version(version): thisId = version.object_id thisVersionId = version.pk @@ -166,17 +168,19 @@ def get_previous_version(version): versions = reversion.get_for_object_reference(version.content_type.model_class(), thisId) try: - previousVersions = versions.filter(revision_id__lt=version.revision_id).latest(field_name='revision__date_created') + previousVersions = versions.filter(revision_id__lt=version.revision_id).latest( + field_name='revision__date_created') except ObjectDoesNotExist: return False return previousVersions -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 == None: +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 == None: oldVersion = get_previous_version(newVersion) modelClass = newVersion.content_type.model_class() @@ -200,6 +204,7 @@ def get_changes_for_version(newVersion, oldVersion=None): return compare + class VersionHistory(generic.ListView): model = reversion.revisions.Version template_name = "RIGS/version_history.html" @@ -215,7 +220,7 @@ class VersionHistory(generic.ListView): def get_context_data(self, **kwargs): thisModel = self.kwargs['model'] - + context = super(VersionHistory, self).get_context_data(**kwargs) versions = context['object_list'] @@ -224,81 +229,82 @@ class VersionHistory(generic.ListView): items = [] for versionNo, thisVersion in enumerate(versions): - if versionNo >= len(versions)-1: + if versionNo >= len(versions) - 1: thisItem = get_changes_for_version(thisVersion, None) else: - thisItem = get_changes_for_version(thisVersion, versions[versionNo+1]) - + thisItem = get_changes_for_version(thisVersion, versions[versionNo + 1]) + items.append(thisItem) context['object_list'] = items context['object'] = thisObject - + return context + class ActivityTable(generic.ListView): model = reversion.revisions.Version template_name = "RIGS/activity_table.html" paginate_by = 25 - + def get_queryset(self): - versions = get_versions_for_model([models.Event,models.Venue,models.Person,models.Organisation]) + versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation]) return versions def get_context_data(self, **kwargs): - # Call the base implementation first to get a context context = super(ActivityTable, self).get_context_data(**kwargs) - + items = [] for thisVersion in context['object_list']: thisItem = get_changes_for_version(thisVersion, None) items.append(thisItem) - context ['object_list'] = items - + context['object_list'] = items + return context + class ActivityFeed(generic.ListView): model = reversion.revisions.Version template_name = "RIGS/activity_feed_data.html" paginate_by = 25 - + def get_queryset(self): - versions = get_versions_for_model([models.Event,models.Venue,models.Person,models.Organisation]) + versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation]) return versions def get_context_data(self, **kwargs): maxTimeDelta = [] - maxTimeDelta.append({ 'maxAge':datetime.timedelta(days=1), 'group':datetime.timedelta(hours=1)}) - maxTimeDelta.append({ 'maxAge':None, 'group':datetime.timedelta(days=1)}) + maxTimeDelta.append({'maxAge': datetime.timedelta(days=1), 'group': datetime.timedelta(hours=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) - + items = [] for thisVersion in context['object_list']: thisItem = get_changes_for_version(thisVersion, None) if thisItem['item_changes'] or thisItem['field_changes'] or thisItem['old'] == None: thisItem['withPrevious'] = False - if len(items)>=1: - timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem['revision'].date_created + if len(items) >= 1: + timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem[ + 'revision'].date_created timeDiff = items[-1]['revision'].date_created - thisItem['revision'].date_created timeTogether = False for params in maxTimeDelta: if params['maxAge'] is None or timeAgo <= params['maxAge']: timeTogether = timeDiff < params['group'] break - + sameUser = thisItem['revision'].user == items[-1]['revision'].user thisItem['withPrevious'] = timeTogether & sameUser items.append(thisItem) - context ['object_list'] = items - + context['object_list'] = items - return context \ No newline at end of file + return context From df61225b73f31dce3f1b17ea35a7cf6f1b9e32ea Mon Sep 17 00:00:00 2001 From: Tom Price Date: Wed, 6 Apr 2016 21:57:25 +0100 Subject: [PATCH 09/67] Optimise imports So many unused imports, these have been banished --- RIGS/versioning.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index 36786a74..7677fa13 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -1,27 +1,18 @@ import logging -from django.views import generic -from django.core.urlresolvers import reverse_lazy -from django.shortcuts import get_object_or_404 -from django.template import RequestContext -from django.template.loader import get_template -from django.conf import settings -from django.http import HttpResponse -from django.db.models import Q -from django.contrib import messages + from django.core.exceptions import ObjectDoesNotExist +from django.shortcuts import get_object_or_404 +from django.views import generic # Versioning import reversion -import simplejson from reversion.models import Version from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.db.models import ForeignKey, IntegerField, EmailField, TextField +from django.db.models import IntegerField, EmailField, TextField from diff_match_patch import diff_match_patch -from RIGS import models, forms +from RIGS import models import datetime -import re logger = logging.getLogger('tec.pyrigs') From b47cfed5a9886793e6ff53e1f918f25a8f1b7836 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 7 Apr 2016 00:19:18 +0100 Subject: [PATCH 10/67] Fixed versioning UI for revisions containing multiple event versions, hopefully --- RIGS/versioning.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index 7677fa13..718bcf95 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -119,17 +119,19 @@ def compare_event_items(old, new): # Build some dicts of what we have item_dict = {} # build a list of items, key is the item_pk for version in old_item_versions: # put all the old versions in a list - compare = ItemCompare(old=version.object_version.object) - item_dict[version.object_id] = compare + if version.object_version.object.event.id == old.object_id: + compare = ItemCompare(old=version.object_version.object) + item_dict[version.object_id] = compare for version in new_item_versions: # go through the new versions - try: - compare = item_dict[version.object_id] # see if there's a matching old version - compare.new = version.object_version.object # then add the new version to the dictionary - except KeyError: # there's no matching old version, so add this item to the dictionary by itself - compare = ItemCompare(new=version.object_version.object) + if version.object_version.object.event.id == new.object_id: + try: + compare = item_dict[version.object_id] # see if there's a matching old version + compare.new = version.object_version.object # then add the new version to the dictionary + except KeyError: # there's no matching old version, so add this item to the dictionary by itself + compare = ItemCompare(new=version.object_version.object) - item_dict[version.object_id] = compare # update the dictionary with the changes + item_dict[version.object_id] = compare # update the dictionary with the changes changes = [] for (_, compare) in item_dict.items(): From f1bd1ca674b9e554402b6c08bc71157f624b5f1b Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 7 Apr 2016 00:52:33 +0100 Subject: [PATCH 11/67] Make 'created' noun class-specific. Closes #185 --- RIGS/templates/RIGS/activity_table.html | 2 +- RIGS/templates/RIGS/version_history.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RIGS/templates/RIGS/activity_table.html b/RIGS/templates/RIGS/activity_table.html index 1d491663..049e9aad 100644 --- a/RIGS/templates/RIGS/activity_table.html +++ b/RIGS/templates/RIGS/activity_table.html @@ -72,7 +72,7 @@ {{ version.revision.user.name }} {% if version.old == None %} - Object Created + {{object|to_class_name}} Created {% else %} {% include 'RIGS/version_changes.html' %} {% endif %} diff --git a/RIGS/templates/RIGS/version_history.html b/RIGS/templates/RIGS/version_history.html index 924ea148..3261c5df 100644 --- a/RIGS/templates/RIGS/version_history.html +++ b/RIGS/templates/RIGS/version_history.html @@ -47,7 +47,7 @@ {{ version.revision.user.name }} {% if version.old == None %} - Object Created + {{object|to_class_name}} Created {% else %} {% include 'RIGS/version_changes.html' %} {% endif %} From 767b5512e312d7b152c3a8a866146d47c07a07ed Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 7 Apr 2016 00:53:57 +0100 Subject: [PATCH 12/67] Fail, missed a change, actually closes #185 now --- RIGS/templates/RIGS/activity_table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/activity_table.html b/RIGS/templates/RIGS/activity_table.html index 049e9aad..1a1c8c1d 100644 --- a/RIGS/templates/RIGS/activity_table.html +++ b/RIGS/templates/RIGS/activity_table.html @@ -72,7 +72,7 @@ {{ version.revision.user.name }} {% if version.old == None %} - {{object|to_class_name}} Created + {{version.new|to_class_name}} Created {% else %} {% include 'RIGS/version_changes.html' %} {% endif %} From f8a2a7a9593bc63a8922fa9200d096f9b3ca5325 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 7 Apr 2016 09:23:35 +0100 Subject: [PATCH 13/67] Made items display in version history again --- RIGS/versioning.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index 718bcf95..ee3da1d8 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -119,12 +119,12 @@ def compare_event_items(old, new): # Build some dicts of what we have item_dict = {} # build a list of items, key is the item_pk for version in old_item_versions: # put all the old versions in a list - if version.object_version.object.event.id == old.object_id: + if version.object_version.object.event.id == old.object_id_int: compare = ItemCompare(old=version.object_version.object) item_dict[version.object_id] = compare for version in new_item_versions: # go through the new versions - if version.object_version.object.event.id == new.object_id: + if version.object_version.object.event.id == new.object_id_int: try: compare = item_dict[version.object_id] # see if there's a matching old version compare.new = version.object_version.object # then add the new version to the dictionary From 98f28aaafd0a5756f5346abacbaecc45529ade36 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 12 Apr 2016 20:15:13 +0100 Subject: [PATCH 14/67] Based on has name as well as MIC - Fix #224 --- RIGS/templates/RIGS/event_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index e68e73bf..81658663 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -151,7 +151,7 @@ {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %} {{ object.based_on.pk }}{% endif %} - {{ object.base_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %} + {{ object.based_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %} {% endif %} From 29aa13316df95eaab7ab1af9d85e0a73dcd774b5 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 27 Apr 2016 20:49:42 +0100 Subject: [PATCH 15/67] Fix for versioning when event has been deleted, closes #226 --- RIGS/versioning.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RIGS/versioning.py b/RIGS/versioning.py index ee3da1d8..6d524fc0 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -119,12 +119,12 @@ def compare_event_items(old, new): # Build some dicts of what we have item_dict = {} # build a list of items, key is the item_pk for version in old_item_versions: # put all the old versions in a list - if version.object_version.object.event.id == old.object_id_int: + if version.field_dict["event"] == old.object_id_int: compare = ItemCompare(old=version.object_version.object) item_dict[version.object_id] = compare for version in new_item_versions: # go through the new versions - if version.object_version.object.event.id == new.object_id_int: + if version.field_dict["event"] == new.object_id_int: try: compare = item_dict[version.object_id] # see if there's a matching old version compare.new = version.object_version.object # then add the new version to the dictionary From ef815360663034e03948dc75ae4c5d43780fd1be Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 19 May 2016 14:21:21 +0100 Subject: [PATCH 16/67] Add tooltips to rig type selectors. Closes #227 --- RIGS/templates/RIGS/event_form.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 0e7aa6ad..0b855f17 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -29,9 +29,9 @@ } function setTime02Hours() { - 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 }}" + 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()) { var end_date = new Date($('#'+id_end_date).val()); end_date.setDate(end_date.getDate() + 1); @@ -67,7 +67,7 @@ $('#{{form.is_rig.auto_id}}').prop('checked', false); $('.form-is_rig').slideUp(); } - }) + }); {% endif %} function supportsDate() { @@ -106,7 +106,7 @@ }); } - }) + }); $(document).ready(function () { setupItemTable($("#{{ form.items_json.id_for_label }}").val()); @@ -150,10 +150,12 @@
- + - +
From 2913b254b4fb808a281a9952abfb304c000200d9 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 19 May 2016 14:33:33 +0100 Subject: [PATCH 17/67] Fix an overflow issue with dropdown fields. Closes #204 --- RIGS/templates/RIGS/event_form.html | 1 + 1 file changed, 1 insertion(+) diff --git a/RIGS/templates/RIGS/event_form.html b/RIGS/templates/RIGS/event_form.html index 0b855f17..28e307ca 100644 --- a/RIGS/templates/RIGS/event_form.html +++ b/RIGS/templates/RIGS/event_form.html @@ -63,6 +63,7 @@ } else { $('.form-is_rig').slideDown(); } + $('.form-hws').css('overflow', 'visible'); } else { $('#{{form.is_rig.auto_id}}').prop('checked', false); $('.form-is_rig').slideUp(); From 1faf8f95c8f8b9b6a678e43af4982c5e75209806 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 22 May 2016 23:13:23 +0100 Subject: [PATCH 18/67] Fixed colour coding on invoice waiting page --- RIGS/templates/RIGS/event_invoice.html | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html index c16c501b..805eb3d9 100644 --- a/RIGS/templates/RIGS/event_invoice.html +++ b/RIGS/templates/RIGS/event_invoice.html @@ -26,16 +26,18 @@ {% for object in object_list %} N{{ object.pk|stringformat:"05d" }} {{ object.end_date }} From e4a955f3239cf285f8e7c62bef57f21d7fa531fd Mon Sep 17 00:00:00 2001 From: Tom Price Date: Mon, 23 May 2016 12:36:21 +0100 Subject: [PATCH 19/67] Reformat code to PEP8 --- RIGS/finance.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/RIGS/finance.py b/RIGS/finance.py index 73552f2e..d719c66f 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -1,20 +1,19 @@ import cStringIO as StringIO +import datetime +import re +from django.contrib import messages from django.core.urlresolvers import reverse_lazy -from django.db import connection from django.http import Http404, HttpResponseRedirect -from django.views import generic -from django.template import RequestContext -from django.template.loader import get_template from django.http import HttpResponse from django.shortcuts import get_object_or_404 -from django.contrib import messages -import datetime +from django.template import RequestContext +from django.template.loader import get_template +from django.views import generic from z3c.rml import rml2pdf from RIGS import models -import re class InvoiceIndex(generic.ListView): model = models.Invoice @@ -40,6 +39,7 @@ class InvoiceIndex(generic.ListView): class InvoiceDetail(generic.DetailView): model = models.Invoice + class InvoicePrint(generic.View): def get(self, request, pk): invoice = get_object_or_404(models.Invoice, pk=pk) @@ -54,8 +54,8 @@ class InvoicePrint(generic.View): 'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF', } }, - 'invoice':invoice, - 'current_user':request.user, + 'invoice': invoice, + 'current_user': request.user, }) rml = template.render(context) @@ -72,6 +72,7 @@ class InvoicePrint(generic.View): response.write(pdfData) return response + class InvoiceVoid(generic.View): def get(self, *args, **kwargs): pk = kwargs.get('pk') @@ -119,7 +120,7 @@ class InvoiceEvent(generic.View): class PaymentCreate(generic.CreateView): model = models.Payment - fields = ['invoice','date','amount','method'] + fields = ['invoice', 'date', 'amount', 'method'] def get_initial(self): initial = super(generic.CreateView, self).get_initial() @@ -139,4 +140,4 @@ class PaymentDelete(generic.DeleteView): model = models.Payment def get_success_url(self): - return self.request.POST.get('next') \ No newline at end of file + return self.request.POST.get('next') From 60302889569679ad9d41be940b2b50953f4b1761 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Tue, 24 May 2016 17:17:52 +0100 Subject: [PATCH 20/67] Cheap and dirty active totals --- RIGS/finance.py | 14 ++- RIGS/models.py | 125 +++++++++++++------------- RIGS/templates/RIGS/invoice_list.html | 2 +- 3 files changed, 77 insertions(+), 64 deletions(-) diff --git a/RIGS/finance.py b/RIGS/finance.py index d719c66f..57721a9f 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -19,16 +19,24 @@ class InvoiceIndex(generic.ListView): model = models.Invoice template_name = 'RIGS/invoice_list.html' + def get_context_data(self, **kwargs): + context = super(InvoiceIndex, self).get_context_data(**kwargs) + total = 0 + for i in context['object_list']: + total += i.balance + context['total'] = total + return context + def get_queryset(self): # Manual query is the only way I have found to do this efficiently. Not 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\", " \ + "(SELECT COUNT(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payment_count\", " \ "(SELECT SUM(ei.cost * ei.quantity) FROM \"RIGS_eventitem\" AS ei WHERE ei.event_id=\"RIGS_invoice\".event_id) AS \"cost\", " \ - "(SELECT SUM(p.amount) FROM \"RIGS_payment\" as p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \ + "(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \ "\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \ "AS sub " \ - "WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \ + "WHERE (cost - payments) <> 0.0 AND void = '0'" \ "ORDER BY invoice_date" query = self.model.objects.raw(sql) diff --git a/RIGS/models.py b/RIGS/models.py index fc06911f..535aa42c 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -1,31 +1,32 @@ +import datetime import hashlib -import datetime, pytz - -from django.db import models, connection -from django.contrib.auth.models import AbstractUser -from django.conf import settings -from django.utils.functional import cached_property -from django.utils.encoding import python_2_unicode_compatible -import reversion -import string +import pytz import random +import string from collections import Counter -from django.core.urlresolvers import reverse_lazy -from django.core.exceptions import ValidationError - from decimal import Decimal +import reversion +from django.conf import settings +from django.contrib.auth.models import AbstractUser +from django.core.exceptions import ValidationError +from django.core.urlresolvers import reverse_lazy +from django.db import models +from django.utils.encoding import python_2_unicode_compatible +from django.utils.functional import cached_property + + # Create your models here. @python_2_unicode_compatible class Profile(AbstractUser): initials = models.CharField(max_length=5, unique=True, null=True, blank=False) phone = models.CharField(max_length=13, null=True, blank=True) - api_key = models.CharField(max_length=40,blank=True,editable=False, null=True) + api_key = models.CharField(max_length=40, blank=True, editable=False, null=True) @classmethod def make_api_key(cls): - size=20 - chars=string.ascii_letters + string.digits + size = 20 + chars = string.ascii_letters + string.digits new_api_key = ''.join(random.choice(chars) for x in range(size)) return new_api_key; @@ -55,6 +56,7 @@ class Profile(AbstractUser): ('view_profile', 'Can view Profile'), ) + class RevisionMixin(object): @property def last_edited_at(self): @@ -79,10 +81,11 @@ class RevisionMixin(object): versions = reversion.get_for_object(self) if versions: version = reversion.get_for_object(self)[0] - return "V{0} | R{1}".format(version.pk,version.revision.pk) + return "V{0} | R{1}".format(version.pk, version.revision.pk) else: return None + @reversion.register @python_2_unicode_compatible class Person(models.Model, RevisionMixin): @@ -97,7 +100,7 @@ class Person(models.Model, RevisionMixin): def __str__(self): string = self.name if self.notes is not None: - if len(self.notes) > 0: + if len(self.notes) > 0: string += "*" return string @@ -108,7 +111,7 @@ class Person(models.Model, RevisionMixin): if e.organisation: o.append(e.organisation) - #Count up occurances and put them in descending order + # Count up occurances and put them in descending order c = Counter(o) stats = c.most_common() return stats @@ -141,7 +144,7 @@ class Organisation(models.Model, RevisionMixin): def __str__(self): string = self.name if self.notes is not None: - if len(self.notes) > 0: + if len(self.notes) > 0: string += "*" return string @@ -151,8 +154,8 @@ class Organisation(models.Model, RevisionMixin): for e in Event.objects.filter(organisation=self).select_related('person'): if e.person: p.append(e.person) - - #Count up occurances and put them in descending order + + # Count up occurances and put them in descending order c = Counter(p) stats = c.most_common() return stats @@ -238,12 +241,18 @@ class Venue(models.Model, RevisionMixin): class EventManager(models.Manager): def current_events(self): events = self.filter( - (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False) & ~models.Q(status=Event.CANCELLED)) | # Starts after with no end - (models.Q(end_date__gte=datetime.date.today(), dry_hire=False) & ~models.Q(status=Event.CANCELLED)) | # Ends after - (models.Q(dry_hire=True, start_date__gte=datetime.date.today()) & ~models.Q(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 + (models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, dry_hire=False) & ~models.Q( + status=Event.CANCELLED)) | # Starts after with no end + (models.Q(end_date__gte=datetime.date.today(), dry_hire=False) & ~models.Q( + status=Event.CANCELLED)) | # Ends after + (models.Q(dry_hire=True, start_date__gte=datetime.date.today()) & ~models.Q( + 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 models.Q(status=Event.CANCELLED, start_date__gte=datetime.date.today()) # Canceled but not started - ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic') + ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', + 'organisation', + 'venue', 'mic') return events def events_in_bounds(self, start, end): @@ -251,15 +260,17 @@ class EventManager(models.Manager): (models.Q(start_date__gte=start.date(), start_date__lte=end.date())) | # Start date in bounds (models.Q(end_date__gte=start.date(), end_date__lte=end.date())) | # End date in bounds (models.Q(access_at__gte=start, access_at__lte=end)) | # Access at in bounds - (models.Q(meet_at__gte=start, meet_at__lte=end)) | # Meet at in bounds + (models.Q(meet_at__gte=start, meet_at__lte=end)) | # Meet at in bounds - (models.Q(start_date__lte=start, end_date__gte=end)) | # Start before, end after - (models.Q(access_at__lte=start, start_date__gte=end)) | # Access before, start after - (models.Q(access_at__lte=start, end_date__gte=end)) | # Access before, end after - (models.Q(meet_at__lte=start, start_date__gte=end)) | # Meet before, start after - (models.Q(meet_at__lte=start, end_date__gte=end)) # Meet before, end after + (models.Q(start_date__lte=start, end_date__gte=end)) | # Start before, end after + (models.Q(access_at__lte=start, start_date__gte=end)) | # Access before, start after + (models.Q(access_at__lte=start, end_date__gte=end)) | # Access before, end after + (models.Q(meet_at__lte=start, start_date__gte=end)) | # Meet before, start after + (models.Q(meet_at__lte=start, end_date__gte=end)) # Meet before, end after - ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic') + ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', + 'organisation', + 'venue', 'mic') return events def rig_count(self): @@ -301,7 +312,8 @@ class Event(models.Model, RevisionMixin): status = models.IntegerField(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, null=True) + based_on = models.ForeignKey('Event', on_delete=models.SET_NULL, related_name='future_events', blank=True, + null=True) # Timing start_date = models.DateField() @@ -327,6 +339,7 @@ class Event(models.Model, RevisionMixin): """ EX Vat """ + @property def sum_total(self): # Manual querying is required for efficiency whilst maintaining floating point arithmetic @@ -334,14 +347,15 @@ class Event(models.Model, RevisionMixin): # sql = "SELECT SUM(quantity * cost) AS sum_total FROM \"RIGS_eventitem\" WHERE event_id=%i" % self.id # else: # sql = "SELECT id, SUM(quantity * cost) AS sum_total FROM RIGS_eventitem WHERE event_id=%i" % self.id - #total = self.items.raw(sql)[0] - #if total.sum_total: + # total = self.items.raw(sql)[0] + # if total.sum_total: # return total.sum_total - #total = 0.0 - #for item in self.items.filter(cost__gt=0).extra(select="SUM(cost * quantity) AS sum"): + # total = 0.0 + # for item in self.items.filter(cost__gt=0).extra(select="SUM(cost * quantity) AS sum"): # total += item.sum total = EventItem.objects.filter(event=self).aggregate( - sum_total=models.Sum(models.F('cost')*models.F('quantity'), output_field=models.DecimalField(max_digits=10, decimal_places=2)) + sum_total=models.Sum(models.F('cost') * models.F('quantity'), + output_field=models.DecimalField(max_digits=10, decimal_places=2)) )['sum_total'] if total: return total @@ -358,6 +372,7 @@ class Event(models.Model, RevisionMixin): """ Inc VAT """ + @property def total(self): return self.sum_total + self.vat @@ -382,7 +397,7 @@ class Event(models.Model, RevisionMixin): def earliest_time(self): """Finds the earliest time defined in the event - this function could return either a tzaware datetime, or a naiive date object""" - #Put all the datetimes in a list + # Put all the datetimes in a list datetime_list = [] if self.access_at: @@ -394,22 +409,22 @@ 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(self.start_date,self.start_time) + startDateTime = datetime.datetime.combine(self.start_date, self.start_time) else: - startDateTime = datetime.datetime.combine(self.start_date,datetime.time(00,00)) + startDateTime = datetime.datetime.combine(self.start_date, datetime.time(00, 00)) startTimeFaked = True - #timezoneIssues - apply the default timezone to the naiive datetime + # timezoneIssues - apply the default timezone to the naiive datetime tz = pytz.timezone(settings.TIME_ZONE) startDateTime = tz.localize(startDateTime) - datetime_list.append(startDateTime) # then add it to the list + datetime_list.append(startDateTime) # then add it to the list - earliest = min(datetime_list).astimezone(tz) #find the earliest datetime in the list + earliest = min(datetime_list).astimezone(tz) # find the earliest datetime in the list # if we faked it & it's the earliest, better own up - if startTimeFaked and earliest==startDateTime: + if startTimeFaked and earliest == startDateTime: return self.start_date - + return earliest @property @@ -421,7 +436,7 @@ class Event(models.Model, RevisionMixin): endDate = self.start_date if self.has_end_time: - endDateTime = datetime.datetime.combine(endDate,self.end_time) + endDateTime = datetime.datetime.combine(endDate, self.end_time) tz = pytz.timezone(settings.TIME_ZONE) endDateTime = tz.localize(endDateTime) @@ -430,7 +445,6 @@ class Event(models.Model, RevisionMixin): else: return endDate - objects = EventManager() def get_absolute_url(self): @@ -446,7 +460,7 @@ class Event(models.Model, RevisionMixin): 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('Unless you\'ve invented time travel, the event can\'t finish before it has started.') + raise ValidationError('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.""" @@ -503,15 +517,6 @@ class Invoice(models.Model): @property def payment_total(self): - # Manual querying is required for efficiency whilst maintaining floating point arithmetic - #if connection.vendor == 'postgresql': - # sql = "SELECT SUM(amount) AS total FROM \"RIGS_payment\" WHERE invoice_id=%i" % self.id - #else: - # sql = "SELECT id, SUM(amount) AS total FROM RIGS_payment WHERE invoice_id=%i" % self.id - #total = self.payment_set.raw(sql)[0] - #if total.total: - # return total.total - #return 0.0 total = self.payment_set.aggregate(total=models.Sum('amount'))['total'] if total: return total @@ -552,4 +557,4 @@ class Payment(models.Model): method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True) def __str__(self): - return "%s: %d" % (self.get_method_display(), self.amount) \ No newline at end of file + return "%s: %d" % (self.get_method_display(), self.amount) diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html index bf9fe31f..018ca910 100644 --- a/RIGS/templates/RIGS/invoice_list.html +++ b/RIGS/templates/RIGS/invoice_list.html @@ -5,7 +5,7 @@ {% block content %}
-

Invoices

+

Invoices (£ {{ total|floatformat:2 }})

{% if is_paginated %}
{% paginator %} From 7ccc8faf20a308cfae943aad60a8b77918b459db Mon Sep 17 00:00:00 2001 From: Tom Price Date: Tue, 24 May 2016 17:32:58 +0100 Subject: [PATCH 21/67] Add total for waiting events --- RIGS/finance.py | 8 ++++++++ RIGS/templates/RIGS/event_invoice.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/RIGS/finance.py b/RIGS/finance.py index 57721a9f..9025e15b 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -103,6 +103,14 @@ class InvoiceWaiting(generic.ListView): paginate_by = 25 template_name = 'RIGS/event_invoice.html' + def get_context_data(self, **kwargs): + context = super(InvoiceWaiting, self).get_context_data(**kwargs) + total = 0 + for obj in context['object_list']: + total += obj.sum_total + context['total'] = total + return context + def get_queryset(self): # @todo find a way to select items events = self.model.objects.filter(is_rig=True, end_date__lt=datetime.date.today(), diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html index 805eb3d9..29c56f42 100644 --- a/RIGS/templates/RIGS/event_invoice.html +++ b/RIGS/templates/RIGS/event_invoice.html @@ -5,7 +5,7 @@ {% block content %}
-

Events for Invoice

+

Events for Invoice (£ {{ total|floatformat:2 }})

{% if is_paginated %}
{% paginator %} From 6b77393414682c930b3d091361ec76ea7f3fa0cf Mon Sep 17 00:00:00 2001 From: Tom Price Date: Tue, 24 May 2016 17:49:44 +0100 Subject: [PATCH 22/67] Fix for incorrect selection of active invoices. Make sure waiting shows total across all pages. --- RIGS/finance.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/RIGS/finance.py b/RIGS/finance.py index 9025e15b..69eaa513 100644 --- a/RIGS/finance.py +++ b/RIGS/finance.py @@ -36,7 +36,7 @@ class InvoiceIndex(generic.ListView): "(SELECT SUM(p.amount) FROM \"RIGS_payment\" AS p WHERE p.invoice_id=\"RIGS_invoice\".id) AS \"payments\", " \ "\"RIGS_invoice\".\"id\", \"RIGS_invoice\".\"event_id\", \"RIGS_invoice\".\"invoice_date\", \"RIGS_invoice\".\"void\" FROM \"RIGS_invoice\") " \ "AS sub " \ - "WHERE (cost - payments) <> 0.0 AND void = '0'" \ + "WHERE (((cost > 0.0) AND (payment_count=0)) OR (cost - payments) <> 0.0) AND void = '0'" \ "ORDER BY invoice_date" query = self.model.objects.raw(sql) @@ -106,19 +106,24 @@ class InvoiceWaiting(generic.ListView): def get_context_data(self, **kwargs): context = super(InvoiceWaiting, self).get_context_data(**kwargs) total = 0 - for obj in context['object_list']: + for obj in self.get_objects(): total += obj.sum_total context['total'] = total return context def get_queryset(self): + return self.get_objects() + + def get_objects(self): # @todo find a way to select items events = self.model.objects.filter(is_rig=True, end_date__lt=datetime.date.today(), invoice__isnull=True) \ .order_by('start_date') \ .select_related('person', 'organisation', - 'venue', 'mic') + 'venue', 'mic') \ + .prefetch_related('items') + return events From cc2450ff871467a45920a05051268ebe374e2662 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Tue, 24 May 2016 17:50:48 +0100 Subject: [PATCH 23/67] Make total conditional if defined --- RIGS/templates/RIGS/invoice_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html index 018ca910..32abdcec 100644 --- a/RIGS/templates/RIGS/invoice_list.html +++ b/RIGS/templates/RIGS/invoice_list.html @@ -5,7 +5,7 @@ {% block content %}
-

Invoices (£ {{ total|floatformat:2 }})

+

Invoices {% if total %}(£ {{ total|floatformat:2 }}){% endif %}

{% if is_paginated %}
{% paginator %} From db58c113aafe68c131e496d3b8a8cbec490c09e2 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 28 May 2016 14:52:48 +0100 Subject: [PATCH 24/67] Changed font to load over https - #236 --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index c27231bd..3cde5acd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,7 +14,7 @@ - From 000351d884b441485ab0ff65ca31c8c9bd0a7ee1 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 28 May 2016 15:20:15 +0100 Subject: [PATCH 25/67] Redirect all requests to https --- PyRIGS/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index d85ff887..bb9ba676 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -13,6 +13,7 @@ import os BASE_DIR = os.path.dirname(os.path.dirname(__file__)) SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +SECURE_SSL_REDIRECT = True # Redirect all http requests to https # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ @@ -55,6 +56,7 @@ INSTALLED_APPS = ( MIDDLEWARE_CLASSES = ( 'raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware', + 'django.middleware.security.SecurityMiddleware', 'reversion.middleware.RevisionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', From aa79f3628e157854764eb26248b026a9c3c0898a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sat, 28 May 2016 15:27:38 +0100 Subject: [PATCH 26/67] Only redirect to HTTPS in production --- PyRIGS/settings.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index bb9ba676..3098c3fb 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -12,9 +12,6 @@ https://docs.djangoproject.com/en/1.7/ref/settings/ import os BASE_DIR = os.path.dirname(os.path.dirname(__file__)) -SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') -SECURE_SSL_REDIRECT = True # Redirect all http requests to https - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ @@ -28,6 +25,10 @@ TEMPLATE_DEBUG = True ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com'] +SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +if not DEBUG: + SECURE_SSL_REDIRECT = True # Redirect all http requests to https + INTERNAL_IPS = ['127.0.0.1'] ADMINS = ( From a725ef5caf4fb6e1e3beaa4302a2a12e461d6608 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 29 May 2016 17:09:52 +0100 Subject: [PATCH 27/67] Removed add to google calendar link, closes #237 --- RIGS/templates/RIGS/profile_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIGS/templates/RIGS/profile_detail.html b/RIGS/templates/RIGS/profile_detail.html index 8fce1e60..e69e7bf0 100644 --- a/RIGS/templates/RIGS/profile_detail.html +++ b/RIGS/templates/RIGS/profile_detail.html @@ -126,7 +126,7 @@
{% if user.api_key %} 

-						Click here to add to google calendar.

+						Click here for instructions on adding to google calendar.

 						To sync from google calendar to mobile device, visit this page on your device and tick "RIGS Calendar".
 					{% else %}
 						
No API Key Generated


From eaf5c9687edd82269202f64798ebbc664ba88cac Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 20:21:23 +0100
Subject: [PATCH 28/67] Fixed typo, closes #174

---
 PyRIGS/decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PyRIGS/decorators.py b/PyRIGS/decorators.py
index a7c1db90..67d8964c 100644
--- a/PyRIGS/decorators.py
+++ b/PyRIGS/decorators.py
@@ -58,7 +58,7 @@ def api_key_required(function):
 
         try:
             user_object = models.Profile.objects.get(pk=userid)
-        except Profile.DoesNotExist:
+        except models.Profile.DoesNotExist:
             return error_resp
 
         if user_object.api_key != key:

From 83302c44399ccf45d1d5431c6ef68520b07ccdc1 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 21:30:05 +0100
Subject: [PATCH 29/67] Invoice UI improvements. Renamed pages, added
 description, and added total number of events

---
 RIGS/finance.py                               |  3 ++-
 RIGS/templates/RIGS/event_invoice.html        |  3 ++-
 RIGS/templates/RIGS/invoice_list.html         |  3 ++-
 RIGS/templates/RIGS/invoice_list_active.html  | 13 +++++++++++++
 RIGS/templates/RIGS/invoice_list_archive.html | 13 +++++++++++++
 templates/base.html                           |  2 +-
 6 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 RIGS/templates/RIGS/invoice_list_active.html
 create mode 100644 RIGS/templates/RIGS/invoice_list_archive.html

diff --git a/RIGS/finance.py b/RIGS/finance.py
index 69eaa513..d604cd57 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -17,7 +17,7 @@ from RIGS import models
 
 class InvoiceIndex(generic.ListView):
     model = models.Invoice
-    template_name = 'RIGS/invoice_list.html'
+    template_name = 'RIGS/invoice_list_active.html'
 
     def get_context_data(self, **kwargs):
         context = super(InvoiceIndex, self).get_context_data(**kwargs)
@@ -95,6 +95,7 @@ class InvoiceVoid(generic.View):
 
 class InvoiceArchive(generic.ListView):
     model = models.Invoice
+    template_name = 'RIGS/invoice_list_archive.html'
     paginate_by = 25
 
 
diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 29c56f42..3324911a 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -5,7 +5,8 @@
 
 {% block content %}
     

-        
Events for Invoice (£ {{ total|floatformat:2 }})

+        
Events for Invoice ({{object_list|length}} Events, £ {{ total|floatformat:2 }})

+        
These events have happened, but paperwork has not yet been sent to treasury

         {% if is_paginated %}
             

                 {% paginator %}
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 32abdcec..26ddeb12 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -5,7 +5,8 @@
 
 {% block content %}
     

-        
Invoices {% if total %}(£ {{ total|floatformat:2 }}){% endif %}

+        
{% block heading %}Invoices{% endblock %}

+        {% block description %}{% endblock %}
         {% if is_paginated %}
             

                 {% paginator %}
diff --git a/RIGS/templates/RIGS/invoice_list_active.html b/RIGS/templates/RIGS/invoice_list_active.html
new file mode 100644
index 00000000..24cea673
--- /dev/null
+++ b/RIGS/templates/RIGS/invoice_list_active.html
@@ -0,0 +1,13 @@
+{% extends 'RIGS/invoice_list.html' %}
+
+{% block title %}
+Outstanding Invoices
+{% endblock %}
+
+{% block heading %}
+Outstanding Invoices ({{object_list|length}} Events, £ {{ total|floatformat:2 }})
+{% endblock %}
+
+{% block description %}
+
Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger

+{% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/invoice_list_archive.html b/RIGS/templates/RIGS/invoice_list_archive.html
new file mode 100644
index 00000000..77bab204
--- /dev/null
+++ b/RIGS/templates/RIGS/invoice_list_archive.html
@@ -0,0 +1,13 @@
+{% extends 'RIGS/invoice_list.html' %}
+
+{% block title %}
+Invoice Archive
+{% endblock %}
+
+{% block heading %}
+All Invoices
+{% endblock %}
+
+{% block description %}
+
This page displays all invoices: outstanding, paid, and void

+{% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 3cde5acd..299be06e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -74,7 +74,7 @@
                     
  • 
                         Invoices
                         
      
-                            
    •  Active
+                            
    •  Outstanding
                             
      • 
                             {% if perms.RIGS.add_invoice %}
                                 
    • 
Date: Sun, 29 May 2016 21:37:14 +0100
Subject: [PATCH 30/67] Changed order of invoice menu items to make it more
 intuitive (now in order of workflow)

---
 templates/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 299be06e..7a2d15f9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -74,12 +74,12 @@
                     
    • 
                         Invoices
                         

From 0ff0d06eaf9f16267ce5e1e549d5c72f924e20f1 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 22:04:48 +0100
Subject: [PATCH 31/67] Fix counter on outstanding invoices page ('length'
 property doesn't work because of the custom SQL query)

---
 RIGS/finance.py                              | 1 +
 RIGS/templates/RIGS/invoice_list_active.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RIGS/finance.py b/RIGS/finance.py
index d604cd57..e90a924a 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -25,6 +25,7 @@ class InvoiceIndex(generic.ListView):
         for i in context['object_list']:
             total += i.balance
         context['total'] = total
+        context['count'] = len(list(context['object_list']))
         return context
 
     def get_queryset(self):
diff --git a/RIGS/templates/RIGS/invoice_list_active.html b/RIGS/templates/RIGS/invoice_list_active.html
index 24cea673..23bfc768 100644
--- a/RIGS/templates/RIGS/invoice_list_active.html
+++ b/RIGS/templates/RIGS/invoice_list_active.html
@@ -5,7 +5,7 @@ Outstanding Invoices
 {% endblock %}
 
 {% block heading %}
-Outstanding Invoices ({{object_list|length}} Events, £ {{ total|floatformat:2 }})
+Outstanding Invoices ({{ count }} Events, £ {{ total|floatformat:2 }})
 {% endblock %}
 
 {% block description %}

From 705f1bda2b48a7d9756616980036f0dbbbbd21d9 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 22:05:53 +0100
Subject: [PATCH 32/67] Fix the query for the 'outstanding' invoices page.
 Previously this only displayed events with an end date set.

---
 RIGS/finance.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/RIGS/finance.py b/RIGS/finance.py
index e90a924a..be52b1f1 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -10,6 +10,7 @@ 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
@@ -118,9 +119,13 @@ class InvoiceWaiting(generic.ListView):
 
     def get_objects(self):
         # @todo find a way to select items
-        events = self.model.objects.filter(is_rig=True, end_date__lt=datetime.date.today(),
-                                           invoice__isnull=True) \
-            .order_by('start_date') \
+        events = self.model.objects.filter(
+            (
+                Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
+                Q(end_date__lte=datetime.date.today()) # Has end date, finishes before
+            ) & Q(invoice__isnull=True) # Has not already been invoiced
+            
+            ).order_by('start_date') \
             .select_related('person',
                             'organisation',
                             'venue', 'mic') \

From f43635ee89671083a4e2b64cda5a8027af39665f Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 22:42:17 +0100
Subject: [PATCH 33/67] Added more useful information to the invoice tables

---
 RIGS/templates/RIGS/event_invoice.html | 29 +++++++++++++++++++-------
 RIGS/templates/RIGS/invoice_list.html  | 12 ++++++++++-
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 3324911a..94d84f04 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -1,8 +1,18 @@
 {% extends 'base.html' %}
 {% load paginator from filters %}
+{% load static %}
 
 {% block title %}Events for Invoice{% endblock %}
 
+{% block js %}
+
+
+{% endblock %}
+
 {% block content %}
     
      
         
      Events for Invoice ({{object_list|length}} Events, £ {{ total|floatformat:2 }})
      
@@ -16,8 +26,8 @@
             
             
                 #
-                Date
-                Event
+                Start Date
+                Event Name
                 Client
                 Cost
                 MIC
@@ -40,8 +50,9 @@
                             danger
                         {% endif %}
                         ">
-                    N{{ object.pk|stringformat:"05d" }}
-                    {{ object.end_date }}
+                    N{{ object.pk|stringformat:"05d" }}
      
+                        {{ object.get_status_display }}
+                    {{ object.start_date }}
                     {{ object.name }}
                     
                         {% if object.organisation %}
@@ -52,11 +63,15 @@
                     
                     {{ object.sum_total|floatformat:2 }}
                     
-                        {{ object.mic.initials }}
      
-                        
+                        {% if object.mic %}
+                            {{ object.mic.initials }}
      
+                            
+                        {% else %}
+                            
+                        {% endif %}
                     
                     
-                        
+                        
                             
                         
                     
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 26ddeb12..cb63b7f5 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -17,6 +17,8 @@
             
                 #
                 Event
+                Client
+                Event Date
                 Invoice Date
                 Balance
                 
@@ -26,7 +28,15 @@
             {% for object in object_list %}
                 
                     {{ object.pk }}
-                    N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }}
+                    N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
      
+                        {{ object.event.get_status_display }}
+                    
+                    {% if object.organisation %}
+                            {{ object.event.organisation.name }}
+                        {% else %}
+                            {{ object.event.person.name }}
+                        {% endif %}
+                    {{ object.event.start_date }}
                     {{ object.invoice_date }}
                     {{ object.balance|floatformat:2 }}
                     

From 0990f0bfbb2d56994f92fc7f3dabf71e4a5644b5 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 22:46:49 +0100
Subject: [PATCH 34/67] Only display invoice print button for external clients

---
 RIGS/templates/RIGS/invoice_detail.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index a3be5320..eccec0a3 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -15,10 +15,12 @@
                      
                 
-                 
-                
      
+                {% if not object.event.organisation.union_account %}
+                     
+                    
    • 
+                {% endif %}
             
    
         
    
 

From 3ccbdff737cca2c7390bf511ee990cfed9efbbce Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 22:51:41 +0100
Subject: [PATCH 35/67] Added balance to invoice page - closes #235

---
 RIGS/templates/RIGS/invoice_detail.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index eccec0a3..e5b14a7f 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -111,6 +111,11 @@
                                     
                                 
                             {% endfor %}
+                            
+                                Balance:
+                                {{ object.balance|floatformat:2 }}
+                                
+                                
                             
                         
                     
    

From a48afb91573d9bb59c03c8323786a462f3982d22 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 22:56:58 +0100
Subject: [PATCH 36/67] Added internal/external indicators to invoice lists

---
 RIGS/templates/RIGS/event_invoice.html | 5 +++++
 RIGS/templates/RIGS/invoice_list.html  | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 94d84f04..79098853 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -57,9 +57,14 @@
                     
                         {% if object.organisation %}
                             {{ object.organisation.name }}
+                            
    
+                            {{ object.organisation.union_account|yesno:'Internal,External' }}
                         {% else %}
                             {{ object.person.name }}
+                            
    
+                            External
                         {% endif %}
+
                     
                     {{ object.sum_total|floatformat:2 }}
                     
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index cb63b7f5..f7d23fcf 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -33,9 +33,14 @@
                     
                     {% if object.organisation %}
                             {{ object.event.organisation.name }}
+                            
    
+                            {{ object.organisation.union_account|yesno:'Internal,External' }}
                         {% else %}
                             {{ object.event.person.name }}
-                        {% endif %}
+                            
    
+                            External
+                        {% endif %}
+                    
                     {{ object.event.start_date }}
                     {{ object.invoice_date }}
                     {{ object.balance|floatformat:2 }}

From 5cc69cbb413ac1adbc615f324cfed28f27ea5f31 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 23:03:41 +0100
Subject: [PATCH 37/67] Stopped things opening in a new window, because it's
 really annoying. If you want to do this, use the appropriate keyboard
 shortcut or mouse button

---
 RIGS/templates/RIGS/event_invoice.html | 4 ++--
 RIGS/templates/RIGS/invoice_list.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 79098853..0e56158f 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -50,7 +50,7 @@
                             danger
                         {% endif %}
                         ">
-                    N{{ object.pk|stringformat:"05d" }}
    
+                    N{{ object.pk|stringformat:"05d" }}
    
                         {{ object.get_status_display }}
                     {{ object.start_date }}
                     {{ object.name }}
@@ -76,7 +76,7 @@
                         {% endif %}
                     
                     
-                        
+                        
                             
                         
                     
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index f7d23fcf..f833b89a 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -28,7 +28,7 @@
             {% for object in object_list %}
                 
                     {{ object.pk }}
-                    N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
+                    N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
                         {{ object.event.get_status_display }}
                     
                     {% if object.organisation %}

From 68b35c2d249763f9d5e60a717f9629ebabe6b226 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 29 May 2016 23:47:56 +0100
Subject: [PATCH 38/67] Removed print button conditions following discussion

---
 RIGS/templates/RIGS/invoice_detail.html | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index e5b14a7f..ad177ba4 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -15,12 +15,10 @@
                      
                 
-                {% if not object.event.organisation.union_account %}
-                     
-                    
    
-                {% endif %}
+                 
+                
    
             
    
         
    
 

From 9108cb3c4e264b38455b99c57b35deb0398912dc Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sat, 4 Jun 2016 18:08:43 +0100
Subject: [PATCH 39/67] Fail! Hide non-rigs from waiting invoices

---
 RIGS/finance.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RIGS/finance.py b/RIGS/finance.py
index be52b1f1..1fd9b535 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -124,6 +124,7 @@ class InvoiceWaiting(generic.ListView):
                 Q(start_date__lte=datetime.date.today(), end_date__isnull=True) |  # Starts before with no end
                 Q(end_date__lte=datetime.date.today()) # Has end date, finishes before
             ) & Q(invoice__isnull=True) # Has not already been invoiced
+            & Q(is_rig=True) # Is a rig (not non-rig)
             
             ).order_by('start_date') \
             .select_related('person',

From f92f418bc5cff671930a52bdab319cc8704553c1 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Mon, 6 Jun 2016 23:06:30 +0100
Subject: [PATCH 40/67] Fixed waiting invoice counter - closes #239

---
 RIGS/finance.py                        | 1 +
 RIGS/templates/RIGS/event_invoice.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RIGS/finance.py b/RIGS/finance.py
index 1fd9b535..75de8bd9 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -112,6 +112,7 @@ class InvoiceWaiting(generic.ListView):
         for obj in self.get_objects():
             total += obj.sum_total
         context['total'] = total
+        context['count'] = len(self.get_objects())
         return context
 
     def get_queryset(self):
diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 0e56158f..3136fe40 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -15,7 +15,7 @@
 
 {% block content %}
     
    
-        
    Events for Invoice ({{object_list|length}} Events, £ {{ total|floatformat:2 }})
    
+        
    Events for Invoice ({{count}} Events, £ {{ total|floatformat:2 }})
    
         
    These events have happened, but paperwork has not yet been sent to treasury
    
         {% if is_paginated %}
             
    

From 1163b117e4020421b0b4ce33f7abec330c8a5505 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Tue, 14 Jun 2016 19:23:40 +0100
Subject: [PATCH 41/67] Fixed #240

---
 RIGS/templates/RIGS/invoice_list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index f833b89a..7b080897 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -31,10 +31,10 @@
                     N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
                         {{ object.event.get_status_display }}
                     
-                    {% if object.organisation %}
+                    {% if object.event.organisation %}
                             {{ object.event.organisation.name }}
                             
    
-                            {{ object.organisation.union_account|yesno:'Internal,External' }}
+                            {{ object.event.organisation.union_account|yesno:'Internal,External' }}
                         {% else %}
                             {{ object.event.person.name }}
                             
    

From f265da2f1d9277a404c849d1004fb7a2907c6df0 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Tue, 14 Jun 2016 19:45:45 +0100
Subject: [PATCH 42/67] Fixed #241 and #244

---
 RIGS/templates/RIGS/event_invoice.html | 124 +++++++++++++------------
 RIGS/templates/RIGS/invoice_list.html  |  82 ++++++++--------
 2 files changed, 105 insertions(+), 101 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 3136fe40..05b351aa 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -22,68 +22,70 @@
                 {% paginator %}
             
    
         {% endif %}
-        
-            
-            
-                
-                
-                
-                
-                
-                
-                
-            
-            
-            
-            {% for object in object_list %}
-                
-                    
-                    
-                    
-                    
-                    
-                    
-                    
+        
    
+            
    #Start DateEvent NameClientCost
    {{ object.start_date }}{{ object.name }}
-                        {% if object.organisation %}
-                            {{ object.organisation.name }}
-                            
    
-                            {{ object.organisation.union_account|yesno:'Internal,External' }}
-                        {% else %}
-                            {{ object.person.name }}
-                            
    
-                            External
-                        {% endif %}
-
-                        		{{ object.sum_total|floatformat:2 }}
-                        {% if object.mic %}
-                            {{ object.mic.initials }}
    
-                            
-                        {% else %}
-                            
-                        {% endif %}
-                        		
-                        
-                            
-                        
-                    
    
+                
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                    
-            {% endfor %}
-            
-        
    #Start DateEvent NameClientCostMIC
                 
    
+                
+                
+                {% for object in object_list %}
+                    
+                        N{{ object.pk|stringformat:"05d" }}
    
+                            {{ object.get_status_display }}
+                        {{ object.start_date }}
+                        {{ object.name }}
+                        
+                            {% if object.organisation %}
+                                {{ object.organisation.name }}
+                                
    
+                                {{ object.organisation.union_account|yesno:'Internal,External' }}
+                            {% else %}
+                                {{ object.person.name }}
+                                
    
+                                External
+                            {% endif %}
+
+                        
+                        {{ object.sum_total|floatformat:2 }}
+                        
+                            {% if object.mic %}
+                                {{ object.mic.initials }}
    
+                                
+                            {% else %}
+                                
+                            {% endif %}
+                        
+                        
+                            
+                                
+                            
+                        
+                    
+                {% endfor %}
+                
+            
+        
    
         {% if is_paginated %}
             
    
                 {% paginator %}
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 7b080897..2c77d352 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -12,47 +12,49 @@
                 {% paginator %}
             
    
         {% endif %}
-        
-            
-            
-                
-                
-                
-                
-                
-                
-                
-            
-            
-            
-            {% for object in object_list %}
-                
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    
+        
    
+            
    #EventClientEvent DateInvoice DateBalance
    {{ object.pk }}N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
-                        {{ object.event.get_status_display }}    		{% if object.event.organisation %}
-                            {{ object.event.organisation.name }}
-                            
    
-                            {{ object.event.organisation.union_account|yesno:'Internal,External' }}
-                        {% else %}
-                            {{ object.event.person.name }}
-                            
    
-                            External
-                        {% endif %}
-                        		{{ object.event.start_date }}{{ object.invoice_date }}{{ object.balance|floatformat:2 }}
-                        
-                            
-                        
-                    
    
+                
+                
+                    
+                    
+                    
+                    
+                    
+                    
+                    
-            {% endfor %}
-            
-        
    #EventClientEvent DateInvoice DateBalance
                 
    
+                
+                
+                {% for object in object_list %}
+                    
+                        {{ object.pk }}
+                        N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
+                            {{ object.event.get_status_display }}
+                        
+                        {% if object.event.organisation %}
+                                {{ object.event.organisation.name }}
+                                
    
+                                {{ object.event.organisation.union_account|yesno:'Internal,External' }}
+                            {% else %}
+                                {{ object.event.person.name }}
+                                
    
+                                External
+                            {% endif %}
+                        
+                        {{ object.event.start_date }}
+                        {{ object.invoice_date }}
+                        {{ object.balance|floatformat:2 }}
+                        
+                            
+                                
+                            
+                        
+                    
+                {% endfor %}
+                
+            
+        
    
         {% if is_paginated %}
             
    
                 {% paginator %}

From a7247c273edaf26e73a520cc753807f671f8177f Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Tue, 14 Jun 2016 19:50:35 +0100
Subject: [PATCH 43/67] Fixed #245

---
 RIGS/templates/RIGS/event_table.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html
index 1868f2dd..949c710a 100644
--- a/RIGS/templates/RIGS/event_table.html
+++ b/RIGS/templates/RIGS/event_table.html
@@ -1,7 +1,7 @@
 
    
     
-        
+        
@@ -23,7 +23,7 @@
 							danger
 						{% endif %}
                         ">
-                
+                
    
         
    #
         Event Date
         Event Details
         Event Timings{{ event.pk }}
                 
                     
    {{ event.start_date|date:"D d/m/Y" }}
    
                     {% if event.end_date and event.end_date != event.start_date %}

From e1578eb0d47b8d5a17a57b23b828e32b61a265cc Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Wed, 15 Jun 2016 13:00:14 +0100
Subject: [PATCH 44/67] Fixed responsive table fail

---
 RIGS/templates/RIGS/event_invoice.html | 2 +-
 RIGS/templates/RIGS/invoice_list.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index 05b351aa..cd080a74 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -22,7 +22,7 @@
                 {% paginator %}
             
         {% endif %}
-        
    
+        
    
             
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 2c77d352..5bd7ef70 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -12,7 +12,7 @@
                 {% paginator %}
             
         {% endif %}
-        
    
+        
    
             
    
                 
                 
    

From 67624eea6f2bae4f44f5c7ae179182d67aed1949 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Wed, 15 Jun 2016 23:18:46 +0100
Subject: [PATCH 45/67] Allow deleting invoices, if there are no payments yet

---
 RIGS/finance.py                               | 19 ++++++++++
 .../RIGS/invoice_confirm_delete.html          | 35 +++++++++++++++++++
 RIGS/templates/RIGS/invoice_detail.html       |  4 +++
 RIGS/urls.py                                  |  3 ++
 4 files changed, 61 insertions(+)
 create mode 100644 RIGS/templates/RIGS/invoice_confirm_delete.html

diff --git a/RIGS/finance.py b/RIGS/finance.py
index 75de8bd9..65fc3b07 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -94,6 +94,25 @@ class InvoiceVoid(generic.View):
             return HttpResponseRedirect(reverse_lazy('invoice_list'))
         return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': object.pk}))
 
+class InvoiceDelete(generic.DeleteView):
+    model = models.Invoice
+
+    def get(self, request, pk):
+        obj = self.get_object()
+        if obj.payment_set.all().count() > 0:
+            messages.info(self.request, '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(self.request, '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
diff --git a/RIGS/templates/RIGS/invoice_confirm_delete.html b/RIGS/templates/RIGS/invoice_confirm_delete.html
new file mode 100644
index 00000000..fe295ed6
--- /dev/null
+++ b/RIGS/templates/RIGS/invoice_confirm_delete.html
@@ -0,0 +1,35 @@
+{% extends 'base.html' %}
+
+{% block title %}Delete payment on invoice {{ object.invoice.pk }}{% endblock %}
+
+{% block content %}
+    
    
+        
+    
    
+{% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index ad177ba4..27b4c514 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -11,6 +11,10 @@
 
             
    
                 
    
+                
+                     
+                
                 
                      
diff --git a/RIGS/urls.py b/RIGS/urls.py
index 4338df08..ee949ff8 100644
--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -127,6 +127,9 @@ urlpatterns = patterns('',
                        url(r'^invoice/(?P\d+)/void/$',
                            permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
                            name='invoice_void'),
+                       url(r'^invoice/(?P\d+)/delete/$',
+                           permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
+                           name='invoice_delete'),
                        url(r'^payment/create/$',
                            permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
                            name='payment_create'),

From 667b0c80ca7bc7e8fd2eae8839f969d61c46dcd1 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Thu, 16 Jun 2016 01:44:59 +0100
Subject: [PATCH 46/67] Added tests for invoice deleting

---
 RIGS/test_unit.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py
index 75fcca5a..c51874f4 100644
--- a/RIGS/test_unit.py
+++ b/RIGS/test_unit.py
@@ -155,3 +155,57 @@ class TestAdminMergeObjects(TestCase):
             if event.organisation == self.organisations[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(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()
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+    def test_invoice_delete_allowed(self):
+        request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[2].pk})
+        
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, "Are you sure")
+
+        # Check the invoice still exists
+        self.assertTrue(models.Invoice.objects.get(pk=self.invoices[2].pk))
+
+        # Actually delete it
+        response = self.client.post(request_url, follow=True)
+
+        # Check the invoice is deleted
+        self.assertRaises(ObjectDoesNotExist, models.Invoice.objects.get, pk=self.invoices[2].pk)
+
+    def test_invoice_delete_not_allowed(self):
+        request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[1].pk})
+        
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(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))
+
+        # Try to actually delete it
+        response = self.client.post(request_url, follow=True)
+
+        # Check this didn't work
+        self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
\ No newline at end of file

From 05b2de561e3c0a18c05e7f2fcbf0d9fa19bde33a Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 10 Jul 2016 09:54:35 +0100
Subject: [PATCH 47/67] Added phone links - closes #247

---
 RIGS/templates/RIGS/organisation_list.html | 2 +-
 RIGS/templates/RIGS/person_list.html       | 2 +-
 RIGS/templates/RIGS/profile_detail.html    | 2 +-
 RIGS/templates/RIGS/venue_list.html        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RIGS/templates/RIGS/organisation_list.html b/RIGS/templates/RIGS/organisation_list.html
index 2c88408a..c8856886 100644
--- a/RIGS/templates/RIGS/organisation_list.html
+++ b/RIGS/templates/RIGS/organisation_list.html
@@ -45,7 +45,7 @@
                         
    
-                        
+                        
-                        
+                        
-                        
+                        
-                        
+                        
    
                 
                 
    {{ object.pk }}
                         {{ object.name }}
                         {{ object.email }}{{ object.phone }}{{ object.phone }}
                         {{ object.notes|yesno|capfirst }}
                         {{ object.union_account|yesno|capfirst }}
                         
diff --git a/RIGS/templates/RIGS/person_list.html b/RIGS/templates/RIGS/person_list.html
index a7c1c08d..2cbdff8e 100644
--- a/RIGS/templates/RIGS/person_list.html
+++ b/RIGS/templates/RIGS/person_list.html
@@ -44,7 +44,7 @@
                         {{ person.pk }}
                         {{ person.name }}
                         {{ person.email }}{{ person.phone }}{{ person.phone }}
                         {{ person.notes|yesno|capfirst }}
                         
                             
diff --git a/RIGS/templates/RIGS/profile_detail.html b/RIGS/templates/RIGS/profile_detail.html
index e69e7bf0..11904b18 100644
--- a/RIGS/templates/RIGS/profile_detail.html
+++ b/RIGS/templates/RIGS/profile_detail.html
@@ -71,7 +71,7 @@
 				
    {{object.initials}}
    
 
 				
    Phone
    
-				
    {{object.phone}}
    
+				
    {{object.phone}}
    
 			
 			{% if not request.is_ajax %}
 			{% if object.pk == user.pk %}
diff --git a/RIGS/templates/RIGS/venue_list.html b/RIGS/templates/RIGS/venue_list.html
index cf89686c..88ae61ac 100644
--- a/RIGS/templates/RIGS/venue_list.html
+++ b/RIGS/templates/RIGS/venue_list.html
@@ -45,7 +45,7 @@
                             		{{ object.pk }}
                         {{ object.name }}
                         {{ object.email }}{{ object.phone }}{{ object.phone }}
                         {{ object.notes|yesno|capfirst }}
                         
                             

From 39d27d273050cec057b60ebef4d049713f971f06 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 10 Jul 2016 10:49:23 +0100
Subject: [PATCH 48/67] Basic invoice UI improvements - closes #232

---
 RIGS/finance.py                         |  1 +
 RIGS/models.py                          |  4 +++
 RIGS/templates/RIGS/event_detail.html   | 42 +++++++++++++++++++------
 RIGS/templates/RIGS/invoice_detail.html |  2 +-
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/RIGS/finance.py b/RIGS/finance.py
index 75de8bd9..5cc5c0c1 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -144,6 +144,7 @@ class InvoiceEvent(generic.View):
 
         if created:
             invoice.invoice_date = datetime.date.today()
+            messages.success(self.request, 'Invoice created successfully')
 
         return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': invoice.pk}))
 
diff --git a/RIGS/models.py b/RIGS/models.py
index 535aa42c..0650d81c 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -526,6 +526,10 @@ class Invoice(models.Model):
     def balance(self):
         return self.sum_total - self.payment_total
 
+    @property
+    def is_closed(self):
+        return self.balance == 0 or self.void
+
     def __str__(self):
         return "%i: %s (%.2f)" % (self.pk, self.event, self.balance)
 
diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index 81658663..d4b089a9 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -25,9 +25,17 @@
                             class="hidden-xs">Duplicate
                 {% if event.is_rig %}
                     {% if perms.RIGS.add_invoice %}
-                         
+                         
+                                
                     {% endif %}
                 {% endif %}
             
@@ -190,9 +198,17 @@
                         class="hidden-xs">Duplicate
             {% if event.is_rig %}
                 {% if perms.RIGS.add_invoice %}
-                     
+                     
+                            
                 {% endif %}
             {% endif %}
         
@@ -227,9 +243,17 @@
                             class="hidden-xs">Duplicate
                 {% if event.is_rig %}
                     {% if perms.RIGS.add_invoice %}
-                         
+                         
+                                
                     {% endif %}
                 {% endif %}
             
diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index ad177ba4..2973c358 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -38,7 +38,7 @@
                 
             
             
    
-                
    
+                
    
                     
    Event Details
    
                     
    
                         
    

From 01d2eae7bcffd4c36684be2a15afec8da78fabd3 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 10 Jul 2016 11:14:24 +0100
Subject: [PATCH 49/67] More invoice UI improvements - makes colouring
 consistent - also closes #242

---
 RIGS/templates/RIGS/invoice_detail.html |  7 +++++--
 RIGS/templates/RIGS/invoice_list.html   | 19 +++++++++++++++++--
 templates/base.html                     |  4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/RIGS/templates/RIGS/invoice_detail.html b/RIGS/templates/RIGS/invoice_detail.html
index 2973c358..af26ad21 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -38,8 +38,11 @@
                 
    
             
    
             
    
-                
    
-                    
    Event Details
    
+                
    
+                    
    Event Details
+                        {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
+                        
+                    
    
                     
    
                         
    
                             
    Event Number
    
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 5bd7ef70..7dc6d8ee 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -29,8 +29,23 @@
                 {% for object in object_list %}
                     
    
                         {{ object.pk }}N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
-                            {{ object.event.get_status_display }}    		N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
    
+                            {{ object.event.get_status_display }}
+                            {% if not object.event.mic %}(No MIC){% endif %}
+                                		
                         
                         {% if object.event.organisation %}
                                 {{ object.event.organisation.name }}
diff --git a/templates/base.html b/templates/base.html
index 7a2d15f9..24cc30bc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -76,9 +76,9 @@
                         
      
                             {% if perms.RIGS.add_invoice %}
                                 
    •  Waiting
      • 
+                                        class="glyphicon glyphicon-briefcase text-danger"> Waiting
                             {% endif %}
-                            
    •  Outstanding
+                            
    •  Outstanding
                             
      • 
                             
    • 
                                 Archive
      • 

From abbb20e49e38f5ebab30c99aca2629e26a79a50c Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 10 Jul 2016 11:23:06 +0100
Subject: [PATCH 50/67] More invoice UI improvements, makes colour coding of
 invoice vs events clearer

---
 RIGS/templates/RIGS/event_invoice.html |  2 +-
 RIGS/templates/RIGS/invoice_list.html  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index cd080a74..fcbe5e87 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -26,7 +26,7 @@
             
-                    
+                    
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index 7dc6d8ee..2f34b6c9 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -16,7 +16,7 @@
             
      
                 
                 
      #Event #
                     Start Date
                     Event Name
                     Client
      
-                    
+                    
@@ -27,8 +27,9 @@
                 
                 {% for object in object_list %}
-                    
-                        
+                    
+                        
      
                 
                 
      #Invoice #
                     Event
                     Client
                     Event Date
      
                 
      {{ object.pk }}
      {{ object.pk }}
      
+                        {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(O/S){% endif %}      		
                         N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} 
      
-                            {{ object.event.get_status_display }}
-                            {% if not object.event.mic %}(No MIC){% endif %}
+                            {{ object.event.get_status_display }}{% if not object.event.mic %}, No MIC{% endif %}
                                   		
                         
                         {% if object.event.organisation %}

From 9178cf606278bc401582c706e63bdab3c434fd44 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Sun, 10 Jul 2016 11:31:25 +0100
Subject: [PATCH 51/67] Remove pagination from invoice waiting page

---
 RIGS/finance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RIGS/finance.py b/RIGS/finance.py
index 5cc5c0c1..59576947 100644
--- a/RIGS/finance.py
+++ b/RIGS/finance.py
@@ -103,7 +103,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):

From 98a9b22e0e610dce8280dcb02a539368320a55c0 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 11:58:56 +0100
Subject: [PATCH 52/67] Switch to using travis for builds

---
 .travis.yml |  17 +++++++++
 wercker.yml | 103 ----------------------------------------------------
 2 files changed, 17 insertions(+), 103 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 wercker.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e4fa074c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: python
+python:
+  "2.7"
+
+before_install:
+  - "export DISPLAY=:99.0"
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
+
+install:
+  - pip install coverage
+
+script:
+  - coverage run manage.py test RIGS
+
+after_script:
+  - coverage report -m --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/* | tee coverage.txt
+  - coverage html --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/*
diff --git a/wercker.yml b/wercker.yml
deleted file mode 100644
index c2749a3e..00000000
--- a/wercker.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-# This references the default Python container from
-# the Docker Hub with the 2.7 tag:
-# https://registry.hub.docker.com/_/python/
-# If you want to use a slim Python container with
-# version 3.4.3 you would use: python:3.4-slim
-# If you want Google's container you would reference google/python
-# Read more about containers on our dev center
-# http://devcenter.wercker.com/docs/containers/index.html
-box: heroku/python
-# You can also use services such as databases. Read more on our dev center:
-# http://devcenter.wercker.com/docs/services/index.html
-services:
-#    - id: postgres
-#      env:
-#        POSTGRES_PASSWORD: pyrigstesting
-#        POSTGRES_USER: pyrigs
-    # http://devcenter.wercker.com/docs/services/postgresql.html
-
-    # - mongodb
-    # http://devcenter.wercker.com/docs/services/mongodb.html
-
-# This is the build pipeline. Pipelines are the core of wercker
-# Read more about pipelines on our dev center
-# http://devcenter.wercker.com/docs/pipelines/index.html
-build:
-  # The steps that will be executed on build
-  # Steps make up the actions in your pipeline
-  # Read more about steps on our dev center:
-  # http://devcenter.wercker.com/docs/steps/index.html
-  steps:
-    - install-packages:
-        packages: firefox xvfb
-
-    - script:
-        name: Enable virtual display
-        code: |-
-          # Start xvfb which gives the context an virtual display
-          # which is required for tests that require an GUI
-          export DISPLAY=:99.0
-          start-stop-daemon --start --quiet --pidfile /tmp/xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset
-          # Give xvfb time to start. 3 seconds is the default for all xvfb-run commands.
-          # sleep 3
-
-    - script:
-        name: virtualenv install
-        code: |
-          pip install virtualenv
-
-    # A step that sets up the python virtual environment
-    - virtualenv:
-        name: setup virtual environment
-        install_wheel: false # Enable wheel to speed up builds (experimental)
-
-    # # Use this virtualenv step for python 3.2
-    # - virtualenv
-    #     name: setup virtual environment
-    #     python_location: /usr/bin/python3.2
-
-    # # This pip-install clears the local wheel cache
-    # - pip-install:
-    #     clean_wheel_dir: true
-
-    # A custom script step, name value is used in the UI
-    # and the code value contains the command that get executed
-    - script:
-        name: Python Version
-        code: |
-          echo "python version $(python --version) running"
-          echo "pip version $(pip --version) running"
-
-    # Django uses this to connect to the database
-#    - script:
-#        name: set environment
-#        code: |
-#          export DEBUG=0
-#          export DATABASE_URL="postgres://pyrigs:pyrigstesting@$POSTGRES_PORT_5432_TCP_ADDR:$POSTGRES_PORT_5432_TCP_PORT$POSTGRES_NAME"
-
-    # A step that executes `pip install` command.
-    - pip-install
-
-    # Install coverage
-    - script:
-        name: install coverage
-        code: |
-          pip install coverage
-
-    # Collect static files so the manifest storage knows where to look
-    - script:
-        name: collect static
-        code: |
-          python manage.py collectstatic --noinput
-
-    # Run python tests
-    - script:
-        name: run tests
-        code: |
-          coverage run manage.py test RIGS
-
-    - script:
-        name: collect coverage data
-        code: |
-          coverage report -m --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/* | tee coverage.txt
-          coverage html --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/*
\ No newline at end of file

From 8a3a52a21b3d4f8cd938cfd701d78f969b12f86a Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:02:16 +0100
Subject: [PATCH 53/67] Add missing pip commands.

Travis docs say this isn't necessary, fails without https://docs.travis-ci.com/user/languages/python#pip
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e4fa074c..913befab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
+  - pip install .
+  - pip install -r requirements.txt
   - pip install coverage
 
 script:

From 8a0cbe32bdd9cf25221becc6cd049b362cb9ae48 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:03:21 +0100
Subject: [PATCH 54/67] Remove erroneous travis pip command.

I hate setting up travis
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 913befab..bcc8b28f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ before_install:
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 
 install:
-  - pip install .
   - pip install -r requirements.txt
   - pip install coverage
 

From 4cec20e357d20e8f91593231d073e7a8f22eb7c9 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:07:19 +0100
Subject: [PATCH 55/67] Add collect static command

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bcc8b28f..addaa1d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ install:
   - pip install -r requirements.txt
   - pip install coverage
 
+before_script:
+  - python manage.py collectstatic --noinput
+
 script:
   - coverage run manage.py test RIGS
 

From 3052f283299048465c43f89b4a41be2ed67153fd Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:15:17 +0100
Subject: [PATCH 56/67] Enable coveralls reporting

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index addaa1d6..1d731eb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
 
 install:
   - pip install -r requirements.txt
-  - pip install coverage
+  - pip install coveralls
 
 before_script:
   - python manage.py collectstatic --noinput
@@ -16,6 +16,5 @@ before_script:
 script:
   - coverage run manage.py test RIGS
 
-after_script:
-  - coverage report -m --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/* | tee coverage.txt
-  - coverage html --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/*
+after_success:
+  - coveralls

From 021edfd39d80e1dc4d8cf9626915b112d9e9cbe7 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:27:00 +0100
Subject: [PATCH 57/67] Filter coverage down to just our code

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1d731eb9..4156c612 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - python manage.py collectstatic --noinput
 
 script:
-  - coverage run manage.py test RIGS
+  - coverage run --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/* manage.py test RIGS
 
 after_success:
   - coveralls

From 190825f5efb699f0445d1a0a25ec4d1214d9608c Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:34:51 +0100
Subject: [PATCH 58/67] Tidy up coverage to use a .coveragerc file instead of
 having it .travis.yml

---
 .coveragerc | 6 ++++++
 .travis.yml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..b369f80b
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,6 @@
+[run]
+source =
+    ./
+
+omit =
+    */migrations/*
diff --git a/.travis.yml b/.travis.yml
index 4156c612..1d731eb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
   - python manage.py collectstatic --noinput
 
 script:
-  - coverage run --include=PyRIGS/*.*,RIGS/*.* --omit=*/migrations/* manage.py test RIGS
+  - coverage run manage.py test RIGS
 
 after_success:
   - coveralls

From 7d14429d849bcd8ab8e67f91be79949bdda9d659 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:38:43 +0100
Subject: [PATCH 59/67] Update status badges

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8fe10454..809c037c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # TEC PA & Lighting - PyRIGS #
-[![wercker status](https://app.wercker.com/status/2dbe0517c3d83859c985ffc5a55a2802/m/master "wercker status")](https://app.wercker.com/project/bykey/2dbe0517c3d83859c985ffc5a55a2802)
+[![Build Status](https://travis-ci.org/nottinghamtec/PyRIGS.svg?branch=develop)](https://travis-ci.org/nottinghamtec/PyRIGS)
+[![Coverage Status](https://coveralls.io/repos/github/nottinghamtec/PyRIGS/badge.svg?branch=develop)](https://coveralls.io/github/nottinghamtec/PyRIGS?branch=develop)
 
 Welcome to TEC PA & Lightings PyRIGS program. This is a reimplementation of the existing Rig Information Gathering System (RIGS) that was developed using Ruby on Rails.
 

From 4c09258566c2ae726cfbffd057e46e8daf3508a7 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:40:39 +0100
Subject: [PATCH 60/67] Enable code climate

---
 .codeclimate.yml |   32 ++
 .csslintrc       |    2 +
 .eslintignore    |    1 +
 .eslintrc        |  213 +++++++++
 .rubocop.yml     | 1156 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 1404 insertions(+)
 create mode 100644 .codeclimate.yml
 create mode 100644 .csslintrc
 create mode 100644 .eslintignore
 create mode 100644 .eslintrc
 create mode 100644 .rubocop.yml

diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 00000000..d8fb239d
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,32 @@
+---
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  radon:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.css"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+  - "**.rb"
+exclude_paths:
+- config/
diff --git a/.csslintrc b/.csslintrc
new file mode 100644
index 00000000..aacba956
--- /dev/null
+++ b/.csslintrc
@@ -0,0 +1,2 @@
+--exclude-exts=.min.css
+--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..96212a35
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+**/*{.,-}min.js
diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..9faa3750
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,213 @@
+ecmaFeatures:
+  modules: true
+  jsx: true
+
+env:
+  amd: true
+  browser: true
+  es6: true
+  jquery: true
+  node: true
+
+# http://eslint.org/docs/rules/
+rules:
+  # Possible Errors
+  comma-dangle: [2, never]
+  no-cond-assign: 2
+  no-console: 0
+  no-constant-condition: 2
+  no-control-regex: 2
+  no-debugger: 2
+  no-dupe-args: 2
+  no-dupe-keys: 2
+  no-duplicate-case: 2
+  no-empty: 2
+  no-empty-character-class: 2
+  no-ex-assign: 2
+  no-extra-boolean-cast: 2
+  no-extra-parens: 0
+  no-extra-semi: 2
+  no-func-assign: 2
+  no-inner-declarations: [2, functions]
+  no-invalid-regexp: 2
+  no-irregular-whitespace: 2
+  no-negated-in-lhs: 2
+  no-obj-calls: 2
+  no-regex-spaces: 2
+  no-sparse-arrays: 2
+  no-unexpected-multiline: 2
+  no-unreachable: 2
+  use-isnan: 2
+  valid-jsdoc: 0
+  valid-typeof: 2
+
+  # Best Practices
+  accessor-pairs: 2
+  block-scoped-var: 0
+  complexity: [2, 6]
+  consistent-return: 0
+  curly: 0
+  default-case: 0
+  dot-location: 0
+  dot-notation: 0
+  eqeqeq: 2
+  guard-for-in: 2
+  no-alert: 2
+  no-caller: 2
+  no-case-declarations: 2
+  no-div-regex: 2
+  no-else-return: 0
+  no-empty-label: 2
+  no-empty-pattern: 2
+  no-eq-null: 2
+  no-eval: 2
+  no-extend-native: 2
+  no-extra-bind: 2
+  no-fallthrough: 2
+  no-floating-decimal: 0
+  no-implicit-coercion: 0
+  no-implied-eval: 2
+  no-invalid-this: 0
+  no-iterator: 2
+  no-labels: 0
+  no-lone-blocks: 2
+  no-loop-func: 2
+  no-magic-number: 0
+  no-multi-spaces: 0
+  no-multi-str: 0
+  no-native-reassign: 2
+  no-new-func: 2
+  no-new-wrappers: 2
+  no-new: 2
+  no-octal-escape: 2
+  no-octal: 2
+  no-proto: 2
+  no-redeclare: 2
+  no-return-assign: 2
+  no-script-url: 2
+  no-self-compare: 2
+  no-sequences: 0
+  no-throw-literal: 0
+  no-unused-expressions: 2
+  no-useless-call: 2
+  no-useless-concat: 2
+  no-void: 2
+  no-warning-comments: 0
+  no-with: 2
+  radix: 2
+  vars-on-top: 0
+  wrap-iife: 2
+  yoda: 0
+
+  # Strict
+  strict: 0
+
+  # Variables
+  init-declarations: 0
+  no-catch-shadow: 2
+  no-delete-var: 2
+  no-label-var: 2
+  no-shadow-restricted-names: 2
+  no-shadow: 0
+  no-undef-init: 2
+  no-undef: 0
+  no-undefined: 0
+  no-unused-vars: 0
+  no-use-before-define: 0
+
+  # Node.js and CommonJS
+  callback-return: 2
+  global-require: 2
+  handle-callback-err: 2
+  no-mixed-requires: 0
+  no-new-require: 0
+  no-path-concat: 2
+  no-process-exit: 2
+  no-restricted-modules: 0
+  no-sync: 0
+
+  # Stylistic Issues
+  array-bracket-spacing: 0
+  block-spacing: 0
+  brace-style: 0
+  camelcase: 0
+  comma-spacing: 0
+  comma-style: 0
+  computed-property-spacing: 0
+  consistent-this: 0
+  eol-last: 0
+  func-names: 0
+  func-style: 0
+  id-length: 0
+  id-match: 0
+  indent: 0
+  jsx-quotes: 0
+  key-spacing: 0
+  linebreak-style: 0
+  lines-around-comment: 0
+  max-depth: 0
+  max-len: 0
+  max-nested-callbacks: 0
+  max-params: 0
+  max-statements: [2, 30]
+  new-cap: 0
+  new-parens: 0
+  newline-after-var: 0
+  no-array-constructor: 0
+  no-bitwise: 0
+  no-continue: 0
+  no-inline-comments: 0
+  no-lonely-if: 0
+  no-mixed-spaces-and-tabs: 0
+  no-multiple-empty-lines: 0
+  no-negated-condition: 0
+  no-nested-ternary: 0
+  no-new-object: 0
+  no-plusplus: 0
+  no-restricted-syntax: 0
+  no-spaced-func: 0
+  no-ternary: 0
+  no-trailing-spaces: 0
+  no-underscore-dangle: 0
+  no-unneeded-ternary: 0
+  object-curly-spacing: 0
+  one-var: 0
+  operator-assignment: 0
+  operator-linebreak: 0
+  padded-blocks: 0
+  quote-props: 0
+  quotes: 0
+  require-jsdoc: 0
+  semi-spacing: 0
+  semi: 0
+  sort-vars: 0
+  space-after-keywords: 0
+  space-before-blocks: 0
+  space-before-function-paren: 0
+  space-before-keywords: 0
+  space-in-parens: 0
+  space-infix-ops: 0
+  space-return-throw-case: 0
+  space-unary-ops: 0
+  spaced-comment: 0
+  wrap-regex: 0
+
+  # ECMAScript 6
+  arrow-body-style: 0
+  arrow-parens: 0
+  arrow-spacing: 0
+  constructor-super: 0
+  generator-star-spacing: 0
+  no-arrow-condition: 0
+  no-class-assign: 0
+  no-const-assign: 0
+  no-dupe-class-members: 0
+  no-this-before-super: 0
+  no-var: 0
+  object-shorthand: 0
+  prefer-arrow-callback: 0
+  prefer-const: 0
+  prefer-reflect: 0
+  prefer-spread: 0
+  prefer-template: 0
+  require-yield: 0
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 00000000..3f1d2224
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,1156 @@
+AllCops:
+  DisabledByDefault: true
+
+#################### Lint ################################
+
+Lint/AmbiguousOperator:
+  Description: >-
+                 Checks for ambiguous operators in the first argument of a
+                 method invocation without parentheses.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-as-args'
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Description: >-
+                 Checks for ambiguous regexp literals in the first argument of
+                 a method invocation without parenthesis.
+  Enabled: true
+
+Lint/AssignmentInCondition:
+  Description: "Don't use assignment in conditions."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition'
+  Enabled: true
+
+Lint/BlockAlignment:
+  Description: 'Align block ends correctly.'
+  Enabled: true
+
+Lint/CircularArgumentReference:
+  Description: "Don't refer to the keyword argument in the default value."
+  Enabled: true
+
+Lint/ConditionPosition:
+  Description: >-
+                 Checks for condition placed in a confusing position relative to
+                 the keyword.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
+  Enabled: true
+
+Lint/Debugger:
+  Description: 'Check for debugger calls.'
+  Enabled: true
+
+Lint/DefEndAlignment:
+  Description: 'Align ends corresponding to defs correctly.'
+  Enabled: true
+
+Lint/DeprecatedClassMethods:
+  Description: 'Check for deprecated class method calls.'
+  Enabled: true
+
+Lint/DuplicateMethods:
+  Description: 'Check for duplicate methods calls.'
+  Enabled: true
+
+Lint/EachWithObjectArgument:
+  Description: 'Check for immutable argument given to each_with_object.'
+  Enabled: true
+
+Lint/ElseLayout:
+  Description: 'Check for odd code arrangement in an else block.'
+  Enabled: true
+
+Lint/EmptyEnsure:
+  Description: 'Checks for empty ensure block.'
+  Enabled: true
+
+Lint/EmptyInterpolation:
+  Description: 'Checks for empty string interpolation.'
+  Enabled: true
+
+Lint/EndAlignment:
+  Description: 'Align ends correctly.'
+  Enabled: true
+
+Lint/EndInMethod:
+  Description: 'END blocks should not be placed inside method definitions.'
+  Enabled: true
+
+Lint/EnsureReturn:
+  Description: 'Do not use return in an ensure block.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-return-ensure'
+  Enabled: true
+
+Lint/Eval:
+  Description: 'The use of eval represents a serious security risk.'
+  Enabled: true
+
+Lint/FormatParameterMismatch:
+  Description: 'The number of parameters to format/sprint must match the fields.'
+  Enabled: true
+
+Lint/HandleExceptions:
+  Description: "Don't suppress exception."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
+  Enabled: true
+
+Lint/InvalidCharacterLiteral:
+  Description: >-
+                 Checks for invalid character literals with a non-escaped
+                 whitespace character.
+  Enabled: true
+
+Lint/LiteralInCondition:
+  Description: 'Checks of literals used in conditions.'
+  Enabled: true
+
+Lint/LiteralInInterpolation:
+  Description: 'Checks for literals used in interpolation.'
+  Enabled: true
+
+Lint/Loop:
+  Description: >-
+                 Use Kernel#loop with break rather than begin/end/until or
+                 begin/end/while for post-loop tests.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#loop-with-break'
+  Enabled: true
+
+Lint/NestedMethodDefinition:
+  Description: 'Do not use nested method definitions.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-methods'
+  Enabled: true
+
+Lint/NonLocalExitFromIterator:
+  Description: 'Do not use return in iterator to cause non-local exit.'
+  Enabled: true
+
+Lint/ParenthesesAsGroupedExpression:
+  Description: >-
+                 Checks for method calls with a space before the opening
+                 parenthesis.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
+  Enabled: true
+
+Lint/RequireParentheses:
+  Description: >-
+                 Use parentheses in the method call to avoid confusion
+                 about precedence.
+  Enabled: true
+
+Lint/RescueException:
+  Description: 'Avoid rescuing the Exception class.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-blind-rescues'
+  Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Description: >-
+                 Do not use the same name as outer local variable
+                 for block arguments or block local variables.
+  Enabled: true
+
+Lint/StringConversionInInterpolation:
+  Description: 'Checks for Object#to_s usage in string interpolation.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-to-s'
+  Enabled: true
+
+Lint/UnderscorePrefixedVariableName:
+  Description: 'Do not use prefix `_` for a variable that is used.'
+  Enabled: true
+
+Lint/UnneededDisable:
+  Description: >-
+                 Checks for rubocop:disable comments that can be removed.
+                 Note: this cop is not disabled when disabling all cops.
+                 It must be explicitly disabled.
+  Enabled: true
+
+Lint/UnusedBlockArgument:
+  Description: 'Checks for unused block arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
+  Enabled: true
+
+Lint/UnusedMethodArgument:
+  Description: 'Checks for unused method arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
+  Enabled: true
+
+Lint/UnreachableCode:
+  Description: 'Unreachable code.'
+  Enabled: true
+
+Lint/UselessAccessModifier:
+  Description: 'Checks for useless access modifiers.'
+  Enabled: true
+
+Lint/UselessAssignment:
+  Description: 'Checks for useless assignment to a local variable.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
+  Enabled: true
+
+Lint/UselessComparison:
+  Description: 'Checks for comparison of something with itself.'
+  Enabled: true
+
+Lint/UselessElseWithoutRescue:
+  Description: 'Checks for useless `else` in `begin..end` without `rescue`.'
+  Enabled: true
+
+Lint/UselessSetterCall:
+  Description: 'Checks for useless setter call to a local variable.'
+  Enabled: true
+
+Lint/Void:
+  Description: 'Possible use of operator/literal/variable in void context.'
+  Enabled: true
+
+###################### Metrics ####################################
+
+Metrics/AbcSize:
+  Description: >-
+                 A calculated magnitude based on number of assignments,
+                 branches, and conditions.
+  Reference: 'http://c2.com/cgi/wiki?AbcMetric'
+  Enabled: false
+  Max: 20
+
+Metrics/BlockNesting:
+  Description: 'Avoid excessive block nesting'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count'
+  Enabled: true
+  Max: 4
+
+Metrics/ClassLength:
+  Description: 'Avoid classes longer than 250 lines of code.'
+  Enabled: true
+  Max: 250
+
+Metrics/CyclomaticComplexity:
+  Description: >-
+                 A complexity metric that is strongly correlated to the number
+                 of test cases needed to validate a method.
+  Enabled: true
+
+Metrics/LineLength:
+  Description: 'Limit lines to 80 characters.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
+  Enabled: false
+
+Metrics/MethodLength:
+  Description: 'Avoid methods longer than 30 lines of code.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#short-methods'
+  Enabled: true
+  Max: 30
+
+Metrics/ModuleLength:
+  Description: 'Avoid modules longer than 250 lines of code.'
+  Enabled: true
+  Max: 250
+
+Metrics/ParameterLists:
+  Description: 'Avoid parameter lists longer than three or four parameters.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#too-many-params'
+  Enabled: true
+
+Metrics/PerceivedComplexity:
+  Description: >-
+                 A complexity metric geared towards measuring complexity for a
+                 human reader.
+  Enabled: false
+
+##################### Performance #############################
+
+Performance/Count:
+  Description: >-
+                  Use `count` instead of `select...size`, `reject...size`,
+                  `select...count`, `reject...count`, `select...length`,
+                  and `reject...length`.
+  Enabled: true
+
+Performance/Detect:
+  Description: >-
+                  Use `detect` instead of `select.first`, `find_all.first`,
+                  `select.last`, and `find_all.last`.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerabledetect-vs-enumerableselectfirst-code'
+  Enabled: true
+
+Performance/FlatMap:
+  Description: >-
+                  Use `Enumerable#flat_map`
+                  instead of `Enumerable#map...Array#flatten(1)`
+                  or `Enumberable#collect..Array#flatten(1)`
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablemaparrayflatten-vs-enumerableflat_map-code'
+  Enabled: true
+  EnabledForFlattenWithoutParams: false
+  # If enabled, this cop will warn about usages of
+  # `flatten` being called without any parameters.
+  # This can be dangerous since `flat_map` will only flatten 1 level, and
+  # `flatten` without any parameters can flatten multiple levels.
+
+Performance/ReverseEach:
+  Description: 'Use `reverse_each` instead of `reverse.each`.'
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code'
+  Enabled: true
+
+Performance/Sample:
+  Description: >-
+                  Use `sample` instead of `shuffle.first`,
+                  `shuffle.last`, and `shuffle[Fixnum]`.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code'
+  Enabled: true
+
+Performance/Size:
+  Description: >-
+                  Use `size` instead of `count` for counting
+                  the number of elements in `Array` and `Hash`.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#arraycount-vs-arraysize-code'
+  Enabled: true
+
+Performance/StringReplacement:
+  Description: >-
+                  Use `tr` instead of `gsub` when you are replacing the same
+                  number of characters. Use `delete` instead of `gsub` when
+                  you are deleting characters.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code'
+  Enabled: true
+
+##################### Rails ##################################
+
+Rails/ActionFilter:
+  Description: 'Enforces consistent use of action filter methods.'
+  Enabled: false
+
+Rails/Date:
+  Description: >-
+                  Checks the correct usage of date aware methods,
+                  such as Date.today, Date.current etc.
+  Enabled: false
+
+Rails/Delegate:
+  Description: 'Prefer delegate method for delegations.'
+  Enabled: false
+
+Rails/FindBy:
+  Description: 'Prefer find_by over where.first.'
+  Enabled: false
+
+Rails/FindEach:
+  Description: 'Prefer all.find_each over all.find.'
+  Enabled: false
+
+Rails/HasAndBelongsToMany:
+  Description: 'Prefer has_many :through to has_and_belongs_to_many.'
+  Enabled: false
+
+Rails/Output:
+  Description: 'Checks for calls to puts, print, etc.'
+  Enabled: false
+
+Rails/ReadWriteAttribute:
+  Description: >-
+                 Checks for read_attribute(:attr) and
+                 write_attribute(:attr, val).
+  Enabled: false
+
+Rails/ScopeArgs:
+  Description: 'Checks the arguments of ActiveRecord scopes.'
+  Enabled: false
+
+Rails/TimeZone:
+  Description: 'Checks the correct usage of time zone aware methods.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
+  Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
+  Enabled: false
+
+Rails/Validation:
+  Description: 'Use validates :attribute, hash of validations.'
+  Enabled: false
+
+################## Style #################################
+
+Style/AccessModifierIndentation:
+  Description: Check indentation of private/protected visibility modifiers.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#indent-public-private-protected'
+  Enabled: false
+
+Style/AccessorMethodName:
+  Description: Check the naming of accessor methods for get_/set_.
+  Enabled: false
+
+Style/Alias:
+  Description: 'Use alias_method instead of alias.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#alias-method'
+  Enabled: false
+
+Style/AlignArray:
+  Description: >-
+                 Align the elements of an array literal if they span more than
+                 one line.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays'
+  Enabled: false
+
+Style/AlignHash:
+  Description: >-
+                 Align the elements of a hash literal if they span more than
+                 one line.
+  Enabled: false
+
+Style/AlignParameters:
+  Description: >-
+                 Align the parameters of a method call if they span more
+                 than one line.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
+  Enabled: false
+
+Style/AndOr:
+  Description: 'Use &&/|| instead of and/or.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-and-or-or'
+  Enabled: false
+
+Style/ArrayJoin:
+  Description: 'Use Array#join instead of Array#*.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#array-join'
+  Enabled: false
+
+Style/AsciiComments:
+  Description: 'Use only ascii symbols in comments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#english-comments'
+  Enabled: false
+
+Style/AsciiIdentifiers:
+  Description: 'Use only ascii symbols in identifiers.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#english-identifiers'
+  Enabled: false
+
+Style/Attr:
+  Description: 'Checks for uses of Module#attr.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#attr'
+  Enabled: false
+
+Style/BeginBlock:
+  Description: 'Avoid the use of BEGIN blocks.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-BEGIN-blocks'
+  Enabled: false
+
+Style/BarePercentLiterals:
+  Description: 'Checks if usage of %() or %Q() matches configuration.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q-shorthand'
+  Enabled: false
+
+Style/BlockComments:
+  Description: 'Do not use block comments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-block-comments'
+  Enabled: false
+
+Style/BlockEndNewline:
+  Description: 'Put end statement of multiline block on its own line.'
+  Enabled: false
+
+Style/BlockDelimiters:
+  Description: >-
+                Avoid using {...} for multi-line blocks (multiline chaining is
+                always ugly).
+                Prefer {...} over do...end for single-line blocks.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Description: 'Enforce braces style around hash parameters.'
+  Enabled: false
+
+Style/CaseEquality:
+  Description: 'Avoid explicit use of the case equality operator(===).'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-case-equality'
+  Enabled: false
+
+Style/CaseIndentation:
+  Description: 'Indentation of when in a case/when/[else/]end.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#indent-when-to-case'
+  Enabled: false
+
+Style/CharacterLiteral:
+  Description: 'Checks for uses of character literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-character-literals'
+  Enabled: false
+
+Style/ClassAndModuleCamelCase:
+  Description: 'Use CamelCase for classes and modules.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#camelcase-classes'
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Description: 'Checks style of children classes and modules.'
+  Enabled: false
+
+Style/ClassCheck:
+  Description: 'Enforces consistent use of `Object#is_a?` or `Object#kind_of?`.'
+  Enabled: false
+
+Style/ClassMethods:
+  Description: 'Use self when defining module/class methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#def-self-class-methods'
+  Enabled: false
+
+Style/ClassVars:
+  Description: 'Avoid the use of class variables.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-class-vars'
+  Enabled: false
+
+Style/ClosingParenthesisIndentation:
+  Description: 'Checks the indentation of hanging closing parentheses.'
+  Enabled: false
+
+Style/ColonMethodCall:
+  Description: 'Do not use :: for method call.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#double-colons'
+  Enabled: false
+
+Style/CommandLiteral:
+  Description: 'Use `` or %x around command literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-x'
+  Enabled: false
+
+Style/CommentAnnotation:
+  Description: 'Checks formatting of annotation comments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#annotate-keywords'
+  Enabled: false
+
+Style/CommentIndentation:
+  Description: 'Indentation of comments.'
+  Enabled: false
+
+Style/ConstantName:
+  Description: 'Constants should use SCREAMING_SNAKE_CASE.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#screaming-snake-case'
+  Enabled: false
+
+Style/DefWithParentheses:
+  Description: 'Use def with parentheses when there are arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
+  Enabled: false
+
+Style/DeprecatedHashMethods:
+  Description: 'Checks for use of deprecated Hash methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
+  Enabled: false
+
+Style/Documentation:
+  Description: 'Document classes and non-namespace modules.'
+  Enabled: false
+
+Style/DotPosition:
+  Description: 'Checks the position of the dot in multi-line method calls.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains'
+  Enabled: false
+
+Style/DoubleNegation:
+  Description: 'Checks for uses of double negation (!!).'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-bang-bang'
+  Enabled: false
+
+Style/EachWithObject:
+  Description: 'Prefer `each_with_object` over `inject` or `reduce`.'
+  Enabled: false
+
+Style/ElseAlignment:
+  Description: 'Align elses and elsifs correctly.'
+  Enabled: false
+
+Style/EmptyElse:
+  Description: 'Avoid empty else-clauses.'
+  Enabled: false
+
+Style/EmptyLineBetweenDefs:
+  Description: 'Use empty lines between defs.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#empty-lines-between-methods'
+  Enabled: false
+
+Style/EmptyLines:
+  Description: "Don't use several empty lines in a row."
+  Enabled: false
+
+Style/EmptyLinesAroundAccessModifier:
+  Description: "Keep blank lines around access modifiers."
+  Enabled: false
+
+Style/EmptyLinesAroundBlockBody:
+  Description: "Keeps track of empty lines around block bodies."
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  Description: "Keeps track of empty lines around class bodies."
+  Enabled: false
+
+Style/EmptyLinesAroundModuleBody:
+  Description: "Keeps track of empty lines around module bodies."
+  Enabled: false
+
+Style/EmptyLinesAroundMethodBody:
+  Description: "Keeps track of empty lines around method bodies."
+  Enabled: false
+
+Style/EmptyLiteral:
+  Description: 'Prefer literals to Array.new/Hash.new/String.new.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#literal-array-hash'
+  Enabled: false
+
+Style/EndBlock:
+  Description: 'Avoid the use of END blocks.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-END-blocks'
+  Enabled: false
+
+Style/EndOfLine:
+  Description: 'Use Unix-style line endings.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#crlf'
+  Enabled: false
+
+Style/EvenOdd:
+  Description: 'Favor the use of Fixnum#even? && Fixnum#odd?'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
+  Enabled: false
+
+Style/ExtraSpacing:
+  Description: 'Do not use unnecessary spacing.'
+  Enabled: false
+
+Style/FileName:
+  Description: 'Use snake_case for source file names.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files'
+  Enabled: false
+
+Style/InitialIndentation:
+  Description: >-
+    Checks the indentation of the first non-blank non-comment line in a file.
+  Enabled: false
+
+Style/FirstParameterIndentation:
+  Description: 'Checks the indentation of the first parameter in a method call.'
+  Enabled: false
+
+Style/FlipFlop:
+  Description: 'Checks for flip flops'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-flip-flops'
+  Enabled: false
+
+Style/For:
+  Description: 'Checks use of for or each in multiline loops.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-for-loops'
+  Enabled: false
+
+Style/FormatString:
+  Description: 'Enforce the use of Kernel#sprintf, Kernel#format or String#%.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#sprintf'
+  Enabled: false
+
+Style/GlobalVars:
+  Description: 'Do not introduce global variables.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#instance-vars'
+  Reference: 'http://www.zenspider.com/Languages/Ruby/QuickRef.html'
+  Enabled: false
+
+Style/GuardClause:
+  Description: 'Check for conditionals that can be replaced with guard clauses'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals'
+  Enabled: false
+
+Style/HashSyntax:
+  Description: >-
+                 Prefer Ruby 1.9 hash syntax { a: 1, b: 2 } over 1.8 syntax
+                 { :a => 1, :b => 2 }.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-literals'
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Description: >-
+                 Favor modifier if/unless usage when you have a
+                 single-line body.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier'
+  Enabled: false
+
+Style/IfWithSemicolon:
+  Description: 'Do not use if x; .... Use the ternary operator instead.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs'
+  Enabled: false
+
+Style/IndentationConsistency:
+  Description: 'Keep indentation straight.'
+  Enabled: false
+
+Style/IndentationWidth:
+  Description: 'Use 2 spaces for indentation.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
+  Enabled: false
+
+Style/IndentArray:
+  Description: >-
+                 Checks the indentation of the first element in an array
+                 literal.
+  Enabled: false
+
+Style/IndentHash:
+  Description: 'Checks the indentation of the first key in a hash literal.'
+  Enabled: false
+
+Style/InfiniteLoop:
+  Description: 'Use Kernel#loop for infinite loops.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#infinite-loop'
+  Enabled: false
+
+Style/Lambda:
+  Description: 'Use the new lambda literal syntax for single-line blocks.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#lambda-multi-line'
+  Enabled: false
+
+Style/LambdaCall:
+  Description: 'Use lambda.call(...) instead of lambda.(...).'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#proc-call'
+  Enabled: false
+
+Style/LeadingCommentSpace:
+  Description: 'Comments should start with a space.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-space'
+  Enabled: false
+
+Style/LineEndConcatenation:
+  Description: >-
+                 Use \ instead of + or << to concatenate two string literals at
+                 line end.
+  Enabled: false
+
+Style/MethodCallParentheses:
+  Description: 'Do not use parentheses for method calls with no arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
+  Enabled: false
+
+Style/MethodDefParentheses:
+  Description: >-
+                 Checks if the method definitions have or don't have
+                 parentheses.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
+  Enabled: false
+
+Style/MethodName:
+  Description: 'Use the configured style when naming methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars'
+  Enabled: false
+
+Style/ModuleFunction:
+  Description: 'Checks for usage of `extend self` in modules.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#module-function'
+  Enabled: false
+
+Style/MultilineBlockChain:
+  Description: 'Avoid multi-line chains of blocks.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
+  Enabled: false
+
+Style/MultilineBlockLayout:
+  Description: 'Ensures newlines after multiline block do statements.'
+  Enabled: false
+
+Style/MultilineIfThen:
+  Description: 'Do not use then for multi-line if/unless.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-then'
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  Description: >-
+                 Checks indentation of binary operations that span more than
+                 one line.
+  Enabled: false
+
+Style/MultilineTernaryOperator:
+  Description: >-
+                 Avoid multi-line ?: (the ternary operator);
+                 use if/unless instead.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-multiline-ternary'
+  Enabled: false
+
+Style/NegatedIf:
+  Description: >-
+                 Favor unless over if for negative conditions
+                 (or control flow or).
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#unless-for-negatives'
+  Enabled: false
+
+Style/NegatedWhile:
+  Description: 'Favor until over while for negative conditions.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#until-for-negatives'
+  Enabled: false
+
+Style/NestedTernaryOperator:
+  Description: 'Use one expression per branch in a ternary operator.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-ternary'
+  Enabled: false
+
+Style/Next:
+  Description: 'Use `next` to skip iteration instead of a condition at the end.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals'
+  Enabled: false
+
+Style/NilComparison:
+  Description: 'Prefer x.nil? to x == nil.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
+  Enabled: false
+
+Style/NonNilCheck:
+  Description: 'Checks for redundant nil checks.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-non-nil-checks'
+  Enabled: false
+
+Style/Not:
+  Description: 'Use ! instead of not.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bang-not-not'
+  Enabled: false
+
+Style/NumericLiterals:
+  Description: >-
+                 Add underscores to large numeric literals to improve their
+                 readability.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics'
+  Enabled: false
+
+Style/OneLineConditional:
+  Description: >-
+                 Favor the ternary operator(?:) over
+                 if/then/else/end constructs.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#ternary-operator'
+  Enabled: false
+
+Style/OpMethod:
+  Description: 'When defining binary operators, name the argument other.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#other-arg'
+  Enabled: false
+
+Style/OptionalArguments:
+  Description: >-
+                 Checks for optional arguments that do not appear at the end
+                 of the argument list
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#optional-arguments'
+  Enabled: false
+
+Style/ParallelAssignment:
+  Description: >-
+                  Check for simple usages of parallel assignment.
+                  It will only warn when the number of variables
+                  matches on both sides of the assignment.
+                  This also provides performance benefits
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parallel-assignment'
+  Enabled: false
+
+Style/ParenthesesAroundCondition:
+  Description: >-
+                 Don't use parentheses around the condition of an
+                 if/unless/while.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-parens-if'
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Description: 'Use `%`-literal delimiters consistently'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-literal-braces'
+  Enabled: false
+
+Style/PercentQLiterals:
+  Description: 'Checks if uses of %Q/%q match the configured preference.'
+  Enabled: false
+
+Style/PerlBackrefs:
+  Description: 'Avoid Perl-style regex back references.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
+  Enabled: false
+
+Style/PredicateName:
+  Description: 'Check the names of predicate methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark'
+  Enabled: false
+
+Style/Proc:
+  Description: 'Use proc instead of Proc.new.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#proc'
+  Enabled: false
+
+Style/RaiseArgs:
+  Description: 'Checks the arguments passed to raise/fail.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#exception-class-messages'
+  Enabled: false
+
+Style/RedundantBegin:
+  Description: "Don't use begin blocks when they are not needed."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#begin-implicit'
+  Enabled: false
+
+Style/RedundantException:
+  Description: "Checks for an obsolete RuntimeException argument in raise/fail."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-runtimeerror'
+  Enabled: false
+
+Style/RedundantReturn:
+  Description: "Don't use return where it's not required."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-return'
+  Enabled: false
+
+Style/RedundantSelf:
+  Description: "Don't use self where it's not needed."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-self-unless-required'
+  Enabled: false
+
+Style/RegexpLiteral:
+  Description: 'Use / or %r around regular expressions.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-r'
+  Enabled: false
+
+Style/RescueEnsureAlignment:
+  Description: 'Align rescues and ensures correctly.'
+  Enabled: false
+
+Style/RescueModifier:
+  Description: 'Avoid using rescue in its modifier form.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers'
+  Enabled: false
+
+Style/SelfAssignment:
+  Description: >-
+                 Checks for places where self-assignment shorthand should have
+                 been used.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#self-assignment'
+  Enabled: false
+
+Style/Semicolon:
+  Description: "Don't use semicolons to terminate expressions."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-semicolon'
+  Enabled: false
+
+Style/SignalException:
+  Description: 'Checks for proper usage of fail and raise.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'
+  Enabled: false
+
+Style/SingleLineBlockParams:
+  Description: 'Enforces the names of some block params.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#reduce-blocks'
+  Enabled: false
+
+Style/SingleLineMethods:
+  Description: 'Avoid single-line methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-single-line-methods'
+  Enabled: false
+
+Style/SpaceBeforeFirstArg:
+  Description: >-
+                 Checks that exactly one space is used between a method name
+                 and the first argument for method calls without parentheses.
+  Enabled: true
+
+Style/SpaceAfterColon:
+  Description: 'Use spaces after colons.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
+  Enabled: false
+
+Style/SpaceAfterComma:
+  Description: 'Use spaces after commas.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
+  Enabled: false
+
+Style/SpaceAroundKeyword:
+  Description: 'Use spaces around keywords.'
+  Enabled: false
+
+Style/SpaceAfterMethodName:
+  Description: >-
+                 Do not put a space between a method name and the opening
+                 parenthesis in a method definition.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
+  Enabled: false
+
+Style/SpaceAfterNot:
+  Description: Tracks redundant space after the ! operator.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-space-bang'
+  Enabled: false
+
+Style/SpaceAfterSemicolon:
+  Description: 'Use spaces after semicolons.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
+  Enabled: false
+
+Style/SpaceBeforeBlockBraces:
+  Description: >-
+                 Checks that the left block brace has or doesn't have space
+                 before it.
+  Enabled: false
+
+Style/SpaceBeforeComma:
+  Description: 'No spaces before commas.'
+  Enabled: false
+
+Style/SpaceBeforeComment:
+  Description: >-
+                 Checks for missing space between code and a comment on the
+                 same line.
+  Enabled: false
+
+Style/SpaceBeforeSemicolon:
+  Description: 'No spaces before semicolons.'
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  Description: >-
+                 Checks that block braces have or don't have surrounding space.
+                 For blocks taking parameters, checks that the left brace has
+                 or doesn't have trailing space.
+  Enabled: false
+
+Style/SpaceAroundBlockParameters:
+  Description: 'Checks the spacing inside and after block parameters pipes.'
+  Enabled: false
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Description: >-
+                 Checks that the equals signs in parameter default assignments
+                 have or don't have surrounding space depending on
+                 configuration.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-around-equals'
+  Enabled: false
+
+Style/SpaceAroundOperators:
+  Description: 'Use a single space around operators.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
+  Enabled: false
+
+Style/SpaceInsideBrackets:
+  Description: 'No spaces after [ or before ].'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
+  Enabled: false
+
+Style/SpaceInsideHashLiteralBraces:
+  Description: "Use spaces inside hash literal braces - or don't."
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
+  Enabled: false
+
+Style/SpaceInsideParens:
+  Description: 'No spaces after ( or before ).'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
+  Enabled: false
+
+Style/SpaceInsideRangeLiteral:
+  Description: 'No spaces inside range literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-space-inside-range-literals'
+  Enabled: false
+
+Style/SpaceInsideStringInterpolation:
+  Description: 'Checks for padding/surrounding spaces inside string interpolation.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#string-interpolation'
+  Enabled: false
+
+Style/SpecialGlobalVars:
+  Description: 'Avoid Perl-style global variables.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms'
+  Enabled: false
+
+Style/StringLiterals:
+  Description: 'Checks if uses of quotes match the configured preference.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-string-literals'
+  Enabled: false
+
+Style/StringLiteralsInInterpolation:
+  Description: >-
+                 Checks if uses of quotes inside expressions in interpolated
+                 strings match the configured preference.
+  Enabled: false
+
+Style/StructInheritance:
+  Description: 'Checks for inheritance from Struct.new.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-extend-struct-new'
+  Enabled: false
+
+Style/SymbolLiteral:
+  Description: 'Use plain symbols instead of string symbols when possible.'
+  Enabled: false
+
+Style/SymbolProc:
+  Description: 'Use symbols as procs instead of blocks when possible.'
+  Enabled: false
+
+Style/Tab:
+  Description: 'No hard tabs.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
+  Enabled: false
+
+Style/TrailingBlankLines:
+  Description: 'Checks trailing blank lines and final newline.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
+  Enabled: false
+
+Style/TrailingCommaInArguments:
+  Description: 'Checks for trailing comma in parameter lists.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-params-comma'
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  Description: 'Checks for trailing comma in literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  Enabled: false
+
+Style/TrailingWhitespace:
+  Description: 'Avoid trailing whitespace.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-whitespace'
+  Enabled: false
+
+Style/TrivialAccessors:
+  Description: 'Prefer attr_* methods to trivial readers/writers.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#attr_family'
+  Enabled: false
+
+Style/UnlessElse:
+  Description: >-
+                 Do not use unless with else. Rewrite these with the positive
+                 case first.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-else-with-unless'
+  Enabled: false
+
+Style/UnneededCapitalW:
+  Description: 'Checks for %W when interpolation is not needed.'
+  Enabled: false
+
+Style/UnneededPercentQ:
+  Description: 'Checks for %q/%Q when single quotes or double quotes would do.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q'
+  Enabled: false
+
+Style/TrailingUnderscoreVariable:
+  Description: >-
+                 Checks for the usage of unneeded trailing underscores at the
+                 end of parallel variable assignment.
+  Enabled: false
+
+Style/VariableInterpolation:
+  Description: >-
+                 Don't interpolate global, instance and class variables
+                 directly in strings.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#curlies-interpolate'
+  Enabled: false
+
+Style/VariableName:
+  Description: 'Use the configured style when naming variables.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars'
+  Enabled: false
+
+Style/WhenThen:
+  Description: 'Use when x then ... for one-line cases.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#one-line-cases'
+  Enabled: false
+
+Style/WhileUntilDo:
+  Description: 'Checks for redundant do after while or until.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-multiline-while-do'
+  Enabled: false
+
+Style/WhileUntilModifier:
+  Description: >-
+                 Favor modifier while/until usage when you have a
+                 single-line body.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier'
+  Enabled: false
+
+Style/WordArray:
+  Description: 'Use %w or %W for arrays of words.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-w'
+  Enabled: false

From 27c0deaba332b461676816eafe5f6f3c2f8bb65f Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 12:44:47 +0100
Subject: [PATCH 61/67] Add codeclimit coverage reporting

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1d731eb9..1efb7729 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
 
 install:
   - pip install -r requirements.txt
-  - pip install coveralls
+  - pip install coveralls codeclimate-test-reporter
 
 before_script:
   - python manage.py collectstatic --noinput
@@ -18,3 +18,4 @@ script:
 
 after_success:
   - coveralls
+  - codeclimate-test-reporter

From 11dd9ad02f8fcebf4692689532a1843e7bb159ba Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 13:08:05 +0100
Subject: [PATCH 62/67] Add tmp directory to gitignore

---
 .gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d31b5aa9..1793954a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+tmp/
+db.sqlite3
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -25,9 +28,6 @@ var/
 
 # Continer extras
 .vagrant
-_builds
-_steps
-_projects
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

From 7ecd6212ac62ddf730e157e787279cb355131c84 Mon Sep 17 00:00:00 2001
From: David Taylor 
Date: Mon, 11 Jul 2016 20:15:48 +0100
Subject: [PATCH 63/67] Initial commit of app.json (for heroku review apps)

---
 app.json | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 app.json

diff --git a/app.json b/app.json
new file mode 100644
index 00000000..ea2e5c25
--- /dev/null
+++ b/app.json
@@ -0,0 +1,52 @@
+{
+  "name": "PyRIGS",
+  "description": "",
+  "scripts": {
+    "postdeploy": "python manage.py migrate"
+  },
+  "env": {
+    "DEBUG": {
+      "required": true
+    },
+    "EMAIL_FROM": {
+      "required": true
+    },
+    "EMAIL_HOST": {
+      "required": true
+    },
+    "EMAIL_HOST_PASSWORD": {
+      "required": true
+    },
+    "EMAIL_HOST_USER": {
+      "required": true
+    },
+    "EMAIL_PORT": {
+      "required": true
+    },
+    "EMAIL_USE_SSL": {
+      "required": true
+    },
+    "RECAPTCHA_PRIVATE_KEY": {
+      "required": true
+    },
+    "RECAPTCHA_PUBLIC_KEY": {
+      "required": true
+    },
+    "SECRET_KEY": {
+      "generator": "secret"
+    }
+  },
+  "formation": {
+    "web": {
+      "quantity": 1
+    }
+  },
+  "addons": [
+    "heroku-postgresql"
+  ],
+  "buildpacks": [
+    {
+      "url": "heroku/python"
+    }
+  ]
+}
\ No newline at end of file

From b94cef92d23a4a7c76b10b20cde8c072d6aaa181 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 23:26:12 +0100
Subject: [PATCH 64/67] Update selenium due to OS X based firefox issue

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 532cadea..995d2afd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ python-dateutil==2.4.2
 pytz==2015.4
 raven==5.8.1
 reportlab==3.1.44
-selenium==2.53.1
+selenium==2.53.6
 simplejson==3.7.2
 six==1.9.0
 sqlparse==0.1.15

From 84393e9e4a107ec2f784d088bec854585cfe774b Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 23:26:43 +0100
Subject: [PATCH 65/67] Modify user creation test to replicate special
 character issue in #251

---
 RIGS/test_functional.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py
index 154fdfb2..7e5010f7 100644
--- a/RIGS/test_functional.py
+++ b/RIGS/test_functional.py
@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
+import os
+import re
+from datetime import date, timedelta
+
+import reversion
+from django.core import mail
+from django.db import transaction
 from django.test import LiveServerTestCase
 from django.test.client import Client
-from django.core import mail
 from selenium import webdriver
-from selenium.webdriver.common.keys import Keys
 from selenium.common.exceptions import StaleElementReferenceException, WebDriverException
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
+
 from RIGS import models
-import re
-import os
-from datetime import date, timedelta
-from django.db import transaction
-import reversion
-import json
 
 
 class UserRegistrationTest(LiveServerTestCase):
@@ -103,7 +104,7 @@ class UserRegistrationTest(LiveServerTestCase):
         # Check Email
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertIn('activation required', email.subject)
+        self.assertIn('John Smith "JS" activation required', email.subject)
         urls = re.findall(
             'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.body)
         self.assertEqual(len(urls), 1)

From 4f839d05f9fbe96b62f95b9100d3599342ce12c3 Mon Sep 17 00:00:00 2001
From: Tom Price 
Date: Mon, 11 Jul 2016 23:28:15 +0100
Subject: [PATCH 66/67] Fix issues with special characters in registration
 email subject.

Closes #251
---
 templates/registration/activation_email_subject.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
index 2237d0a8..1f707f9e 100644
--- a/templates/registration/activation_email_subject.txt
+++ b/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-{{ user }} activation required
\ No newline at end of file
+{{ user|safe }} activation required

From fc6db5bff20bbe466acf6cc6f4234691798ee116 Mon Sep 17 00:00:00 2001
From: davidtaylorhq 
Date: Wed, 13 Jul 2016 23:19:31 +0100
Subject: [PATCH 67/67] Heroku Staging Setup (#250)

Heroku Staging Setup

Includes data generation
---
 PyRIGS/settings.py                            |   5 +
 README.md                                     |  17 ++
 RIGS/management/__init__.py                   |   0
 RIGS/management/commands/__init__.py          |   0
 .../management/commands/generateSampleData.py | 248 ++++++++++++++++++
 RIGS/test_unit.py                             |  31 ++-
 app.json                                      |   3 +-
 7 files changed, 296 insertions(+), 8 deletions(-)
 create mode 100644 RIGS/management/__init__.py
 create mode 100644 RIGS/management/commands/__init__.py
 create mode 100644 RIGS/management/commands/generateSampleData.py

diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index 3098c3fb..2e82807e 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -21,10 +21,15 @@ SECRET_KEY = os.environ.get('SECRET_KEY') if os.environ.get('SECRET_KEY') else '
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
 
+STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
+
 TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
 
+if STAGING:
+    ALLOWED_HOSTS.append('.herokuapp.com')
+
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:
     SECURE_SSL_REDIRECT = True # Redirect all http requests to https
diff --git a/README.md b/README.md
index 809c037c..51bfec16 100644
--- a/README.md
+++ b/README.md
@@ -75,5 +75,22 @@ python manage.py runserver
 ```
 Please refer to Django documentation for a full list of options available here.
 
+### Sample Data ###
+Sample data is available to aid local development and user acceptance testing. To load this data into your local database, first ensure the database is empty:
+```
+python manage.py flush
+```
+Then load the sample data using the command:
+```
+python manage.py generateSampleData
+```
+4 user accounts are created for convenience:
+|Username |Password |
+|---------|---------|
+|superuser|superuser|
+|finance  |finance  |
+|keyholder|keyholder|
+|basic    |basic    |
+
 ### Committing, pushing and testing ###
 Feel free to commit as you wish, on your own branch. On my branch (master for development) do not commit code that you either know doesn't work or don't know works. If you must commit this code, please make sure you say in the commit message that it isn't working, and if you can why it isn't working. If and only if you absolutely must push, then please don't leave it as the HEAD for too long, it's not much to ask but when you are done just make sure you haven't broken the HEAD for the next person.
diff --git a/RIGS/management/__init__.py b/RIGS/management/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/RIGS/management/commands/__init__.py b/RIGS/management/commands/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/RIGS/management/commands/generateSampleData.py b/RIGS/management/commands/generateSampleData.py
new file mode 100644
index 00000000..bf1ce7d2
--- /dev/null
+++ b/RIGS/management/commands/generateSampleData.py
@@ -0,0 +1,248 @@
+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
+
+from RIGS import models
+class Command(BaseCommand):
+    help = 'Adds sample data to use for testing'
+    can_import_settings = True
+
+    people = []
+    organisations = []
+    venues = []
+    profiles = []
+
+    keyholder_group = None
+    finance_group = None
+
+
+    def handle(self, *args, **options):
+        from django.conf import settings
+
+        if not (settings.DEBUG or settings.STAGING):
+            raise CommandError('You cannot run this command in production')
+
+        random.seed('Some object to seed the random number generator') # otherwise it is done by time, which could lead to inconsistant tests
+
+        with transaction.atomic():
+            models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
+
+            self.setupGenericProfiles()
+
+            self.setupPeople()
+            self.setupOrganisations()
+            self.setupVenues()
+            
+            self.setupGroups()
+            
+            self.setupEvents()
+
+            self.setupUsefulProfiles()
+
+    def setupPeople(self):
+        names = ["Regulus Black","Sirius Black","Lavender Brown","Cho Chang","Vincent Crabbe","Vincent Crabbe","Bartemius Crouch","Fleur Delacour","Cedric Diggory","Alberforth Dumbledore","Albus Dumbledore","Dudley Dursley","Petunia Dursley","Vernon Dursley","Argus Filch","Seamus Finnigan","Nicolas Flamel","Cornelius Fudge","Goyle","Gregory Goyle","Hermione Granger","Rubeus Hagrid","Igor Karkaroff","Viktor Krum","Bellatrix Lestrange","Alice Longbottom","Frank Longbottom","Neville Longbottom","Luna Lovegood","Xenophilius Lovegood","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))
+
+                newPerson = models.Person.objects.create(name=name)
+                if i % 3 == 0:
+                    newPerson.email = "address@person.com"
+
+                if i % 5 == 0:
+                    newPerson.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newPerson.address = "1 Person Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newPerson.phone = "01234 567894"
+
+                newPerson.save()
+                self.people.append(newPerson)
+
+    def setupOrganisations(self):
+        names = ["Acme, inc.","Widget Corp","123 Warehousing","Demo Company","Smith and Co.","Foo Bars","ABC Telecom","Fake Brothers","QWERTY Logistics","Demo, inc.","Sample Company","Sample, inc","Acme Corp","Allied Biscuit","Ankh-Sto Associates","Extensive Enterprise","Galaxy Corp","Globo-Chem","Mr. Sparkle","Globex Corporation","LexCorp","LuthorCorp","North Central Positronics","Omni Consimer Products","Praxis Corporation","Sombra Corporation","Sto Plains Holdings","Tessier-Ashpool","Wayne Enterprises","Wentworth Industries","ZiffCorp","Bluth Company","Strickland Propane","Thatherton Fuels","Three Waters","Water and Power","Western Gas & Electric","Mammoth Pictures","Mooby Corp","Gringotts","Thrift Bank","Flowers By Irene","The Legitimate Businessmens Club","Osato Chemicals","Transworld Consortium","Universal Export","United Fried Chicken","Virtucon","Kumatsu Motors","Keedsler Motors","Powell Motors","Industrial Automation","Sirius Cybernetics Corporation","U.S. Robotics and Mechanical Men","Colonial Movers","Corellian Engineering Corporation","Incom Corporation","General Products","Leeding Engines Ltd.","Blammo","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))
+                newOrganisation = models.Organisation.objects.create(name=name)
+                if i % 2 == 0:
+                    newOrganisation.has_su_account = True
+
+                if i % 3 == 0:
+                    newOrganisation.email = "address@organisation.com"
+
+                if i % 5 == 0:
+                    newOrganisation.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newOrganisation.address = "1 Organisation Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newOrganisation.phone = "01234 567894"
+
+                newOrganisation.save()
+                self.organisations.append(newOrganisation)
+
+    def setupVenues(self):
+        names = ["Bear Island","Crossroads Inn","Deepwood Motte","The Dreadfort","The Eyrie","Greywater Watch","The Iron Islands","Karhold","Moat Cailin","Oldstones","Raventree Hall","Riverlands","The Ruby Ford","Saltpans","Seagard","Torrhen's Square","The Trident","The Twins","The Vale of Arryn","The Whispering Wood","White Harbor","Winterfell","The Arbor","Ashemark","Brightwater Keep","Casterly Rock","Clegane's Keep","Dragonstone","Dorne","God's Eye","The Golden Tooth","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))
+                newVenue = models.Venue.objects.create(name=name)
+                if i % 2 == 0:
+                    newVenue.three_phase_available = True
+
+                if i % 3 == 0:
+                    newVenue.email = "address@venue.com"
+
+                if i % 5 == 0:
+                    newVenue.notes = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua"
+
+                if i % 7 == 0:
+                    newVenue.address = "1 Venue Test Street \n Demoton \n United States of TEC \n RMRF 567"
+
+                if i % 9 == 0:
+                    newVenue.phone = "01234 567894"
+
+                newVenue.save()
+                self.venues.append(newVenue)
+
+    def setupGroups(self):
+        self.keyholder_group = Group.objects.create(name='Keyholders')
+        self.finance_group = Group.objects.create(name='Finance')
+
+        keyholderPerms = ["add_event","change_event","view_event","add_eventitem","change_eventitem","delete_eventitem","add_organisation","change_organisation","view_organisation","add_person","change_person","view_person","view_profile","add_venue","change_venue","view_venue"]
+        financePerms = ["change_event","view_event","add_eventitem","change_eventitem","add_invoice","change_invoice","view_invoice","add_organisation","change_organisation","view_organisation","add_payment","change_payment","delete_payment","add_person","change_person","view_person"]
+
+        for permId in keyholderPerms:
+            self.keyholder_group.permissions.add(Permission.objects.get(codename=permId))
+
+        for permId in financePerms:
+            self.finance_group.permissions.add(Permission.objects.get(codename=permId))
+
+    def setupGenericProfiles(self):
+        names = ["Clara Oswin Oswald","Rory Williams","Amy Pond","River Song","Martha Jones","Donna Noble","Jack Harkness","Mickey Smith","Rose Tyler"]
+        for i, name in enumerate(names):
+            newProfile = models.Profile.objects.create(username=name.replace(" ",""), first_name=name.split(" ")[0], last_name=name.split(" ")[-1],
+                                                         email=name.replace(" ","")+"@example.com",
+                                                        initials="".join([ j[0].upper() for j in name.split() ]))
+            if i % 2 == 0:
+                newProfile.phone = "01234 567894"
+
+            newProfile.save()
+            self.profiles.append(newProfile)
+
+    def setupUsefulProfiles(self):
+        superUser = models.Profile.objects.create(username="superuser", first_name="Super", last_name="User", initials="SU", 
+                                                email="superuser@example.com", is_superuser=True, is_active=True, is_staff=True)
+        superUser.set_password('superuser')
+        superUser.save()
+
+        financeUser = models.Profile.objects.create(username="finance", first_name="Finance", last_name="User", initials="FU", 
+                                                email="financeuser@example.com", is_active=True)
+        financeUser.groups.add(self.finance_group)
+        financeUser.groups.add(self.keyholder_group)
+        financeUser.set_password('finance')
+        financeUser.save()
+
+        keyholderUser = models.Profile.objects.create(username="keyholder", first_name="Keyholder", last_name="User", initials="KU", 
+                                                email="keyholderuser@example.com", is_active=True)
+        keyholderUser.groups.add(self.keyholder_group)
+        keyholderUser.set_password('keyholder')
+        keyholderUser.save()
+
+        basicUser = models.Profile.objects.create(username="basic", first_name="Basic", last_name="User", initials="BU", 
+                                                email="basicuser@example.com", is_active=True)
+        basicUser.set_password('basic')
+        basicUser.save()
+
+    def setupEvents(self):
+        names = ["Outdoor Concert","Hall Open Mic Night","Festival","Weekend Event","Magic Show","Society Ball","Evening Show","Talent Show","Acoustic Evening","Hire of Things","SU Event","End of Term Show","Theatre Show","Outdoor Fun Day","Summer Carnival","Open Days","Magic Show","Awards Ceremony","Debating Event","Club Night","DJ Evening","Building Projection","Choir Concert"]
+        descriptions = ["A brief desciption of the event","This event is boring","Probably wont happen","Warning: this has lots of kit"]
+        notes = ["The client came into the office at some point","Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"]
+
+        itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00},
+                        {'name': 'Projector', 'description': 'Some kind of video thinamejig, probably with unnecessary processing for free', 'quantity': 1, 'cost': 500.00},
+                        {'name': 'Lighting Desk', 'description': 'Cannot provide guarentee that it will work', 'quantity': 1, 'cost': 200.52},
+                        {'name': 'Moving lights', 'description': 'Flashy lights, with the copper', 'quantity': 8, 'cost': 50.00},
+                        {'name': 'Microphones', 'description': 'Make loud noise \n you will want speakers with this', 'quantity': 5, 'cost': 0.50},
+                        {'name': 'Sound Mixer Thing', 'description': 'Might be analogue, might be digital', 'quantity': 1, 'cost': 100.00},
+                        {'name': 'Electricity', 'description': 'You need this', 'quantity': 1, 'cost': 200.00},
+                        {'name': 'Crew', 'description': 'Costs nothing, because reasons', 'quantity': 1, 'cost': 0.00},
+                        {'name': 'Loyalty Discount', 'description': 'Have some negative moneys', 'quantity': 1, 'cost': -50.00}]
+
+        dayDelta = -120 # start adding events from 4 months ago
+
+        for i in range(150): # Let's add 100 events
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+
+                name = names[i%len(names)]
+
+                startDate = datetime.date.today() + datetime.timedelta(days=dayDelta)
+                dayDelta = dayDelta + random.randint(0,3)
+
+                newEvent = models.Event.objects.create(name=name, start_date=startDate)
+
+                if random.randint(0,2) > 1: # 1 in 3 have a start time
+                    newEvent.start_time = datetime.time(random.randint(15,20))
+                    if random.randint(0,2) > 1: # of those, 1 in 3 have an end time on the same day
+                        newEvent.end_time = datetime.time(random.randint(21,23))
+                    elif random.randint(0,1)>0: # half of the others finish early the next day
+                        newEvent.end_date = newEvent.start_date + datetime.timedelta(days=1)
+                        newEvent.end_time = datetime.time(random.randint(0,5))
+                elif random.randint(0,2)>1: # 1 in 3 of the others finish a few days ahead
+                    newEvent.end_date = newEvent.start_date + datetime.timedelta(days=random.randint(1,4))
+
+
+                if random.randint(0,6) > 0: # 5 in 6 have MIC
+                    newEvent.mic = random.choice(self.profiles)
+
+                if random.randint(0,6) > 0: # 5 in 6 have organisation
+                    newEvent.organisation = random.choice(self.organisations)
+
+                if random.randint(0,6) > 0: # 5 in 6 have person
+                    newEvent.person = random.choice(self.people)
+
+                if random.randint(0,6) > 0: # 5 in 6 have venue
+                    newEvent.venue = random.choice(self.venues)
+
+                # Could have any status, equally weighted
+                newEvent.status = random.choice([models.Event.BOOKED,models.Event.CONFIRMED,models.Event.PROVISIONAL, models.Event.CANCELLED])
+
+                newEvent.dry_hire = (random.randint(0,7)==0) # 1 in 7 are dry hire
+
+                if random.randint(0,1) > 0: # 1 in 2 have description
+                    newEvent.description = random.choice(descriptions)
+
+                if random.randint(0,1) > 0: # 1 in 2 have notes
+                    newEvent.notes = random.choice(notes)
+
+                newEvent.save()
+
+                # Now add some items
+                for j in range(random.randint(1,5)):
+                    itemData = itemOptions[random.randint(0,len(itemOptions)-1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
+
+                while newEvent.sum_total < 0:
+                    itemData = itemOptions[random.randint(0,len(itemOptions)-1)]
+                    newItem = models.EventItem.objects.create(event=newEvent, order=j, **itemData)
+                    newItem.save()
+
+            with reversion.create_revision():
+                reversion.set_user(random.choice(self.profiles))
+                if newEvent.start_date < datetime.date.today(): # think about adding an invoice
+                    if random.randint(0,2) > 0: # 2 in 3 have had paperwork sent to treasury
+                        newInvoice = models.Invoice.objects.create(event=newEvent)
+                        if newEvent.status is models.Event.CANCELLED: # void cancelled events
+                            newInvoice.void = True
+                        elif random.randint(0,2)>1: # 1 in 3 have been paid
+                            models.Payment.objects.create(invoice=newInvoice, amount=newInvoice.balance, date=datetime.date.today())
diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py
index c51874f4..f0c778b3 100644
--- a/RIGS/test_unit.py
+++ b/RIGS/test_unit.py
@@ -1,9 +1,12 @@
-from django.core.urlresolvers import reverse
-from django.test import TestCase
 from datetime import date
 
-from RIGS import models
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.management import call_command
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+from django.test.utils import override_settings
+
+from RIGS import models
 
 
 class TestAdminMergeObjects(TestCase):
@@ -160,7 +163,7 @@ class TestInvoiceDelete(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())
@@ -182,7 +185,7 @@ class TestInvoiceDelete(TestCase):
 
     def test_invoice_delete_allowed(self):
         request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[2].pk})
-        
+
         response = self.client.get(request_url, follow=True)
         self.assertContains(response, "Are you sure")
 
@@ -197,7 +200,7 @@ class TestInvoiceDelete(TestCase):
 
     def test_invoice_delete_not_allowed(self):
         request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[1].pk})
-        
+
         response = self.client.get(request_url, follow=True)
         self.assertContains(response, "To delete an invoice, delete the payments first.")
 
@@ -208,4 +211,18 @@ class TestInvoiceDelete(TestCase):
         response = self.client.post(request_url, follow=True)
 
         # Check this didn't work
-        self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
\ No newline at end of file
+        self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
+
+class TestSampleDataGenerator(TestCase):
+    @override_settings(DEBUG=True)
+    def test_generate_sample_data(self):
+        # Run the management command and check there are no exceptions
+        call_command('generateSampleData')
+
+        # Check there are lots of events
+        self.assertTrue(models.Event.objects.all().count() > 100)
+
+    def test_production_exception(self):
+        from django.core.management.base import CommandError
+
+        self.assertRaisesRegexp(CommandError, ".*production", call_command, 'generateSampleData')
diff --git a/app.json b/app.json
index ea2e5c25..737e5eb0 100644
--- a/app.json
+++ b/app.json
@@ -2,12 +2,13 @@
   "name": "PyRIGS",
   "description": "",
   "scripts": {
-    "postdeploy": "python manage.py migrate"
+    "postdeploy": "python manage.py migrate && python manage.py generateSampleData"
   },
   "env": {
     "DEBUG": {
       "required": true
     },
+    "STAGING": "1",
     "EMAIL_FROM": {
       "required": true
     },