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
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
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
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
Tom Price
c4a14e97c2
Fix for issue #4 . Changed edited by username to standard name format.
2015-01-22 19:31:43 +00:00
Tom Price
e3e57554c6
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
33ec095612
Improved Event UI
2015-01-22 19:12:01 +00:00
Tom Price
b6aa8ce1e2
Updated bootstrap asset files to V3.3.3
2015-01-22 18:52:32 +00:00
CI TEC
542eb91f9e
Fixed an error with the glypicon fonts having the wrong URL
2015-01-22 18:46:39 +00:00
CI TEC
c9c4ac03f8
Updated css files to latest version with new bootstrap
2015-01-22 18:40:12 +00:00
Tom Price
58af9e743b
Added the ability to clone an event to a new event.
2015-01-22 18:20:37 +00:00
Tom Price
c47721a42c
Untested changes to models and adding a new finance system. Cannot test
...
ATM so will do so ASAP.
2015-01-21 16:38:02 +00:00
Tom Price
b52da8c2c0
Changes to importer:
...
Added delete method to all importers
Added nonrig importing
Venue import optimisation
Reran importer for empty DB
Reset password appropriately
Added view permission to all models where needed.
Migrated DB to reflect.
Fixed all print buttons on event detail.
2014-12-08 02:42:18 +00:00
Tom Price
48d6570e37
Rig paperwork printing enabled
2014-12-08 00:59:08 +00:00
Tom Price
b616ff8ae1
Improvements to layout of event form notes section
...
Added nl2br support in interactions
2014-12-05 00:24:06 +00:00
Tom Price
d1eb78da3f
Work event item frontend
2014-12-05 00:16:47 +00:00
Tom Price
6f6f033104
Fixed frontend for updating existing items
2014-12-04 23:35:56 +00:00
Tom Price
9e7e6dc707
Event Items now saved using JSON rather than an AJAX request
2014-12-04 22:18:53 +00:00
Tom Price
969a2af4aa
Removed red text on danger rigs as there was no need for it
2014-12-03 22:44:13 +00:00
Tom Price
a87a1ba6bf
Fixed conditional user bit on the homepage
...
Improved text formatting on the base template
2014-12-03 22:39:13 +00:00
Tom Price
5cf73d441c
Added event items to the event form.
...
Need to get this working, thinking probably best to serialize the data and submit it that way so changes are only saved on update
2014-12-03 12:13:13 +00:00
Tom Price
1368224be6
Fixed issue with datetime fields
2014-12-03 11:50:24 +00:00
