Commit Graph

131 Commits

Author SHA1 Message Date
tomtom5152
ff0d703af5 Add rig collected by information issue #25 2015-03-28 17:12:37 +00:00
tomtom5152
83ae129d72 Change save icon to floppy #24
Add bugfix for flow on small screens
2015-03-28 16:54:51 +00:00
tomtom5152
422b7b063b Improve UI on event screen for dealing with long email addresses. 2015-03-28 16:34:06 +00:00
tomtom5152
8d79bb706d Unkown bug fix, this appears to work. 2015-03-27 16:00:18 +00:00
tomtom5152
8c7983c7ea Merge branch 'master' of bitbucket:nottinghamtec/pyrigs 2015-03-27 15:52:13 +00:00
Tom Price
c81cc952dd Merged in users (pull request #1)
Ability to view a users details and edit them
2015-03-27 15:49:53 +00:00
tomtom5152
896c30881f Bug fix for #30 2015-03-27 12:21:21 +00:00
tomtom5152
7977b6a17c Bug fix for non unicode in admin panel.
Add __str__ for Payments
2015-03-27 12:15:10 +00:00
tomtom5152
534d82a7df Bugfix for #27 2015-03-26 14:16:03 +00:00
tomtom5152
56979fa81a Bug fix for #23 2015-03-26 13:19:47 +00:00
tomtom5152
5f53925730 Add missing profile_form.html template 2015-03-25 21:10:45 +00:00
tomtom5152
d699a596f5 Add user editing 2015-03-25 20:21:54 +00:00
tomtom5152
c805379a7f Added viewing user profiles 2015-03-25 18:56:29 +00:00
Tom Price
8aeeb31491 Fixed syntax error in analytics.html 2015-03-13 15:28:34 +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
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
7ede9b566b Added error message for start > end 2015-03-04 16:08:36 +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
0a54a1f2e3 Slight bugfix for 3e1fa4b with incorrect logic. 2015-03-04 03:11:54 +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
920f937c59 Fix for #14
Removed reference to cost__gt=0 so discounts work.
2015-03-04 02:24:04 +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
31d246fb27 Made raw queries portable to postgresql engine as well 2015-03-03 02:44:16 +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
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
3dc856c489 Increased query efficiency 2015-02-01 23:41:03 +00:00
Tom Price
e00a8771cc Created invoice importer
Allowed payment method to be null
2015-01-31 23:13:09 +00:00
tomtom5152
b527a3faa9 Fixed incorrect url on bootstrap fonts.
Fixed missing static files in repo
2015-01-30 13:47:56 +00:00
tomtom5152
20264f570a Added the ability to invoice an event 2015-01-30 00:27:02 +00:00
tomtom5152
a0cf841d91 Added default value to Invoice.void (False) 2015-01-30 00:16:29 +00:00
tomtom5152
b1b5906038 Basic working invoice system. Need to add a way to create invoices. 2015-01-29 23:18:04 +00:00
tomtom5152
6c322e39cb Started making use of gravatar icons. 2015-01-29 20:02:18 +00:00
tomtom5152
d9e8e4d03f Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs 2015-01-28 16:59:54 +00:00
tomtom5152
e24a95ec7a Added missing fields to event form and detail 2015-01-28 16:49:10 +00:00
tomtom5152
41bd6bc384 Fixes for the selection of current rigs.
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
root
1e16542747 Fixes for the importer 2015-01-28 16:28:59 +00:00
tomtom5152
df67788865 Improved the way current events is queried 2015-01-28 15:29:00 +00:00
tomtom5152
ce3536714e 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
47e67e4c94 Fixed some dependency version issues. 2015-01-27 16:43:12 +00:00
Tom Price
4a908fd95f Added archive link
Added legacy redirect urls
2015-01-26 16:09:22 +00:00
Tom Price
5b1cdbf182 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
c4bb7fbee6 Everyone's favourite, past events, now working and loading in ~800ms 2015-01-26 15:06:39 +00:00
Tom Price
93feaaf334 Corrected permissions to duplicate a rig 2015-01-26 11:11:11 +00:00
Tom Price
941bd2319e Improved person/organisation cross referencing via events 2015-01-22 22:06:24 +00:00
Tom Price
ff9bca1e61 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
346c05759a Fix for issue #5. Added verbose name to Event.mic 2015-01-22 19:34:25 +00:00
Tom Price
387a7566c7 Fix for issue #4. Changed edited by username to standard name format. 2015-01-22 19:31:43 +00:00
Tom Price
5c236819f4 Fixed issue with item modals not displaying.
Moved item modal code to an includable file.
2015-01-22 19:26:16 +00:00
Tom Price
7f2c4d2f18 Improved Event UI 2015-01-22 19:12:01 +00:00
Tom Price
85dc7746a2 Updated bootstrap asset files to V3.3.3 2015-01-22 18:52:32 +00:00