Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

* Start to seperate versioning into its own app

* Start reworking invoice things

* Reduced overall font size a touch

* Improvements to generic lists

* Tweak some colours to be a bit less OTT

I need to work out if I can seperate background and primary colours like BS3 did

* Improvements to event table mobile

* First pass at mobile-ising the generic list

* Item table fixes

* Fixed fullcalendar print css not included

* Asset list table improvements

* Tweak asset list to be more in line with other lists

* Versioning template improvements

//TODO Rather than have seperate asset templates, convert 'id' into a template variable

* Tweak versioning templates to allow ID overrides

Asset specific templates begone. Still need to bring back the ID formatting for the Rigboard.

* Asset form fixes

* Use the right autocompleter.js...

* Breakout (most) user stuff to separate module

The model remains in RIGS for now, as it's pretty painful to move...

* Python Format/import opt

* Test Refactor Part 1 - Shuffle things around

* Fix migrations

TODO - need to ensure moved models are *moved* rather than deleted and recreated!

* Start on new tests

* Initial work on event create test reimpl

* Init other tests, more rigs test faffery

* Desaturate theme colors even more

Much closer to BS3

* Fix event item adding

Bit too heavy handed with the deduplication there Arona

* Initial refactor of event item testing

* Upgrade bootstrap-select

* Updated bootstrap-select for BS4

* Initial port of duplicate testing

Needs the latter half rewriting once we have an EventDetail POM

* Refactor date validation test

So close to killing test_functional.EventTest!

* Deduplication of testing code

* pep8

* Fix some tests

And some things that were actually borked

* FIX: Prevent setting access time after start time 

Cherry pick of d274ea4606. Will close #405.

* Refactor calendar tests

* FIX: Don't show asset buttons/history for basic users

* Really ought to get a pre-commit hook for pep8...

* Fully replace test_functional

* Dedupe generic search logic

* Fix the remaining tests

* Ensure submit button is scrolled to in tests

* Fix asset creation test + actually verify its results

* Make CI use latest (stable) chromedriver rather than some ancient one

Since Travis uses the latest stable chrome, should always match. Bash oneliner \o/

* Of course | is part of YAML syntax, of course...

Maybe this works.

* Update python version

Trying to get CI to match my local environment as much as possible...

* Minor test futzing

* Well that wasn't clever of me

* That was even less clever of me

* Revert to old submit wait behaviour

* What about if I did this

* Try disabling chrome cache

* Added screenshot recording of test failures

* Fixed RIGS tests not being run

* Fixed Pep8 - I promise I'll make a pre-commit hook sometime!

* Very initial work at togglable darktheme.

Dammit @alexdaniel654 just when I had my scope creep kinda under control. It'll be v. nice to have though...!

* More dark theme wangling

* Fix some asset template things

* FIX: CI Locale Issues

* Fix sample command

* Initial work at integrating the risk assessment

#136. No clever database structure as yet...

* FIX: Don't set every boolean input to radios

* Different approach to RA linking

* Move text definitions to somewhere more authoratitive

* FIX: Undo breakage causing autopep8

o.O

* Expand detail template

* Use correct view for RA history

* Initial work at coercing activity feed into showing RAs

Also shows Asset/Supplier on the homepage feed.

* Refactor activity feed template logic

Yay for removing arbitrary if/else chains!

* Initial work on caching activity feed

Server side that is. Ref #162.

* Start RA list template

* Refactor RA creation stuff, again

* Add H&S Details to Event Detail View

* Display venue notes in event detail

Notes are no use if nobody reads them. Not sure on this one.

* Add ability to filter event archive by status

Closes #168.

* Fix lingering naive time

* Use locmem cache in sqlite environments

Otherwise the tests just lock up totally. Should close #162

* Update dependencies

Mirrors/supersedes 0e67da82e2

* Add global ctrl/meta-enter shortcut for form submission

Wants rewriting for better efficiency, but hey, it works!

* Update dependencies

* Fix for a situation that should be impossible

* Fix navbar alignment

* FEAT: Improve 'omni'search

- Partialised template
- Added to assets header
- Added ability to search assets/suppliers
- Improved selection logic
- Have it display current query

* Move closemodal into PyRIGS

* Fix tests for search improvements

* Dark mode colour improvements

* Fix table colors for dry hires

* further darktheme fixes

* Remove the dark header from light theme

* Fix reload loops when CSS/JS is changed

* Move dark theme SCSS to separate file, fix inactive pagination styling

* Genercise detail pages

* Testing something re notes

I wonder if I can make that global, rather than per-template...

* Dark theme palette shenanigans

I just can't decide

* Match darktheme palette to forum darktheme palette

Why reinvent the wheel.

* Make supplier detail use the generic template

* Disable mobile event table PoC for now

* Remove the defaults from the RA fields + make them required

* More RA fixes

* Fixes to revisions for RAs

* Add bootstrap 4 test page

* Bunch of dark mode fixes from test page

* Do not use Django 'required' for radio selects

As this requires them to be True, whereas we just need to require that an option be entered.

* Properly fixed popover darktheme

* Fixed search for events

* Style fixes to asset list

* Start RA 'mark review' feature

* Add reviewing to revision history, fix RA editing not working

Also actually commit all the files, that helps

* Fix Power MIC being lost on RA edit

Why it is subtly different to the Event Update behaviour? Who knows

* Invalidate RA review if it is edited after review

* Start work on event checklist

* Add a button for creating and instantly voiding invoices

Handy dandy for when you have loads of cancelled events, like say, a pandemic

* Mooooore status chips, mooore

* Initial shenanigans on storing my overly fancy EC form

* Proof of concept for JSON parsing/storage

\o/

* Add new line functionality for vehicles/drivers

Might it have been easier to create 'dummy' models like with EventItems? Probably...

* Alter rig_count to not include un-checked-in dry hires

* Insert a divider between still-out dry hires and actually upcoming events on rigboard

* Initial work on new checklist handling. No more JSON!

* Versioning module now does magic

Automatic creation of views/urls for anything registered with reversion, with a small amount of hackage to preserve legacy stuff. (and the DAMNED asset IDs!) I would never get distracted...

* Cleanup

* Event checklist crew works

Mostly - its not happy with timezones

* Medium event power stuff done, barring worst case stuff

* Misc fixes

* Validation of power reqs

* Worst case points on checklist

* Templating improvements to RA/EC stuff

* Do event table color logic at python level

* Audit template fixes

* Restrict versioning to one level of depth for speed

Also fixed the template for nested changes

* Event properties internal/authorised always return a explicit boolean rather than sometimes None

* Use template filter for notes

* Fix list templates

TODO: Sensible place to define the 'expected answer' stuff.

* Fix cable table template

* Rethink rigboard color logic again

Also revert some broken stuff

* Test fixes

* Modify auth test so it doesn't try and test for external authorisations

Cause that's not a thing

* Why does this work

Bloody overzealous autoformatter...

* Formatting...

* Initial work on RA tests

* Pages/start of tests for EventChecklists

* Much better coverage of H&S things

* Cleanup & Squash migrations

* Fix wrong variable name in settings.py

* Fix broken invoice list template

* Add revision history to invoices/payments.

Also patches previously introduced reversion permissions hole.

Supersedes and closes #337.

* Various misc fixes

* Fix for my fix

* Curse youuuuu pep8

* Invoice template improvements

* Minor fixes

* More tweaks

* More fixes

* Major improvements/fixes to authorisation templates

* Add ability to mark event checklists as Large Event

This just disables the checks to allow the rest of it to be filled out for large events, though I expect paper forms may still be used...

* Remove database ID from generic list

* Put power threshold values in a collapse

* Use template filter for consistent removal of 'None links'

Plus cleaner template markup! More HTML-in-Python tho, which always feels a bit CSS-in-JS

* Tweak asset list markup

* Begin to change add buttons success -> primary

Also change search primary -> info to avoid clash

* Begin to improve event checklist on mobile

* Asset detail template improvements

* Fix #326 (again)

* Fix errors being squashed

* Fix rigboard validation tests

* Initial work on BS4 button templatetag

Newfeatureitis strikes again

* Allow multiple event checklists per event

TODO: Status chip now needs rethinking

* Minor event detail fixes

* Fix tests

* Rework button tag

* Mobile fixes for search

* Fix event checklist on mobile

* Redo light theme palette

* Switch rigboard new button to primary

* Kill off excess whitespace on rigboard

* Rigboard Timing display tweaks

* Fix tests

* Properly handle eventauthorisations in new versioning

It's not great, not terrible...

* Prevent creating duplicate revisions on event

Potential fix for #322 - I couldn't reproduce even before this change...

* Template improvements

* Minor test fixes

* Revert "Prevent creating duplicate revisions on event"

Apparently it was too strong at preventing dupes...

This reverts commit cce0ad0f9f.

# Conflicts:
#	RIGS/models.py

* Better approach to generic list templates + other deduplication

* Also apply better approach to generic detail pages

* One of these days I'll remember to test BEFORE pushing...

* And now the same for generic forms

* Display tick/cross rather than true/false in boolean version diffs

* Upgrade dependencies

* Fixes fixes fixes

* Fix dependency hell

Probably

* Correct handling of spaces in paperwork filenames

Also normalises display of Invoice IDs. Partial fix for #391.

* Buggerit millennium hand and shrimp

Knew I was gonna forget to fix the tests

* FIX: Set duplicated event status to provisional

Closes #398.

Flip flop. Flip flop.

* Update polyfill for datetime-local

Bloody Firefox. We love to hate you. Proper CSS of the fill to come, SoonTM.

Closes #391

* Curses!

* Minor typo fixes

* Initial pass at soop-consult confirmation screen for RAs

* Fix migration

* Make venue/date editable on EC

For multi venue, multi day events

Defaults to date and venue set on the event. Also made power MIC default to that set in RA

* Clearer logic for RA inverted fields

* (probably) fix tests

* Give keyholders supplier edit perm

* Generic list only displays edit button if user has perm

* Same perm check for generic details

* H&S Details takes up free space on non-internal events

* Remove flash of content when loading new rig page

* First pass at clearer display of asset list filters

* Fix tests / default to headless tests

(fingers crossed)

* Fix autocompleter.js to properly disable edit links again

* Move status color logic back to template

Cause that somehow makes it work better??

* Display note icon on event detail page

* Fix caching

* Put rounded corners back where they belong

* Remove lingering use of 'page-header'

BS removed that style

* More search and replace for BS changes

Thought I'd got them all. Clearly not!

* Remove enforced linebreak on status chips

* Fix horizontal-ness on some forms

* Remove animation on prefers-reduced-motion/low referesh rate devices

Also normalises handling of asset list cable table & improves its use of space on large devices

* Make version changes badges more readable

* First pass at making the calendar less crap

* Fix event table success logic

Yay for copy paste fails >.>

* Use borders rather than block colors for coloured tables under darktheme

* First pass at porting calendar from FC V3 to V5

Two major versions and all they did was rename a bunch of names...TWICE.

* Rework version name method to avoid blank names on eventchecklist vehicles/crew

* Fix cable test

* Made radio button focus much more obvious on dark theme

* Implement Jerb's wording changes

* Fix one test, break another...

* Fix recent change stream list mutation issue

* FIX: Do not naively cache event table

Not that easy, it turns out. Duh.

* FEAT: Implement #413 show associated assets on cable type detail pg

Closes #413

* Allow H&S for non-events

* Update emergency contact number

* Improvements to profile detail page

* Implement some of Jonny's suggested changes

TODO:
- Define event size at RA time, pass through to EC
- Have later power questions be context dependent

* Test fixes

* Add space for power/rigging plans to be linked to RAs

* Start move of event size logic to RA from Ec

* Javascript required shenanigans for RA power

* More moving of event size logic

* Fixing tests for new logic etc

* Why does this work

Indeed, it may not

* FIX: Stupid typo in versioning.py

* Further minor fixes to versioning

* Add icons to H&S menu items

* Should fix calendar breaking in production

* Small alignment fix in asset list

* Squash migrations

Co-authored-by: Matthew Smith <psyms13@nottingham.ac.uk>

RIGS/urls.py

@@ -1,200 +1,145 @@
-from django.urls import path
 from django.conf.urls import url
-from django.contrib.auth.views import PasswordResetView
-
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.views import LoginView
-from RIGS import models, views, rigboard, finance, ical, versioning, forms
-from django.views.generic import RedirectView
+from django.urls import path
 from django.views.decorators.clickjacking import xframe_options_exempt
-
-from PyRIGS.decorators import permission_required_with_403, has_oembed
-from PyRIGS.decorators import api_key_required
+from django.views.generic import RedirectView
+from PyRIGS.decorators import (api_key_required, has_oembed,
+                               permission_required_with_403)
+from RIGS import finance, ical, models, rigboard, views, hs
 
 urlpatterns = [
-    # Examples:
-    # url(r'^$', 'PyRIGS.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
-    url('^$', login_required(views.Index.as_view()), name='index'),
-    url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'),
-
-    path('user/login/', LoginView.as_view(authentication_form=forms.CheckApprovedForm), name='login'),
-    path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'),
-
-    url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'),
-
     # People
-    url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
-        name='person_list'),
-    url(r'^people/add/$',
-        permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()),
-        name='person_create'),
-    url(r'^people/(?P<pk>\d+)/$',
-        permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()),
-        name='person_detail'),
-    url(r'^people/(?P<pk>\d+)/history/$',
-        permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()),
-        name='person_history', kwargs={'model': models.Person}),
-    url(r'^people/(?P<pk>\d+)/edit/$',
-        permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()),
-        name='person_update'),
+    path('people/', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
+         name='person_list'),
+    path('people/add/', permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()),
+         name='person_create'),
+    path('people/<int:pk>/', permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()),
+         name='person_detail'),
+    path('people/<int:pk>/edit/', permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()),
+         name='person_update'),
 
     # Organisations
-    url(r'^organisations/$',
-        permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()),
-        name='organisation_list'),
-    url(r'^organisations/add/$',
-        permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()),
-        name='organisation_create'),
-    url(r'^organisations/(?P<pk>\d+)/$',
-        permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
-        name='organisation_detail'),
-    url(r'^organisations/(?P<pk>\d+)/history/$',
-        permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()),
-        name='organisation_history', kwargs={'model': models.Organisation}),
-    url(r'^organisations/(?P<pk>\d+)/edit/$',
-        permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
-        name='organisation_update'),
+    path('organisations/', permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()),
+         name='organisation_list'),
+    path('organisations/add/',
+         permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()),
+         name='organisation_create'),
+    path('organisations/<int:pk>/',
+         permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
+         name='organisation_detail'),
+    path('organisations/<int:pk>/edit/',
+         permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
+         name='organisation_update'),
 
     # Venues
-    url(r'^venues/$',
-        permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
-        name='venue_list'),
-    url(r'^venues/add/$',
-        permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
-        name='venue_create'),
-    url(r'^venues/(?P<pk>\d+)/$',
-        permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
-        name='venue_detail'),
-    url(r'^venues/(?P<pk>\d+)/history/$',
-        permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()),
-        name='venue_history', kwargs={'model': models.Venue}),
-    url(r'^venues/(?P<pk>\d+)/edit/$',
-        permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
-        name='venue_update'),
+    path('venues/', permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
+         name='venue_list'),
+    path('venues/add/', permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
+         name='venue_create'),
+    path('venues/<int:pk>/', permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
+         name='venue_detail'),
+    path('venues/<int:pk>/edit/', permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
+         name='venue_update'),
 
     # Rigboard
-    url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
-    url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()),
-        name='web_calendar'),
+    path('rigboard/', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
+    path('rigboard/calendar/', login_required()(rigboard.WebCalendar.as_view()),
+         name='web_calendar'),
     url(r'^rigboard/calendar/(?P<view>(month|week|day))/$',
         login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
     url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$',
         login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
-    url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
-    url(r'^rigboard/activity/$',
-        permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
-        name='activity_table'),
-    url(r'^rigboard/activity/feed/$',
-        permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
-        name='activity_feed'),
+    path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
 
-    url(r'^event/(?P<pk>\d+)/$', has_oembed(oembed_view="event_oembed")(
-            rigboard.EventDetail.as_view()),
-        name='event_detail'),
-    url(r'^event/(?P<pk>\d+)/embed/$',
-        xframe_options_exempt(
-            login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
-        name='event_embed'),
-    url(r'^event/(?P<pk>\d+)/oembed_json/$',
-        rigboard.EventOembed.as_view(),
-        name='event_oembed'),
-    url(r'^event/(?P<pk>\d+)/print/$',
-        permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
-        name='event_print'),
-    url(r'^event/(?P<pk>\d+)/ra/$',
-        permission_required_with_403('RIGS.change_event')(rigboard.EventRA.as_view()),
-        name='event_ra'),
-    url(r'^event/create/$',
-        permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
-        name='event_create'),
-    url(r'^event/(?P<pk>\d+)/edit/$',
-        permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
-        name='event_update'),
-    url(r'^event/(?P<pk>\d+)/duplicate/$',
-        permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
-        name='event_duplicate'),
-    url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
-        name='event_archive'),
 
-    url(r'^event/(?P<pk>\d+)/history/$',
-        permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
-        name='event_history', kwargs={'model': models.Event}),
+    path('event/<int:pk>/', has_oembed(oembed_view="event_oembed")(rigboard.EventDetail.as_view()),
+         name='event_detail'),
+    path('event/create/', permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
+         name='event_create'),
+    path('event/archive/', login_required()(rigboard.EventArchive.as_view()),
+         name='event_archive'),
+    path('event/<int:pk>/embed/',
+         xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
+         name='event_embed'),
+    path('event/<int:pk>/oembed_json/', rigboard.EventOembed.as_view(),
+         name='event_oembed'),
+    path('event/<int:pk>/print/', permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
+         name='event_print'),
+    path('event/<int:pk>/edit/', permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
+         name='event_update'),
+    path('event/<int:pk>/duplicate/', permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
+         name='event_duplicate'),
+
+    # Event H&S
+    path('event/hs/', permission_required_with_403('RIGS.view_riskassessment')(hs.HSList.as_view()), name='hs_list'),
+
+    path('event/<int:pk>/ra/', permission_required_with_403('RIGS.add_riskassessment')(hs.EventRiskAssessmentCreate.as_view()),
+         name='event_ra'),
+    path('event/ra/<int:pk>/', permission_required_with_403('RIGS.view_riskassessment')(hs.EventRiskAssessmentDetail.as_view()),
+         name='ra_detail'),
+    path('event/ra/<int:pk>/edit/', permission_required_with_403('RIGS.change_riskassessment')(hs.EventRiskAssessmentEdit.as_view()),
+         name='ra_edit'),
+    path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(hs.EventRiskAssessmentList.as_view()),
+         name='ra_list'),
+    path('event/ra/<int:pk>/review/', permission_required_with_403('RIGS.review_riskassessment')(hs.EventRiskAssessmentReview.as_view()),
+         name='ra_review'),
+
+    path('event/<int:pk>/checklist/', permission_required_with_403('RIGS.add_eventchecklist')(hs.EventChecklistCreate.as_view()),
+         name='event_ec'),
+    path('event/checklist/<int:pk>/', permission_required_with_403('RIGS.view_eventchecklist')(hs.EventChecklistDetail.as_view()),
+         name='ec_detail'),
+    path('event/checklist/<int:pk>/edit/', permission_required_with_403('RIGS.change_eventchecklist')(hs.EventChecklistEdit.as_view()),
+         name='ec_edit'),
+    path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(hs.EventChecklistList.as_view()),
+         name='ec_list'),
+    path('event/checklist/<int:pk>/review/', permission_required_with_403('RIGS.review_eventchecklist')(hs.EventChecklistReview.as_view()),
+         name='ec_review'),
 
     # Finance
-    url(r'^invoice/$',
-        permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
-        name='invoice_list'),
-    url(r'^invoice/archive/$',
-        permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
-        name='invoice_archive'),
-    url(r'^invoice/waiting/$',
-        permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
-        name='invoice_waiting'),
+    path('invoice/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
+         name='invoice_list'),
+    path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
+         name='invoice_archive'),
+    path('invoice/waiting/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
+         name='invoice_waiting'),
 
-    url(r'^event/(?P<pk>\d+)/invoice/$',
-        permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
-        name='invoice_event'),
+    path('event/<int:pk>/invoice/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
+         name='invoice_event'),
+    path('event/<int:pk>/invoice/void', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
+         name='invoice_event_void', kwargs={'void': True}),
 
-    url(r'^invoice/(?P<pk>\d+)/$',
-        permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
-        name='invoice_detail'),
-    url(r'^invoice/(?P<pk>\d+)/print/$',
-        permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
-        name='invoice_print'),
-    url(r'^invoice/(?P<pk>\d+)/void/$',
-        permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
-        name='invoice_void'),
-    url(r'^invoice/(?P<pk>\d+)/delete/$',
-        permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
-        name='invoice_delete'),
-    url(r'^payment/create/$',
-        permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
-        name='payment_create'),
-    url(r'^payment/(?P<pk>\d+)/delete/$',
-        permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
-        name='payment_delete'),
+    path('invoice/<int:pk>/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
+         name='invoice_detail'),
+    path('invoice/<int:pk>/print/', permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
+         name='invoice_print'),
+    path('invoice/<int:pk>/void/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
+         name='invoice_void'),
+    path('invoice/<int:pk>/delete/',
+         permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
+         name='invoice_delete'),
+
+    path('payment/create/', permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
+         name='payment_create'),
+    path('payment/<int:pk>/delete/', permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
+         name='payment_delete'),
 
     # Client event authorisation
-    url(r'^event/(?P<pk>\d+)/auth/$',
-        permission_required_with_403('RIGS.change_event')(
-            rigboard.EventAuthorisationRequest.as_view()
-        ),
-        name='event_authorise_request'),
-    url(r'^event/(?P<pk>\d+)/auth/preview/$',
-        permission_required_with_403('RIGS.change_event')(
-            rigboard.EventAuthoriseRequestEmailPreview.as_view()
-        ),
-        name='event_authorise_preview'),
+    path('event/<pk>/auth/',
+         permission_required_with_403('RIGS.change_event')(rigboard.EventAuthorisationRequest.as_view()),
+         name='event_authorise_request'),
+    path('event/<int:pk>/auth/preview/',
+         permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()),
+         name='event_authorise_preview'),
     url(r'^event/(?P<pk>\d+)/(?P<hmac>[-:\w]+)/$', rigboard.EventAuthorise.as_view(),
         name='event_authorise'),
 
-    # User editing
-    url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
-    url(r'^user/(?P<pk>\d+)/$',
-        permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
-        name='profile_detail'),
-    url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()),
-        name='profile_update_self'),
-    url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)),
-        name='reset_api_key'),
-
     # ICS Calendar - API key authentication
     url(r'^ical/(?P<api_pk>\d+)/(?P<api_key>\w+)/rigs.ics$', api_key_required(ical.CalendarICS()),
         name="ics_calendar"),
 
-    # API
-    url(r'^api/(?P<model>\w+)/$', login_required(views.SecureAPIRequest.as_view()),
-        name="api_secure"),
-    url(r'^api/(?P<model>\w+)/(?P<pk>\d+)/$', login_required(views.SecureAPIRequest.as_view()),
-        name="api_secure"),
 
-    # Risk assessment API
-    url(r'^log_risk_assessment/$', rigboard.LogRiskAssessment.as_view(), name='log_risk_assessment'),
-
-    # Legacy URL's
-    url(r'^rig/show/(?P<pk>\d+)/$',
-        RedirectView.as_view(permanent=True, pattern_name='event_detail')),
-    url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
-    url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
+    # Legacy URLs
+    path('rig/show/<int:pk>/', RedirectView.as_view(permanent=True, pattern_name='event_detail')),
+    path('bookings/', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
+    path('bookings/past/', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
 ]