tomtom5152
356d6801b2
Uncomment out all import items
2015-03-28 19:33:49 +00:00
tomtom5152
188f06afc2
Fix mouseover text. Tidy up non rig detail
2015-03-28 17:32:47 +00:00
tomtom5152
cc85b44ba3
Add rig collected by information issue #25
2015-03-28 17:12:37 +00:00
tomtom5152
1120409e88
Change save icon to floppy #24
...
Add bugfix for flow on small screens
2015-03-28 16:54:51 +00:00
tomtom5152
194337830d
Improve UI on event screen for dealing with long email addresses.
2015-03-28 16:34:06 +00:00
tomtom5152
3030316ff5
Unkown bug fix, this appears to work.
2015-03-27 16:00:18 +00:00
tomtom5152
d7a3bdf3d6
Merge branch 'master' of bitbucket:nottinghamtec/pyrigs
2015-03-27 15:52:13 +00:00
Tom Price
4883b9dc01
Merged in users (pull request #1 )
...
Ability to view a users details and edit them
2015-03-27 15:49:53 +00:00
tomtom5152
f013cfb968
Bug fix for #30
2015-03-27 12:21:21 +00:00
tomtom5152
2a3875f198
Bug fix for non unicode in admin panel.
...
Add __str__ for Payments
2015-03-27 12:15:10 +00:00
tomtom5152
d70ad24c53
Bugfix for #27
2015-03-26 14:16:03 +00:00
tomtom5152
bc09075776
Template improvements to registration form
2015-03-26 13:51:35 +00:00
tomtom5152
17417e38cd
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
f1e75d1656
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
048c4b801a
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
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
64d6d134b6
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
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
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
3876318fe5
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
b4829d9d16
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
root
50d34af428
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
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
e1cef5bd87
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
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
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
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
76939409bb
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
tomtom5152
c6d89416a1
Fixed incorrect url on bootstrap fonts.
...
Fixed missing static files in repo
2015-01-30 13:47:56 +00:00
tomtom5152
af1396a168
Added the ability to invoice an event
2015-01-30 00:27:02 +00:00
tomtom5152
bbce968478
Added more invoice buttons
2015-01-30 00:25:45 +00:00
tomtom5152
8086d13756
Enabled invoices button
2015-01-30 00:22:48 +00:00
tomtom5152
a0e3f6bfc1
Added default value to Invoice.void (False)
2015-01-30 00:16:29 +00:00
tomtom5152
2ce45b9297
Basic working invoice system. Need to add a way to create invoices.
2015-01-29 23:18:04 +00:00
tomtom5152
5f88e1e759
Merge remote-tracking branch 'origin/master'
2015-01-29 20:02:40 +00:00
tomtom5152
f913b94345
Started making use of gravatar icons.
2015-01-29 20:02:18 +00:00
tomtom5152
391c874508
Started making use of gravatar icons.
2015-01-29 20:00:07 +00:00
root
3df97c9e61
Fixed display issue with the base template
2015-01-29 18:46:21 +00:00
root
a82a65f8ec
Added setting user passwords to uuid4 so forgotten password should work
2015-01-29 16:04:19 +00:00
tomtom5152
dd88b5361f
Fixed added the ability to import
2015-01-28 18:45:40 +00:00
tomtom5152
fd36688147
Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
2015-01-28 16:59:54 +00:00
