Tom Price
e212109a7a
Change ordering for events to start_date first.
2015-03-30 19:59:24 +01:00
Tom Price
4b04716273
Add non rig status changing #37
2015-03-30 19:49:58 +01:00
Tom Price
eefc469946
Add Dry Hire label #38
2015-03-30 19:45:02 +01:00
Tom Price
1de29e2234
Add status label and muting for cancelled events issue #36
2015-03-30 19:37:42 +01:00
Tom Price
ac8bda85e2
Change table classes to show non rigs issue #37
2015-03-30 19:15:41 +01:00
tomtom5152
2a3588e148
Bug fix for #35
2015-03-29 22:54:29 +01:00
tomtom5152
1b221e6933
Add many links to event detail. Potential fix for #34
2015-03-29 21:43:12 +01:00
tomtom5152
7a4c70ab99
Add edit autocomplete buttons to edit rig page.
...
Issue #22
2015-03-29 14:22:58 +01:00
tomtom5152
6c1ba912b8
Add edit urls to API results.
...
Change mic API lookup to profile
2015-03-29 13:40:52 +01:00
tomtom5152
3a1c9e938a
Remove threading due to issues with postgres
2015-03-28 20:02:47 +00:00
tomtom5152
ca7aeee3e1
Bug fix with not oppening the connection
2015-03-28 19:56:46 +00:00
tomtom5152
24ed32e7cb
Uncomment out all import items
2015-03-28 19:33:49 +00:00
tomtom5152
9ca9a0f38d
Fix mouseover text. Tidy up non rig detail
2015-03-28 17:32:47 +00:00
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
b46c0867ed
Template improvements to registration form
2015-03-26 13:51:35 +00:00
tomtom5152
4002206fa9
Bug fix for #27
2015-03-26 13:44:50 +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
a1d3987d5d
Add links to user details to base.
...
Improve issues with logout not looking correct.
2015-03-25 20:44:58 +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
7fdeeec9d5
Minor improvement to tracking code.
...
Updated the userid tracking to better match the documentation
Added linkid tracking to analytics.html
2015-03-13 15:43:08 +00:00
Tom Price
8aeeb31491
Fixed syntax error in analytics.html
2015-03-13 15:28:34 +00:00
tjp03u
52fb9e17fe
Added analytics code.
2015-03-11 14:57:33 +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
bab8b98db3
Merge remote-tracking branch 'origin/master'
...
Conflicts:
RIGS/finance.py
RIGS/models.py
2015-03-03 02:44:50 +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
4408b4afdc
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:20:07 +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
61f474fb70
Made entire importer atomic for consistency.
...
Dispatched as much as possible to sub-processes
Added "make this go away" feature to the invoice importer for invoices older than a year.
2015-02-01 23:42:41 +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
