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
tomtom5152
29edcebb88
Added missing fields to event form and detail
2015-01-28 16:49:10 +00:00
tomtom5152
1c29b9275d
Fixes for the selection of current rigs.
...
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
root
8339ec70d3
Fixes for the importer
2015-01-28 16:28:59 +00:00
tomtom5152
ca1fd274e2
Improved the way current events is queried
2015-01-28 15:29:00 +00:00
root
b2b5438e12
Updated some email settings to be used in production
2015-01-27 16:56:46 +00:00
tomtom5152
1aff7bcadb
Minor fix for importer adding @nottingham.ac.uk to empty emails.
...
Small test case for email fixer to make sure that emails are fixed correctly.
2015-01-27 16:51:58 +00:00
tomtom5152
75f9d2ffc4
Fixed some dependency version issues.
2015-01-27 16:43:12 +00:00
root
8c8a724566
Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
...
Merge in requirements error fix
2015-01-27 01:06:09 +00:00
root
ef708b3a9a
Fixed typo in z3c.rlm -> z3c.rml
2015-01-27 01:01:46 +00:00
Tom Price
343e34662b
Added archive link
...
Added legacy redirect urls
2015-01-26 16:09:22 +00:00
Tom Price
6f27474a88
Performance optimisation of the related models by letting the DB deal with the relation straight off
2015-01-26 15:19:37 +00:00
Tom Price
9c9dc07929
Everyone's favourite, past events, now working and loading in ~800ms
2015-01-26 15:06:39 +00:00
Tom Price
13ce96809b
Corrected permissions to duplicate a rig
2015-01-26 11:11:11 +00:00
Tom Price
98ef7539e9
Improved person/organisation cross referencing via events
2015-01-22 22:06:24 +00:00
Tom Price
c6aed3db75
Moved the table element from the main rigboard out to something reusuable.
...
Added the ability to view organisations by people and vice versa, as well as the option to see all the rigs associated with orgs/people/venues.
Added helper properties for the above
2015-01-22 20:48:37 +00:00
Tom Price
e2d01cc6c5
Fix for issue #5 . Added verbose name to Event.mic
2015-01-22 19:34:25 +00:00
