Commit Graph

113 Commits

Author SHA1 Message Date
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
CI TEC
68b82bd612 Fixed an error with the glypicon fonts having the wrong URL 2015-01-22 18:46:39 +00:00
CI TEC
9c4a66021a Updated css files to latest version with new bootstrap 2015-01-22 18:40:12 +00:00
Tom Price
9bfd1064b3 Added the ability to clone an event to a new event. 2015-01-22 18:20:37 +00:00
Tom Price
d775a02758 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
ea61bda578 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
de153badcd Rig paperwork printing enabled 2014-12-08 00:59:08 +00:00
Tom Price
42f1e4e50f Improvements to layout of event form notes section
Added nl2br support in interactions
2014-12-05 00:24:06 +00:00
Tom Price
f9ff2459ca Work event item frontend 2014-12-05 00:16:47 +00:00
Tom Price
3a816dfe63 Fixed frontend for updating existing items 2014-12-04 23:35:56 +00:00
Tom Price
697bbb9479 Event Items now saved using JSON rather than an AJAX request 2014-12-04 22:18:53 +00:00
Tom Price
624c949dc4 Removed red text on danger rigs as there was no need for it 2014-12-03 22:44:13 +00:00
Tom Price
bad3af9bf3 Fixed conditional user bit on the homepage
Improved text formatting on the base template
2014-12-03 22:39:13 +00:00
Tom Price
d90306a5e0 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
74e88e6173 Fixed issue with datetime fields 2014-12-03 11:50:24 +00:00
Tom Price
0ad35dc6cc Updates to AJAX forms and adding autofill function to the event form when adding things via AJAX 2014-12-03 11:17:07 +00:00
Tom Price
6b760ba523 Added based on information 2014-12-03 11:16:20 +00:00
Tom Price
0790340eab Fixed bug where not limited dict length for api queries 2014-12-02 16:25:53 +00:00
Tom Price
d7f6a7f0aa Created index
Minor changes to base template navbar
2014-12-02 16:23:31 +00:00