Commit Graph

148 Commits

Author SHA1 Message Date
Tom Price
ec9b108742 Merged in Registration-Profile-Names (pull request #2)
Added first & last name fields to registration form #43

Don't need to change the template for this. Woo for being lazy :P
2015-03-31 10:55:20 +01:00
Tom Price
c3aa3763a7 Merged in unique-initials (pull request #3). Ignore me with model validation, not a thing due to superclass.
Add unique initial validation #44
2015-03-31 10:53:44 +01:00
Tom Price
8340fd49d4 Fix for loosing data when there is a form validation error. Issue #42.
Added info message when there is an validation error and items are not shown.
2015-03-31 10:33:57 +01:00
Tom Price
99208f4022 Add conditionals to related models links. Bugfix for #41 2015-03-31 10:29:48 +01:00
Tom Price
6cdfb826f2 Fix unhelpful error message issue #42 2015-03-31 09:03:45 +01:00
David Taylor
a2be5d00b8 Add unique initial validation 2015-03-31 02:05:50 +01:00
David Taylor
98d0851f58 Added first & last name fields to registration form 2015-03-31 01:41:03 +01:00
Tom Price
9ac0326b4b Change ordering for events to start_date first. 2015-03-30 19:59:24 +01:00
Tom Price
da8fffcf10 Add non rig status changing #37 2015-03-30 19:49:58 +01:00
Tom Price
d012b52bce Add Dry Hire label #38 2015-03-30 19:45:02 +01:00
Tom Price
089719fe05 Add status label and muting for cancelled events issue #36 2015-03-30 19:37:42 +01:00
Tom Price
3f06e0b909 Change table classes to show non rigs issue #37 2015-03-30 19:15:41 +01:00
tomtom5152
9ebf3d4769 Bug fix for #35 2015-03-29 22:54:29 +01:00
tomtom5152
881fdda2c7 Add many links to event detail. Potential fix for #34 2015-03-29 21:43:12 +01:00
tomtom5152
95111695b9 Add edit autocomplete buttons to edit rig page.
Issue #22
2015-03-29 14:22:58 +01:00
tomtom5152
c954aa2497 Add edit urls to API results.
Change mic API lookup to profile
2015-03-29 13:40:52 +01: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
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
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
64d6d134b6 Fixed syntax error in analytics.html 2015-03-13 15:28:34 +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
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
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
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
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
f913b94345 Started making use of gravatar icons. 2015-01-29 20:02:18 +00:00
tomtom5152
fd36688147 Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs 2015-01-28 16:59:54 +00:00