-
+
-
+
diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index c16c501b..fcbe5e87 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -1,66 +1,91 @@
{% extends 'base.html' %}
{% load paginator from filters %}
+{% load static %}
{% block title %}Events for Invoice{% endblock %}
+{% block js %}
+
+
+{% endblock %}
+
{% block content %}
-
-
-
+
{% if is_paginated %}
Events for Invoice
+Events for Invoice ({{count}} Events, £ {{ total|floatformat:2 }})
+These events have happened, but paperwork has not yet been sent to treasury
{% if is_paginated %}
{% paginator %}
{% endif %}
- | # | -Date | -Event | -Client | -Cost | -MIC | -- | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| N{{ object.pk|stringformat:"05d" }} | -{{ object.end_date }} | -{{ object.name }} | -- {% if object.organisation %} - {{ object.organisation.name }} - {% else %} - {{ object.person.name }} - {% endif %} - | -{{ object.sum_total|floatformat:2 }} | -
- {{ object.mic.initials }} - |
- - - - - | +
| Event # | +Start Date | +Event Name | +Client | +Cost | +MIC | +
|---|
+ {{ object.get_status_display }}
+ {{ object.organisation.union_account|yesno:'Internal,External' }} + {% else %} + {{ object.person.name }} +
+ External + {% endif %} + +
+
{% paginator %}
diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html
index a22ea449..46208ddc 100644
--- a/RIGS/templates/RIGS/event_table.html
+++ b/RIGS/templates/RIGS/event_table.html
@@ -3,7 +3,7 @@
-
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index bf9fe31f..2f34b6c9 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -5,38 +5,71 @@
{% block content %}
| # | +# | Event Date | Event Details | Event Timings | @@ -25,7 +25,7 @@ danger {% endif %} "> -{{ event.pk }} | +{{ event.pk }} |
{{ event.start_date|date:"D d/m/Y" }}
{% if event.end_date and event.end_date != event.start_date %}
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 a3be5320..cfcfcfe9 100644
--- a/RIGS/templates/RIGS/invoice_detail.html
+++ b/RIGS/templates/RIGS/invoice_detail.html
@@ -11,6 +11,10 @@
+
+ Delete invoice {{ object.pk }}+ +Are you sure you wish to delete invoice {{ object.pk }}? + +This action cannot be undone! + +
+
+
+
+
+
-
- Event Details
+
+ Event Details
+ {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
+
+
|
{% endfor %}
+
| Balance: | +{{ object.balance|floatformat:2 }} | ++ |
-
-
-
+
{% if is_paginated %}
Invoices
+{% block heading %}Invoices{% endblock %}
+ {% block description %}{% endblock %} {% if is_paginated %}
{% paginator %}
{% endif %}
- | # | -Event | -Invoice Date | -Balance | -- | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ object.pk }} | -N{{ object.event.pk|stringformat:"05d" }}: {{ object.event.name }} | -{{ object.invoice_date }} | -{{ object.balance|floatformat:2 }} | -- - - - | +
| Invoice # | +Event | +Client | +Event Date | +Invoice Date | +Balance | +
|---|
+ {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(O/S){% endif %}
+ {{ object.event.get_status_display }}{% if not object.event.mic %}, No MIC{% endif %} +
+ {{ object.event.organisation.union_account|yesno:'Internal,External' }} + {% else %} + {{ object.event.person.name }} +
+ External + {% endif %} +
{% 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..23bfc768
--- /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 ({{ count }} Events, £ {{ total|floatformat:2 }})
+{% endblock %}
+
+{% block description %}
+{{ 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 8fce1e60..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 %}
@@ -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 %}{{ object.pk }}
{{ object.name }}
{{ object.email }}
- {{ object.phone }}
+ {{ object.phone }}
{{ object.notes|yesno|capfirst }}
diff --git a/RIGS/templates/RIGS/version_history.html b/RIGS/templates/RIGS/version_history.html
index 163a1ac5..3261c5df 100644
--- a/RIGS/templates/RIGS/version_history.html
+++ b/RIGS/templates/RIGS/version_history.html
@@ -35,6 +35,7 @@
Version ID
User
Changes
+ Comment
@@ -46,11 +47,14 @@
{{ version.revision.user.name }}
{% if version.old == None %}
- Object Created
+ {{object|to_class_name}} Created
{% else %}
{% include 'RIGS/version_changes.html' %}
{% endif %}
+
+ {{ version.revision.comment }}
+
{% endif %}
{% endfor %}
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)
diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py
index 5b22743f..2deea6e4 100644
--- a/RIGS/test_unit.py
+++ b/RIGS/test_unit.py
@@ -1,11 +1,240 @@
+from datetime import date
+
+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 django.utils.safestring import SafeText
from RIGS.templatetags.markdown_tags import markdown_filter
+
from RIGS import models
+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(self.venues[1].pk), unicode(self.venues[2].pk)],
+ '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 venue has been disposed of
+ self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk)
+
+ # Check the one we didn't delete is still there
+ self.assertEqual(models.Venue.objects.get(pk=self.venues[3].pk), self.venues[3])
+
+ # Check the events have been moved to the master venue
+ for key, event in self.events.iteritems():
+ 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])
+
+ def test_person_merge(self):
+ change_url = reverse('admin:RIGS_person_changelist')
+
+ data = {'action': 'merge',
+ '_selected_action': [unicode(self.persons[1].pk), unicode(self.persons[2].pk)],
+ '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)
+
+ # Check the one we didn't delete is still there
+ self.assertEqual(models.Person.objects.get(pk=self.persons[3].pk), self.persons[3])
+
+ # Check the events have been moved to the master person
+ for key, event in self.events.iteritems():
+ 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])
+
+ def test_organisation_merge(self):
+ change_url = reverse('admin:RIGS_organisation_changelist')
+
+ data = {'action': 'merge',
+ '_selected_action': [unicode(self.organisations[1].pk), unicode(self.organisations[2].pk)],
+ '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)
+
+ # 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])
+
+
+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))
+
+
+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')
+
+
class TestMarkdownTemplateTags(TestCase):
markdown = """
An h1 header
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'),
diff --git a/RIGS/versioning.py b/RIGS/versioning.py
index 789fc5d7..6d524fc0 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.contrib.contenttypes.models import ContentType # Used to lookup the content_type
+from django.db.models import IntegerField, EmailField, TextField
from diff_match_patch import diff_match_patch
-from RIGS import models, forms
+from RIGS import models
import datetime
-import re
logger = logging.getLogger('tec.pyrigs')
@@ -29,11 +20,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 +41,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,35 +66,43 @@ 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
- oldValue = getattr(oldObj, name, None)
- newValue = getattr(newObj, name, None)
+ if name in excluded_keys:
+ continue # if we're excluding this field, skip over it
+
+ 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:
- 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
@@ -119,39 +117,43 @@ 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
- compare = ItemCompare(old=version.object_version.object)
- item_dict[version.object_id] = compare
+ 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.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
- 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
+ for version in new_item_versions: # go through the new versions
+ 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
+ except KeyError: # there's no matching old version, so add this item to the dictionary by itself
+ compare = ItemCompare(new=version.object_version.object)
- 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
@@ -159,17 +161,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()
@@ -193,6 +197,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"
@@ -208,7 +213,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']
@@ -217,81 +222,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
diff --git a/app.json b/app.json
new file mode 100644
index 00000000..737e5eb0
--- /dev/null
+++ b/app.json
@@ -0,0 +1,53 @@
+{
+ "name": "PyRIGS",
+ "description": "",
+ "scripts": {
+ "postdeploy": "python manage.py migrate && python manage.py generateSampleData"
+ },
+ "env": {
+ "DEBUG": {
+ "required": true
+ },
+ "STAGING": "1",
+ "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
diff --git a/requirements.txt b/requirements.txt
index 48ebb187..6adf870b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,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
diff --git a/templates/base.html b/templates/base.html
index 0324d448..a2262124 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,7 +14,7 @@
-
@@ -74,12 +74,12 @@
Invoices
{% endif %}
+ Outstanding
+
Archive
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
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
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/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 @@+ 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 Generateddiff --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 @@