Séparation des vues events

src/agenda_culturel/urls.py

@@ -31,6 +31,17 @@ from .views import (
     # Errors
     internal_server_error,
     page_not_found,
+    # Events
+    recent,
+    EventDetailView,
+    EventUpdateView,
+    EventCreateView,
+    update_from_source,
+    change_status_event,
+    EventDeleteView,
+    import_event_proxy,
+    import_from_url,
+    import_from_urls,
     # Event duplicates
     DuplicatedEventsDetailView,
     duplicates,
@@ -110,17 +121,6 @@ from .views import (
     rename_tag,
     delete_tag,
     TagCreateView,
-    # TODO pas encore trié
-    recent,
-    EventDetailView,
-    EventUpdateView,
-    EventCreateView,
-    update_from_source,
-    change_status_event,
-    EventDeleteView,
-    import_event_proxy,
-    import_from_url,
-    import_from_urls,
 )
 
 event_dict = {
@@ -192,6 +192,7 @@ urlpatterns = [
     path("semaine/<int:year>/<int:week>/", week_view, name="week_view"),
     path("cette-semaine/", week_view, name="cette_semaine"),
     # Categorisation rules
+    path("cat:<cat>/", home, name="home_category"),
     path(
         "catrules/add",
         CategorisationRuleCreateView.as_view(),
@@ -223,6 +224,43 @@ urlpatterns = [
         update_duplicate_event,
         name="update_event",
     ),
+    # Events
+    path("recent/", recent, name="recent"),
+    path(
+        "event/<int:year>/<int:month>/<int:day>/<int:pk>-<extra>",
+        EventDetailView.as_view(),
+        name="view_event",
+    ),
+    path("event/<int:pk>/", EventDetailView.as_view(), name="edit_event_pk"),
+    path("event/<int:pk>/edit", EventUpdateView.as_view(), name="edit_event"),
+    path(
+        "event/<int:pk>/edit-force", EventUpdateView.as_view(), name="edit_event_force"
+    ),
+    path(
+        "event/<int:pk>/simple-clone/edit",
+        EventUpdateView.as_view(),
+        name="simple_clone_edit",
+    ),
+    path(
+        "event/<int:pk>/clone/edit",
+        EventUpdateView.as_view(),
+        name="clone_edit",
+    ),
+    path(
+        "event/<int:pk>/update-from-source",
+        update_from_source,
+        name="update_from_source",
+    ),
+    path(
+        "event/<int:pk>/change-status/<status>",
+        change_status_event,
+        name="change_status_event",
+    ),
+    path("event/<int:pk>/delete", EventDeleteView.as_view(), name="delete_event"),
+    path("ajouter", import_event_proxy, name="add_event"),
+    path("ajouter/url", import_from_url, name="add_event_url"),
+    path("ajouter/urls", import_from_urls, name="add_event_urls"),
+    path("ajouter/details", EventCreateView.as_view(), name="add_event_details"),
     # Event duplicates
     path(
         "duplicates/<int:pk>",
@@ -459,44 +497,7 @@ urlpatterns = [
     path("tag/<t>/rename", rename_tag, name="rename_tag"),
     path("tag/<t>/delete", delete_tag, name="delete_tag"),
     path("tags/add", TagCreateView.as_view(), name="add_tag"),
-    # TODO pas encore trié
-    path("cat:<cat>/", home, name="home_category"),
-    path("recent/", recent, name="recent"),
-    path(
-        "event/<int:year>/<int:month>/<int:day>/<int:pk>-<extra>",
-        EventDetailView.as_view(),
-        name="view_event",
-    ),
-    path("event/<int:pk>/", EventDetailView.as_view(), name="edit_event_pk"),
-    path("event/<int:pk>/edit", EventUpdateView.as_view(), name="edit_event"),
-    path(
-        "event/<int:pk>/edit-force", EventUpdateView.as_view(), name="edit_event_force"
-    ),
-    path(
-        "event/<int:pk>/simple-clone/edit",
-        EventUpdateView.as_view(),
-        name="simple_clone_edit",
-    ),
-    path(
-        "event/<int:pk>/clone/edit",
-        EventUpdateView.as_view(),
-        name="clone_edit",
-    ),
-    path(
-        "event/<int:pk>/update-from-source",
-        update_from_source,
-        name="update_from_source",
-    ),
-    path(
-        "event/<int:pk>/change-status/<status>",
-        change_status_event,
-        name="change_status_event",
-    ),
-    path("event/<int:pk>/delete", EventDeleteView.as_view(), name="delete_event"),
-    path("ajouter", import_event_proxy, name="add_event"),
-    path("ajouter/url", import_from_url, name="add_event_url"),
-    path("ajouter/urls", import_from_urls, name="add_event_urls"),
-    path("ajouter/details", EventCreateView.as_view(), name="add_event_details"),
+    # Django
     path("admin/", admin.site.urls),
     path("accounts/", include("django.contrib.auth.urls")),
     path("test_app/", include("test_app.urls")),

src/agenda_culturel/views/__init__.py

@@ -1,7 +1,6 @@
-from .oldviews import *
-
 from .calendar_views import *
 from .categorisation_rules_view import *
+from .event_views import *
 from .event_duplicate_views import *
 from .errors import *
 from .export_views import *