From da4d62729b56a40cabeceaea8b04dc48a7b47939 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Mon, 24 Jan 2022 13:49:11 +0000 Subject: [PATCH] Properly folderise rigboard views --- RIGS/urls.py | 80 ++++++++++++++++---------------- RIGS/views/__init__.py | 5 ++ RIGS/{views.py => views/crud.py} | 0 RIGS/{ => views}/finance.py | 0 RIGS/{ => views}/hs.py | 0 RIGS/{ => views}/ical.py | 0 RIGS/{ => views}/rigboard.py | 0 7 files changed, 45 insertions(+), 40 deletions(-) create mode 100644 RIGS/views/__init__.py rename RIGS/{views.py => views/crud.py} (100%) rename RIGS/{ => views}/finance.py (100%) rename RIGS/{ => views}/hs.py (100%) rename RIGS/{ => views}/ical.py (100%) rename RIGS/{ => views}/rigboard.py (100%) diff --git a/RIGS/urls.py b/RIGS/urls.py index 4e7cc6fc..fe724c88 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -5,7 +5,7 @@ from django.views.generic import RedirectView from PyRIGS.decorators import (api_key_required, has_oembed, permission_required_with_403) -from RIGS import finance, ical, rigboard, views, hs +from . import views urlpatterns = [ # People @@ -42,101 +42,101 @@ urlpatterns = [ name='venue_update'), # Rigboard - path('rigboard/', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'), - path('rigboard/calendar/', login_required()(rigboard.WebCalendar.as_view()), + path('rigboard/', login_required(views.RigboardIndex.as_view()), name='rigboard'), + path('rigboard/calendar/', login_required()(views.WebCalendar.as_view()), name='web_calendar'), re_path(r'^rigboard/calendar/(?P(month|week|day))/$', - login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'), + login_required()(views.WebCalendar.as_view()), name='web_calendar'), re_path(r'^rigboard/calendar/(?P(month|week|day))/(?P(\d{4}-\d{2}-\d{2}))/$', - login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'), + login_required()(views.WebCalendar.as_view()), name='web_calendar'), path('rigboard/archive/', RedirectView.as_view(permanent=True, pattern_name='event_archive')), - path('event//', has_oembed(oembed_view="event_oembed")(rigboard.EventDetail.as_view()), + path('event//', has_oembed(oembed_view="event_oembed")(views.EventDetail.as_view()), name='event_detail'), - path('event/create/', permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()), + path('event/create/', permission_required_with_403('RIGS.add_event')(views.EventCreate.as_view()), name='event_create'), - path('event/archive/', login_required()(rigboard.EventArchive.as_view()), + path('event/archive/', login_required()(views.EventArchive.as_view()), name='event_archive'), path('event//embed/', - xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())), + xframe_options_exempt(login_required(login_url='/user/login/embed/')(views.EventEmbed.as_view())), name='event_embed'), - path('event//oembed_json/', rigboard.EventOEmbed.as_view(), + path('event//oembed_json/', views.EventOEmbed.as_view(), name='event_oembed'), - path('event//print/', permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()), + path('event//print/', permission_required_with_403('RIGS.view_event')(views.EventPrint.as_view()), name='event_print'), - path('event//edit/', permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()), + path('event//edit/', permission_required_with_403('RIGS.change_event')(views.EventUpdate.as_view()), name='event_update'), - path('event//duplicate/', permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()), + path('event//duplicate/', permission_required_with_403('RIGS.add_event')(views.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/hs/', permission_required_with_403('RIGS.view_riskassessment')(views.HSList.as_view()), name='hs_list'), - path('event//ra/', permission_required_with_403('RIGS.add_riskassessment')(hs.EventRiskAssessmentCreate.as_view()), + path('event//ra/', permission_required_with_403('RIGS.add_riskassessment')(views.EventRiskAssessmentCreate.as_view()), name='event_ra'), - path('event/ra//', permission_required_with_403('RIGS.view_riskassessment')(hs.EventRiskAssessmentDetail.as_view()), + path('event/ra//', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentDetail.as_view()), name='ra_detail'), - path('event/ra//edit/', permission_required_with_403('RIGS.change_riskassessment')(hs.EventRiskAssessmentEdit.as_view()), + path('event/ra//edit/', permission_required_with_403('RIGS.change_riskassessment')(views.EventRiskAssessmentEdit.as_view()), name='ra_edit'), - path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(hs.EventRiskAssessmentList.as_view()), + path('event/ra/list', permission_required_with_403('RIGS.view_riskassessment')(views.EventRiskAssessmentList.as_view()), name='ra_list'), - path('event/ra//review/', permission_required_with_403('RIGS.review_riskassessment')(hs.EventRiskAssessmentReview.as_view()), + path('event/ra//review/', permission_required_with_403('RIGS.review_riskassessment')(views.EventRiskAssessmentReview.as_view()), name='ra_review'), - path('event//checklist/', permission_required_with_403('RIGS.add_eventchecklist')(hs.EventChecklistCreate.as_view()), + path('event//checklist/', permission_required_with_403('RIGS.add_eventchecklist')(views.EventChecklistCreate.as_view()), name='event_ec'), - path('event/checklist//', permission_required_with_403('RIGS.view_eventchecklist')(hs.EventChecklistDetail.as_view()), + path('event/checklist//', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistDetail.as_view()), name='ec_detail'), - path('event/checklist//edit/', permission_required_with_403('RIGS.change_eventchecklist')(hs.EventChecklistEdit.as_view()), + path('event/checklist//edit/', permission_required_with_403('RIGS.change_eventchecklist')(views.EventChecklistEdit.as_view()), name='ec_edit'), - path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(hs.EventChecklistList.as_view()), + path('event/checklist/list', permission_required_with_403('RIGS.view_eventchecklist')(views.EventChecklistList.as_view()), name='ec_list'), - path('event/checklist//review/', permission_required_with_403('RIGS.review_eventchecklist')(hs.EventChecklistReview.as_view()), + path('event/checklist//review/', permission_required_with_403('RIGS.review_eventchecklist')(views.EventChecklistReview.as_view()), name='ec_review'), # Finance - path('invoice/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()), + path('invoice/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceIndex.as_view()), name='invoice_list'), - path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()), + path('invoice/archive/', permission_required_with_403('RIGS.view_invoice')(views.InvoiceArchive.as_view()), name='invoice_archive'), - path('invoice/waiting/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()), + path('invoice/waiting/', permission_required_with_403('RIGS.add_invoice')(views.InvoiceWaiting.as_view()), name='invoice_waiting'), - path('event//invoice/', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()), + path('event//invoice/', permission_required_with_403('RIGS.add_invoice')(views.InvoiceEvent.as_view()), name='invoice_event'), - path('event//invoice/void', permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()), + path('event//invoice/void', permission_required_with_403('RIGS.add_invoice')(views.InvoiceEvent.as_view()), name='invoice_event_void', kwargs={'void': True}), - path('invoice//', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()), + path('invoice//', permission_required_with_403('RIGS.view_invoice')(views.InvoiceDetail.as_view()), name='invoice_detail'), - path('invoice//print/', permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()), + path('invoice//print/', permission_required_with_403('RIGS.view_invoice')(views.InvoicePrint.as_view()), name='invoice_print'), - path('invoice//void/', permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()), + path('invoice//void/', permission_required_with_403('RIGS.change_invoice')(views.InvoiceVoid.as_view()), name='invoice_void'), path('invoice//delete/', - permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()), + permission_required_with_403('RIGS.change_invoice')(views.InvoiceDelete.as_view()), name='invoice_delete'), - path('payment/create/', permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()), + path('payment/create/', permission_required_with_403('RIGS.add_payment')(views.PaymentCreate.as_view()), name='payment_create'), - path('payment//delete/', permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()), + path('payment//delete/', permission_required_with_403('RIGS.add_payment')(views.PaymentDelete.as_view()), name='payment_delete'), # Client event authorisation path('event//auth/', - permission_required_with_403('RIGS.change_event')(rigboard.EventAuthorisationRequest.as_view()), + permission_required_with_403('RIGS.change_event')(views.EventAuthorisationRequest.as_view()), name='event_authorise_request'), path('event//auth/preview/', - permission_required_with_403('RIGS.change_event')(rigboard.EventAuthoriseRequestEmailPreview.as_view()), + permission_required_with_403('RIGS.change_event')(views.EventAuthoriseRequestEmailPreview.as_view()), name='event_authorise_preview'), - re_path(r'^event/(?P\d+)/(?P[-:\w]+)/$', rigboard.EventAuthorise.as_view(), + re_path(r'^event/(?P\d+)/(?P[-:\w]+)/$', views.EventAuthorise.as_view(), name='event_authorise'), - re_path(r'^event/(?P\d+)/(?P[-:\w]+)/preview/$', rigboard.EventAuthorise.as_view(preview=True), + re_path(r'^event/(?P\d+)/(?P[-:\w]+)/preview/$', views.EventAuthorise.as_view(preview=True), name='event_authorise_form_preview'), # ICS Calendar - API key authentication - re_path(r'^ical/(?P\d+)/(?P\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), + re_path(r'^ical/(?P\d+)/(?P\w+)/rigs.ics$', api_key_required(views.CalendarICS()), name="ics_calendar"), diff --git a/RIGS/views/__init__.py b/RIGS/views/__init__.py new file mode 100644 index 00000000..e00d6afa --- /dev/null +++ b/RIGS/views/__init__.py @@ -0,0 +1,5 @@ +from .crud import * +from .finance import * +from .hs import * +from .ical import * +from .rigboard import * diff --git a/RIGS/views.py b/RIGS/views/crud.py similarity index 100% rename from RIGS/views.py rename to RIGS/views/crud.py diff --git a/RIGS/finance.py b/RIGS/views/finance.py similarity index 100% rename from RIGS/finance.py rename to RIGS/views/finance.py diff --git a/RIGS/hs.py b/RIGS/views/hs.py similarity index 100% rename from RIGS/hs.py rename to RIGS/views/hs.py diff --git a/RIGS/ical.py b/RIGS/views/ical.py similarity index 100% rename from RIGS/ical.py rename to RIGS/views/ical.py diff --git a/RIGS/rigboard.py b/RIGS/views/rigboard.py similarity index 100% rename from RIGS/rigboard.py rename to RIGS/views/rigboard.py