Commit Graph

1781 Commits

Author SHA1 Message Date
tomtom5152
17417e38cd Bug fix for #27 2015-03-26 13:44:50 +00:00
tomtom5152
4002206fa9 Bug fix for #27 2015-03-26 13:44:50 +00:00
tomtom5152
7c52d8334c Bug fix for #23 2015-03-26 13:19:47 +00:00
tomtom5152
56979fa81a Bug fix for #23 2015-03-26 13:19:47 +00:00
tomtom5152
f1e75d1656 Add missing profile_form.html template 2015-03-25 21:10:45 +00:00
tomtom5152
5f53925730 Add missing profile_form.html template 2015-03-25 21:10:45 +00:00
tomtom5152
cc27822b34 Add links to user details to base.
Improve issues with logout not looking correct.
2015-03-25 20:44:58 +00:00
tomtom5152
a1d3987d5d Add links to user details to base.
Improve issues with logout not looking correct.
2015-03-25 20:44:58 +00:00
tomtom5152
048c4b801a Add user editing 2015-03-25 20:21:54 +00:00
tomtom5152
d699a596f5 Add user editing 2015-03-25 20:21:54 +00:00
tomtom5152
e5fa55ea6c Added viewing user profiles 2015-03-25 18:56:29 +00:00
tomtom5152
c805379a7f Added viewing user profiles 2015-03-25 18:56:29 +00:00
Tom Price
3230b03606 Minor improvement to tracking code.
Updated the userid tracking to better match the documentation

Added linkid tracking to analytics.html
2015-03-13 15:43:08 +00:00
Tom Price
7fdeeec9d5 Minor improvement to tracking code.
Updated the userid tracking to better match the documentation

Added linkid tracking to analytics.html
2015-03-13 15:43:08 +00:00
Tom Price
64d6d134b6 Fixed syntax error in analytics.html 2015-03-13 15:28:34 +00:00
Tom Price
8aeeb31491 Fixed syntax error in analytics.html 2015-03-13 15:28:34 +00:00
tjp03u
2ae6e305e2 Added analytics code. 2015-03-11 14:57:33 +00:00
tjp03u
52fb9e17fe Added analytics code. 2015-03-11 14:57:33 +00:00
tomtom5152
2568517a8f Readded start>end checking. Template improvements
Added descritpions of all error for the user as well as the image.

Added contextual alert boxes for messages in base.

If  start>end start<=>end. Very simple fix, thanks Charlie.
2015-03-05 18:20:43 +00:00
tomtom5152
3ce01e79c5 Readded start>end checking. Template improvements
Added descritpions of all error for the user as well as the image.

Added contextual alert boxes for messages in base.

If  start>end start<=>end. Very simple fix, thanks Charlie.
2015-03-05 18:20:43 +00:00
tomtom5152
d6bcc2f5dd Removed logic for the exception of start > end. This didn't add anything to UX so will need to find a better way of doing this. Ultimately, saying that there are no events available IS the correct response. 2015-03-05 15:11:23 +00:00
tomtom5152
7f0ef83f1c Removed logic for the exception of start > end. This didn't add anything to UX so will need to find a better way of doing this. Ultimately, saying that there are no events available IS the correct response. 2015-03-05 15:11:23 +00:00
tomtom5152
3876318fe5 Added error message for start > end 2015-03-04 16:08:36 +00:00
tomtom5152
7ede9b566b Added error message for start > end 2015-03-04 16:08:36 +00:00
tomtom5152
2930f43937 Fix for #9
Added ORDER BY statement to the invoice page.
Ordered all other invoice pages.
2015-03-04 15:49:00 +00:00
tomtom5152
4ba308357c Fix for #9
Added ORDER BY statement to the invoice page.
Ordered all other invoice pages.
2015-03-04 15:49:00 +00:00
tomtom5152
b4829d9d16 Slight bugfix for 3e1fa4b with incorrect logic. 2015-03-04 03:11:54 +00:00
tomtom5152
0a54a1f2e3 Slight bugfix for 3e1fa4b with incorrect logic. 2015-03-04 03:11:54 +00:00
tomtom5152
3e1fa4b9ab Potential fix for #12.
Added a clause where if there was a balance balance, and no payments, it would still show up.
2015-03-04 03:06:43 +00:00
tomtom5152
a5be8aa38b Potential fix for #12.
Added a clause where if there was a balance balance, and no payments, it would still show up.
2015-03-04 03:06:43 +00:00
root
50d34af428 Fix for #14
Removed reference to cost__gt=0 so discounts work.
2015-03-04 02:24:04 +00:00
root
920f937c59 Fix for #14
Removed reference to cost__gt=0 so discounts work.
2015-03-04 02:24:04 +00:00
root
ed660b9106 Reverted to using Django ORM for the calculation of event totals and payment totals on an invoice.
Need to pay closer attention to the docs which state that the SUM(arg[0], fields) arg[0] is the returned type.
2015-03-03 17:29:38 +00:00
root
4247351253 Reverted to using Django ORM for the calculation of event totals and payment totals on an invoice.
Need to pay closer attention to the docs which state that the SUM(arg[0], fields) arg[0] is the returned type.
2015-03-03 17:29:38 +00:00
Tom Price
a3b30ceed8 Merge remote-tracking branch 'origin/master'
Conflicts:
	RIGS/finance.py
	RIGS/models.py
2015-03-03 02:44:50 +00:00
Tom Price
bab8b98db3 Merge remote-tracking branch 'origin/master'
Conflicts:
	RIGS/finance.py
	RIGS/models.py
2015-03-03 02:44:50 +00:00
Tom Price
e1cef5bd87 Made raw queries portable to postgresql engine as well 2015-03-03 02:44:16 +00:00
Tom Price
31d246fb27 Made raw queries portable to postgresql engine as well 2015-03-03 02:44:16 +00:00
Tom Price
472cc3f1bb Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get.
Changed outstanding invoice to a raw SQL query for a speed boost. Average load now ~3.5s with ~10 invoices
2015-03-03 02:43:57 +00:00
Tom Price
2456092da5 Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get.
Changed outstanding invoice to a raw SQL query for a speed boost. Average load now ~3.5s with ~10 invoices
2015-03-03 02:43:57 +00:00
Tom Price
c7b483e0ad Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get.
Changed outstanding invoice to a raw SQL query for a speed boost. Average load now ~3.5s with ~10 invoices
2015-03-03 02:20:07 +00:00
Tom Price
4408b4afdc Changed the calculations of sum totals to be raw SQL queries for speed boost. Not ideal but the best we are going to get.
Changed outstanding invoice to a raw SQL query for a speed boost. Average load now ~3.5s with ~10 invoices
2015-03-03 02:20:07 +00:00
Tom Price
ff1d5730a2 Fixed issue with calculating the balance on an invoice
Improvements to the invoice importer
2015-02-09 17:48:59 +00:00
Tom Price
c928f41e03 Fixed issue with calculating the balance on an invoice
Improvements to the invoice importer
2015-02-09 17:48:59 +00:00
Tom Price
46aa363851 Made entire importer atomic for consistency.
Dispatched as much as possible to sub-processes

Added "make this go away" feature to the invoice importer for invoices older than a year.
2015-02-01 23:42:41 +00:00
Tom Price
61f474fb70 Made entire importer atomic for consistency.
Dispatched as much as possible to sub-processes

Added "make this go away" feature to the invoice importer for invoices older than a year.
2015-02-01 23:42:41 +00:00
Tom Price
76939409bb Increased query efficiency 2015-02-01 23:41:03 +00:00
Tom Price
3dc856c489 Increased query efficiency 2015-02-01 23:41:03 +00:00
Tom Price
d8cff2779f Created invoice importer
Allowed payment method to be null
2015-01-31 23:13:09 +00:00
Tom Price
e00a8771cc Created invoice importer
Allowed payment method to be null
2015-01-31 23:13:09 +00:00