Commit Graph

58 Commits

Author SHA1 Message Date
tomtom5152
047e3f77c4 Added debug info to user import 2014-11-05 23:29:14 +00:00
tomtom5152
c81d01b796 Started work on user importing.
RENAMED EXISTING USERS TO PREVENT CONFLICTS
2014-11-05 23:27:33 +00:00
tomtom5152
1a57535695 Changed finance links 2014-11-05 23:14:24 +00:00
tomtom5152
258aa02d58 Detail template improvements 2014-11-05 23:11:26 +00:00
tomtom5152
3a52319da7 Added menu links for Person, Organisation and Venue listings 2014-11-05 23:04:51 +00:00
tomtom5152
e887878f03 Added Venue views, urls and templates 2014-11-05 23:01:15 +00:00
tomtom5152
068a255a1c URL fail fix 2014-11-05 22:57:52 +00:00
tomtom5152
ac34977ddd Fixed a slight issue with string formatting in import_venue 2014-11-05 22:44:02 +00:00
tec
780f1ac5bc Fixed importer with Venue model 2014-11-05 22:41:40 +00:00
tec
9a3ac464f4 Minor changes to models and importer 2014-11-05 22:37:32 +00:00
tomtom5152
85b6004dda Merge remote-tracking branch 'origin/master' 2014-11-05 22:27:57 +00:00
tomtom5152
61fb27dc84 Added EventCrew model
Added collector to Event
2014-11-05 22:25:56 +00:00
tomtom5152
3cad695180 Added EventCrew model
Added collector to Event
2014-11-05 22:20:16 +00:00
tomtom5152
8c38091247 Added ability to delete all venues before improt 2014-11-05 19:49:47 +00:00
tomtom5152
d9ba90ca1e Added venue to importer 2014-11-05 19:43:30 +00:00
tomtom5152
e2a60a5fde Added Venue, Event and EventItem models 2014-11-05 19:34:36 +00:00
tomtom5152
711dbcaa7f Refactored some views to make it more consistent with Django internal namings 2014-11-05 16:57:31 +00:00
tomtom5152
c9fd7c0ad6 Added Person, Organisation and VatRate to admin section with reversion support 2014-11-05 16:50:55 +00:00
tomtom5152
d79b9fec9c Fixed issues with __unicode__() becoming __str__() in Python 3.
Fixed recursion issue with VatRate
2014-11-05 16:50:10 +00:00
tomtom5152
a4e1856dd4 Changed models.VatRate.__unicode__() to show as a percentage instead 2014-11-05 16:32:25 +00:00
tec
3fbb44a5ad Fixed issues with importer and datetime conversion
Fixed issue with models.VatRate.__unicode__() with datetime and decimal fields

Imported VatRates
2014-11-05 16:26:27 +00:00
tomtom5152
1bf5cbaf82 Add VAT Rates to modes, migrations and importer 2014-11-05 16:17:45 +00:00
tomtom5152
8713accf7d Merge remote-tracking branch 'origin/master' 2014-11-05 16:07:48 +00:00
tomtom5152
5921c01ef1 Updated organisation templates.
Render improvements to forms

Fixed organisation url
2014-11-05 16:07:24 +00:00
tomtom5152
d2b298ffbd Updated organisation templates.
Render improvements to forms

Fixed organisation url
2014-11-05 15:57:34 +00:00
tomtom5152
89e30a1d3a Renamed model variable to be compliant with Django standards 2014-11-05 15:53:54 +00:00
tec
60f8694c0c Reimported organisations 2014-11-05 15:37:23 +00:00
tomtom5152
21530b978a Added organisation things. Need to do the form. Committing to push and pull onto server with access to legacy database. 2014-11-05 15:22:50 +00:00
tomtom5152
046683ee5b Added .gitignore 2014-11-05 14:11:58 +00:00
tomtom5152
c624b91d18 Fixed issue with ordering breaking if there is no order is set in the URL 2014-11-05 14:06:37 +00:00
tomtom5152
7c87d5781f Merge remote-tracking branch 'origin/master'
Conflicts:
	RIGS/templatetags/filters.py
	db.sqlite3
2014-11-05 13:29:57 +00:00
Adam Bergen
8f4edd66e7 Removed unecessary for loop. Changed registration complete text. Profile model changes. 2014-11-04 16:33:23 +00:00
Tom Price
527203e274 Added search and orderby features to people 2014-11-04 04:35:03 +00:00
Tom Price
e5d89068fb Organisational import 2014-11-04 03:39:11 +00:00
Tom Price
a7384c1dd2 Added version history to models with the use of a mixin 2014-11-04 03:27:32 +00:00
Tom Price
31488da8b5 Major improvements to pagination, modals and people listing 2014-11-04 02:44:11 +00:00
Tom Price
f865676e4d Import people person by painstaking person... 2014-11-04 02:43:43 +00:00
Tom Price
f45860c797 Added PyMySQL things to requirements 2014-11-04 01:17:15 +00:00
Tom Price
9ce29980d9 Add requirements document 2014-11-04 00:37:22 +00:00
Tom Price
d8f399bfe3 Added buttons to view and edit people from index.
Updated additional ajax realted template things
2014-11-04 00:11:04 +00:00
Tom Price
194d9d6782 Created an ajax base template 2014-11-04 00:10:08 +00:00
tomtom5152
be11422906 Started work on a last edited at feature. 2014-10-31 02:42:43 +00:00
tomtom5152
fefe353823 Updates to person model. Removed comments for now in favour of a simple notes section that can be easily modified as a text field. Will look at introducing this again in the future. 2014-10-31 02:23:20 +00:00
tomtom5152
74bc6826ea Person CRUD working 2014-10-31 01:12:59 +00:00
tomtom5152
f4e23e6e5b Changed grammar on table headings 2014-10-29 15:31:49 +00:00
tomtom5152
88b59f43ec Added Person creation 2014-10-29 15:30:09 +00:00
tomtom5152
cb6eb46518 Added filters 2014-10-29 15:21:09 +00:00
tomtom5152
c79596d4fa Implemented person listing 2014-10-29 14:39:10 +00:00
tomtom5152
3486ab109e Installed debug_toolbar 2014-10-29 14:38:50 +00:00
tomtom5152
ee91e7ccff Added permission required decorator 2014-10-29 14:38:35 +00:00