Tom Price
9c7f6c0942
Merge branch 'master' into web-calendar
2015-07-29 18:39:36 +01:00
Tom Price
2795c42fad
Merge branch 'vagrant' into hotfixes
2015-07-23 21:08:44 +01:00
David Taylor
66c5e359d4
Merge branch 'ui-changes'
2015-07-21 00:19:32 +01:00
David Taylor
e7c39c2b81
Removed special characters from paperwork filenames - issue #103
2015-06-29 23:27:10 +01:00
David Taylor
d9704b9407
Added start/end date validation for events
2015-06-29 22:16:50 +01:00
David Taylor
f190b9192b
Fixed some #timezoneIssues
2015-06-29 21:07:10 +01:00
David Taylor
2d1369dfe9
Added additional selectors to events_in_bounds
2015-06-29 20:28:09 +01:00
David Taylor
5ef5f3517c
Streamlined web-calendar logic, also fixed issue #94
2015-06-29 20:25:46 +01:00
David Taylor
2daca351d6
Merge branch 'hotfixes' into web-calendar
2015-06-29 19:40:01 +01:00
David Taylor
6641867803
Added earliest_time property to event
2015-06-29 19:39:24 +01:00
David Taylor
0b63bbcc5b
Improved how events are selected for display on web-calendar
2015-06-29 14:42:53 +01:00
David Taylor
d3f7ab8fbb
Rewrote UI for person and organisation detail pages - now matches design of event_detail and is generally much prettier. Also happens to fix issue #6
2015-06-29 02:25:53 +01:00
David Taylor
ab54809776
Fixed testEventDetail
2015-06-28 19:02:18 +01:00
Tom Price
b92b1bdf78
Remove uneeded linebreaks to make it easier to trace what is going on.
2015-05-31 23:04:59 +01:00
Tom Price
82ea08ad51
Fix for postgres requring an explicit definition of what the output field type is with summing mixed fields
2015-05-29 15:59:08 +01:00
Tom Price
2899c684ac
Fix for changes to sum function
2015-05-29 15:42:57 +01:00
David Taylor
346ee19862
Added profile Modals & links from activity feed
2015-05-29 01:28:36 +01:00
Tom Price
3f373d807a
Change 'Collected by' to lowercase so it shows up correctly in the activity feed
...
Incidently, this is corrected by forms to have sentence case.
2015-05-29 00:19:25 +01:00
Tom Price
e3e1bf6892
Change profile to use the correct user display name.
2015-05-29 00:12:26 +01:00
David Taylor
6ab0715376
Made it work for other models
2015-05-23 14:57:29 +01:00
Tom Price
0ffb79c7e8
Merged in purchase-order (pull request #23 )
...
Added PO field to event form #82
2015-04-24 15:13:15 +01:00
David Taylor
e48619c15a
Fixed midnight issues in ical, web calendar & event_table
2015-04-24 14:22:08 +01:00
David Taylor
937f7e2f1c
Changed to 'PO' and corrected capitalisation in 'Collected by'
2015-04-24 01:22:46 +01:00
David Taylor
2b79b17fbf
Added PO field to event form
2015-04-23 23:58:54 +01:00
Tom Price
2cfeb49ea0
Change ical to use dynamically generated URL's instead of a static base URL.
2015-04-21 19:25:46 +01:00
David Taylor
57b2fd5a69
Merge commit '3869751b8c5795a73418a3645c0ec2d8a27cf70c' into ics-interface
2015-04-20 15:19:25 +01:00
David Taylor
f40cfa7490
Made it work for users that already exist in database
2015-04-19 17:28:22 +01:00
David Taylor
df88222e00
Added api key stuff to profile model
2015-04-19 17:06:03 +01:00
David Taylor
80e8efc763
Changed to wavatar default
2015-03-31 16:50:14 +01:00
Tom Price
e212109a7a
Change ordering for events to start_date first.
2015-03-30 19:59:24 +01:00
tomtom5152
ff0d703af5
Add rig collected by information issue #25
2015-03-28 17:12:37 +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
Tom Price
8aeeb31491
Fixed syntax error in analytics.html
2015-03-13 15:28:34 +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
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
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
41bd6bc384
Fixes for the selection of current rigs.
...
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
tomtom5152
df67788865
Improved the way current events is queried
2015-01-28 15:29:00 +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
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
