xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Add new per-module ToDo texts

Browse Source
This commit is contained in:
Philip Sargent
2021-04-21 19:08:42 +01:00
parent 18938c9fca
commit bcdb3572fa
7 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/views/other.py
View File

@@ -14,12 +14,29 @@ from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip
from .login import login_required_if_public
from troggle.core.forms import UploadFileForm
"""Utility functions and code to serve the control panel and individual user's
'''Utility functions and code to serve the control panel and individual user's
progress and task list (deprecated as we do not have individual user login).
Also has code to download a logbook in a choice of formats (why?!) and to
download all QMs (not working)
"""
'''
todo = '''Delete the newfile & TripForm code once we have a proper file-upload system working.
meanwhile keep it as an example to consider.
'''
def todos(request, module):
'''produces todo text from module
'''
from troggle.core.TESTS.tests import todo as tests
from troggle.core.views.logbooks import todo as viewlogbooks
from troggle.core.forms import todo as forms
print(f'TODO - {tests}')
tododict = {'views/other': todo,
'tests': tests,
'views/logbooks': viewlogbooks,
'core/forms': forms}
return render(request,'core/todos.html', {'tododict': tododict})
def troggle404(request): # cannot get this to work. Handler404 in urls.py not right syntax
'''Custom 404 page to be used even when Debug=True
@@ -44,7 +61,7 @@ def frontpage(request):
return render(request,'frontpage.html', locals())
def controlPanel(request):
def controlpanel(request):
jobs_completed=[]
if request.method=='POST':
if request.user.is_superuser: # expoadmin is both .is_staff and ._is_superuser
@@ -67,7 +84,7 @@ def controlPanel(request):
return render(request,'controlPanel.html', {'caves':Cave.objects.all(),'expeditions':Expedition.objects.all(),'jobs_completed':jobs_completed})
def downloadLogbook(request,year=None,extension=None,queryset=None):
def downloadlogbook(request,year=None,extension=None,queryset=None):
if year:
current_expedition=Expedition.objects.get(year=year)
@@ -135,7 +152,7 @@ def ajax_QM_number(request):
return HttpResponse(res)
@login_required_if_public
def newFile(request, pslug = None):
def newfile(request, pslug = None):
''' not known quite what this was for or where it fits in - original 2006 troggle idea never finished?
'''
if pslug: