merge expeditions and statistics pages

This commit is contained in:
Philip Sargent
2021-03-27 20:05:15 +00:00
parent ffaaea497c
commit c7475cda83
6 changed files with 14 additions and 24 deletions

View File

@@ -66,7 +66,6 @@ actualurlpatterns = [
# url(r'^personform/(.*)$', personForm),
url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"),
url(r'^expeditions/?$', views_logbooks.ExpeditionListView.as_view(), name="expeditions"),
url(r'^api/expeditions_tsv$', views_logbooks.Expeditions_tsvListView.as_view()),
url(r'^api/expeditions_json$', views_logbooks.Expeditions_jsonListView.as_view()),
url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-zA-Z&;]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),