move *_views files to /views/*

core/TESTS/tests.py

@@ -40,7 +40,7 @@ class SimpleTest(SimpleTestCase):
         import troggle.core.models_caves as models_caves
         import troggle.core.models_survex as models_survex
         from troggle.parsers.people import GetPersonExpeditionNameLookup
-        from troggle.core.views_caves import MapLocations
+        from troggle.core.views.caves import MapLocations
     def test_import_parsers_QMs(self):
         from troggle.core.models_caves import QM, Cave, LogbookEntry
         from utils import save_carefully
@@ -56,7 +56,7 @@ class SimpleTest(SimpleTestCase):
     def test_import_core_views_caves(self):
         from django.http import HttpResponse, HttpResponseRedirect
         from django.shortcuts import get_object_or_404, render
-        import troggle.core.views_expo 
+        import troggle.core.views.expo 
         from troggle.core.models import Expedition
         from troggle.core.models_caves import CaveSlug, Cave, CaveAndEntrance, QM, EntranceSlug, Entrance, Area, SurvexStation
         from troggle.core.forms import CaveForm, CaveAndEntranceFormSet, VersionControlCommentForm, EntranceForm, EntranceLetterForm

core/admin.py

@@ -4,7 +4,7 @@ from django.forms import ModelForm
 from django.http import HttpResponse
 from django.core import serializers
 
-from troggle.core.views_other import downloadLogbook
+from troggle.core.views.other import downloadLogbook
 from troggle.core.models import Person, PersonExpedition, Expedition, DataIssue
 from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, LogbookEntry, PersonTrip, QM
 from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan

core/forms.py

@@ -156,7 +156,7 @@ def get_name(pe):
                 return pe.person.first_name
 
 class UploadFileForm(forms.Form):
-    """Only called by views_others.newFile() whhich seems to be only about logbook files.
+    """Only called by views.others.newFile() whhich seems to be only about logbook files.
     """
     # Because this has EXECUTABLE statements in its signature (the fields) they get
     # executed when this module is LOADED. Which barfs horribly.

core/views.py

@@ -1,8 +0,0 @@
-# primary namespace
-
-from . import view_surveys
-from . import views_caves
-from . import views_survex
-from . import views_logbooks
-from . import views_other
-from . import views_statistics

core/views/expo.py

@@ -15,7 +15,7 @@ import django.forms as forms
 
 from troggle.helper import login_required_if_public
 from troggle.core.models_caves import Cave
-import troggle.core.views_caves
+import troggle.core.views.caves
 import troggle.settings as settings
 
 '''Formerly a separate package  'flatpages' written by Martin Green 2011. 
@@ -69,7 +69,7 @@ def expowebpage(request, expowebpath, path):
     if m:
         preheader, headerattrs, head, postheader, bodyattrs, body, postbody = m.groups()
     else:
-        return HttpResponse(html + "HTML Parsing failure: Page could not be split into header and body: failed in expowebpage in views_expo.py")
+        return HttpResponse(html + "HTML Parsing failure: Page could not be split into header and body: failed in expowebpage in views.expo.py")
     m = re.search(rb"<title>(.*)</title>", head, re.DOTALL + re.IGNORECASE)
     if m:
         title, = m.groups()
@@ -181,7 +181,7 @@ def getmimetype(path):
 def editexpopage(request, path):
     try:
         r = Cave.objects.get(url = path)
-        return troggle.core.views_caves.editCave(request, r.cave.slug)
+        return troggle.core.views.caves.editCave(request, r.cave.slug)
     except Cave.DoesNotExist:
         pass
 

core/views/other.py

@@ -14,7 +14,7 @@ from troggle.core.models_caves import LogbookEntry, QM, Cave, PersonTrip
 from troggle.helper import login_required_if_public
 from troggle.core.forms import UploadFileForm
 
-print("** importing troggle/core/views_other.py")
+print("** importing troggle/core/views.other.py")
 
 """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).
@@ -140,7 +140,7 @@ def ajax_QM_number(request):
     return HttpResponse(res)
 
 
-print(" -  newFile() is next in troggle/core/views_other.py")
+print(" -  newFile() is next in troggle/core/views.other.py")
 
 @login_required_if_public
 def newFile(request, pslug = None):
@@ -194,4 +194,4 @@ def delFile(f):
     lbe.delete()
     os.remove(lbe.filename)
 
-print("** Finished importing troggle/core/views_other.py")
+print("** Finished importing troggle/core/views.other.py")

core/views/surveys.py

@@ -9,7 +9,7 @@ from django.shortcuts import render
 from django.http import HttpResponse, Http404
 
 from troggle.core.models_survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile
-from .views_expo import getmimetype
+from troggle.core.views.expo import getmimetype
 import parsers.surveys
 
 '''Some of these views serve files as binary blobs, and simply set the mime type based on the file extension,