diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 4abb205..dcdb6f4 100644 --- a/core/views/logbooks.py +++ b/core/views/logbooks.py @@ -136,7 +136,7 @@ def person(request, first_name='', last_name='', ): def GetPersonChronology(personexpedition): - '''Horrible bug here whern ther eis more than one survex block per day, it duplicates the entry but gets it wrong + '''Horrible bug here whern there is more than one survex block per day, it duplicates the entry but gets it wrong Fortunately this is just the display on this page which is wroing, no bad calculations get into the database. ''' res = { } diff --git a/templates/base.html b/templates/base.html index 2afab1f..2e7e536 100644 --- a/templates/base.html +++ b/templates/base.html @@ -29,15 +29,14 @@
+ Survex-204 | + Survex | All Survex | Scans | Drawing files | 290 (FGH) | 291 (GSH) | - 359 (Homecoming) | - Surveys-204 | - Expo2018 | - Expo2019 | + 204 (Steinbrucken) |
handbook | @@ -45,7 +44,9 @@ caves | expoers | survey lengths | - expo statistics | + statistics | + Expo2018 | + Expo2019 | import/export | Django admin
diff --git a/urls.py b/urls.py index 7184823..abff59e 100644 --- a/urls.py +++ b/urls.py @@ -65,15 +65,13 @@ trogglepatterns = [ url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/). url(r'^admin/', admin.site.urls), # includes admin login & logout urls - # setting LOGIN_URL = '/accounts/login/' is default - # url ENDS WITH this string +# setting LOGIN_URL = '/accounts/login/' is default +# url ENDS WITH this string url(r'logout/$', expologout, name='expologout'), # higher precedence than /accounts/logout url(r'login/$', expologin, name='expologin'), # higher precedence than /accounts/login #url(r'^accounts/', include('django.contrib.auth.urls')), # from Dj3.0, see site-packages\registration\auth_urls_classes.py - url(r'^newqmnumber/?$', other.ajax_QM_number, ), -# url(r'^lbo_suggestions/?$', logbook_entry_suggestions), #broken, removed. # url(r'^person/(?P\d*)/?$', logbooks.person), url(r'^person/(?P[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P[a-z\-\']*[^a-zA-Z]*[A-Z]*[a-z\-&;]*)/?', logbooks.person, name="person"), # url(r'^person/(\w+_\w+)$', logbooks.person, name="person"), @@ -83,18 +81,25 @@ trogglepatterns = [ url(r'^api/expeditions_tsv$', logbooks.Expeditions_tsvListView.as_view()), url(r'^api/expeditions_json$', logbooks.Expeditions_jsonListView.as_view()), url(r'^personexpedition/(?P[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P[A-Z]*[a-zA-Z&;]*)/(?P\d+)/?$', logbooks.personexpedition, name="personexpedition"), - url(r'^logbookentry/(?P.*)/(?P.*)/?$', logbooks.logbookentry,name="logbookentry"), -# url(r'^newlogbookentry/(?P.*)$', logbooks.newLogbookEntry, name="newLogBookEntry"), # Needed ! -# url(r'^editlogbookentry/(?P[^/]*)/(?P[^/]*)/(?P[^/]*)/$', logbooks.newLogbookEntry, name="editLogBookEntry"), # working ! -# url(r'^deletelogbookentry/(?P[^/]*)/(?P[^/]*)/(?P[^/]*)/$', logbooks.deleteLogbookEntry, name="deleteLogBookEntry"), - url(r'^newfile', other.newFile, name="newFile"), # oddly broken, needs investigating more - url(r'^getEntrances/(?P.*)', caves.get_entrances, name = "get_entrances"), #works - # e.g. /getEntrances/1623-161 +# Logbook entries + url(r'^logbookentry/(?P.*)/(?P.*)/?$', logbooks.logbookentry,name="logbookentry"), + url(r'^getLogBookEntries/(?P.*)', logbooks.get_logbook_entries, name = "get_logbook_entries"), #works + url(r'^newfile', other.newFile, name="newFile"), # oddly broken, needs investigating more + url(r'^logbooksearch/(.*)/?$', logbooks.logbookSearch), + url(r'^logbook(?P\d\d\d\d)\.(?P.*)/?$', other.downloadLogbook), + url(r'^logbook/?$', other.downloadLogbook, name="downloadlogbook"), + + +# QMs pages + url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page + url(r'^cave/(?P[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"), + url(r'^newqmnumber/?$', other.ajax_QM_number, ), url(r'^getQMs/(?P.*)', caves.get_qms, name = "get_qms"), # no template "get_qms"? url(r'^getPeople/(?P.*)', logbooks.get_people, name = "get_people"), # fails - url(r'^getLogBookEntries/(?P.*)', logbooks.get_logbook_entries, name = "get_logbook_entries"), #works + url(r'^downloadqms$', other.downloadQMs), +# Cave description pages url(r'^cave/new/$', caves.edit_cave, name="newcave"), url(r'^cave/3d/(?P[^/]+)$', caves.cave3d, name="cave3d"), url(r'^cave/(?P[^/]+)/?$', caves.cave, name="cave"), @@ -104,30 +109,25 @@ trogglepatterns = [ url(r'^cave/entrance/([^/]+)/?$', caves.caveEntrance), url(r'^cave/description/([^/]+)/?$', caves.caveDescription), - url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page url(r'^cave/logbook/([^/]+)/?$', caves.caveLogbook), + url(r'^(?P\d\d\d\d)(?P.*)$', cavepage, name="cavepage"), # shorthand references such as /1623/264 + url(r'^getEntrances/(?P.*)', caves.get_entrances, name = "get_entrances"), #works e.g. /getEntrances/1623-161 url(r'^entrance/(?P[^/]+)/(?P[^/]+)/edit/', caves.editEntrance, name = "editentrance"), url(r'^entrance/new/(?P[^/]+)/', caves.editEntrance, name = "newentrance"), - url(r'^logbooksearch/(.*)/?$', logbooks.logbookSearch), url(r'^statistics/?$', statistics.stats, name="stats"), url(r'^stats/?$', statistics.stats, name="stats"), url(r'^pathsreport.*$', statistics.pathsreport, name="pathsreport"), url(r'^controlpanel/?$', other.controlPanel, name="controlpanel"), - url(r'^logbook(?P\d\d\d\d)\.(?P.*)/?$', other.downloadLogbook), - url(r'^logbook/?$', other.downloadLogbook, name="downloadlogbook"), - url(r'^cave/(?P[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"), - url(r'^downloadqms$', other.downloadQMs), -# url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map url(r'^prospecting_guide/$', caves.prospecting), url(r'^prospecting/(?P[^.]+).png$', prospecting_image, name="prospecting_image"), - # The survexfile pages +# The survexfile pages url(r'^survexfile/(?P.*?)\.svx$', survex.svx, name="svx"), url(r'^survexfile/(?P.*?)\.3d$', survex.threed, name="threed"), url(r'^survexfile/(?P.*?)\.log$', survex.svxraw), @@ -142,7 +142,7 @@ trogglepatterns = [ url(r'^survey_scans/(?P[^/]+)/(?P[^/]+)$', surveys.surveyscansingle, name="surveyscansingle"), - # The tunnel and therion drawings files pages +# The tunnel and therion drawings files pages url(r'^tunneldata/$', surveys.tunneldata, name="tunneldata"), url(r'^tunneldataraw/(?P.+?\.xml)$', surveys.dwgfilesingle, name="dwgfilesingle"), url(r'^tunneldataraw/(?P.+?\.th)$', surveys.dwgfilesingle, name="dwgfilesingle"), @@ -150,17 +150,16 @@ trogglepatterns = [ # url(r'^tunneldatainfo/(?P.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), # parses tunnel for info url(r'^tunneldataraw/(?P.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"), - # This next set are all intercepted by Apache, if it is running. +# This next set are all intercepted by Apache, if it is running. url(r'^photos/(?P.*)$', mediapage, {'doc_root': settings.PHOTOS_ROOT}, name="mediapage"), # photo galleries url(r'^site_media/(?P.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # MEDIA_ROOT: CSS and JS url(r'^static/(?P.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # STATIC is in MEDIA now! url(r'^javascript/(?P.*)$', mediapage, {'doc_root': settings.JSLIB_ROOT}, name="mediapage"), # JSLIB_URL url(r'^expowebcache/3d/(?P.*)$', mediapage, {'doc_root': settings.THREEDCACHEDIR}, name="mediapage"), - # This next is for shorthand references such as /1623/264 - url(r'^(?P\d\d\d\d)(?P.*)$', cavepage, name="cavepage"), # Cave description +# url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map - # Final catchall which also serves expoweb handbook pages and images +# Final catchall which also serves expoweb handbook pages and images url(r'^(.*)_edit$', editexpopage, name="editexpopage"), url(r'^(.*)$', expopage, name="expopage"), # CATCHALL assumed relative to EXPOWEB ]