move models_survex to models/survex.py

core/TESTS/test_imports.py

@@ -38,7 +38,7 @@ class SimpleTest(SimpleTestCase):
         import troggle.settings as settings
         import troggle.core.models.troggle as models
         import troggle.core.models.caves as models_caves
-        import troggle.core.models_survex as models_survex
+        import troggle.core.models.survex as models_survex
         from troggle.parsers.people import GetPersonExpeditionNameLookup
         from troggle.core.views.caves import MapLocations
     def test_import_parsers_QMs(self):

core/admin.py

@@ -7,7 +7,7 @@ from django.core import serializers
 from troggle.core.views.other import downloadLogbook
 from troggle.core.models.troggle 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
+from troggle.core.models.survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan
 
 '''This code significantly adds to the capabilities of the Django Management control panel for Troggle data.
 In particular, it enables JSON export of any data with 'export_as_json'

core/models/caves.py

@@ -21,7 +21,7 @@ from django.urls import reverse
 from django.template import Context, loader
 
 from troggle.core.models.troggle import TroggleModel, Person, Expedition, DataIssue
-from troggle.core.models_survex import SurvexStation
+from troggle.core.models.survex import SurvexStation
 
 class Area(TroggleModel):
     short_name = models.CharField(max_length=100)

core/models/troggle.py

@@ -21,7 +21,7 @@ from django.conf import settings
 from django.urls import reverse
 from django.template import Context, loader
 
-import troggle.core.models_survex 
+import troggle.core.models.survex 
 from troggle.core.utils import get_process_memory
 
 """This file declares TroggleModel which inherits from django.db.models.Model 

core/views/logbooks.py

@@ -17,7 +17,7 @@ from troggle.core.forms import getTripForm  # , get_name, PersonForm
 from troggle.core.models.troggle import Expedition, Person, PersonExpedition
 from troggle.core.utils import TROG
 from troggle.core.models.caves import LogbookEntry, PersonTrip
-from troggle.core.models_survex import SurvexBlock
+from troggle.core.models.survex import SurvexBlock
 from .login import login_required_if_public
 from troggle.parsers.logbooks import LoadLogbookForExpedition
 from troggle.parsers.people import GetPersonExpeditionNameLookup

core/views/statistics.py

@@ -13,7 +13,7 @@ from django.utils import timezone
 
 from troggle.core.models.troggle import Expedition, Person, PersonExpedition, DataIssue
 from troggle.core.models.caves import Cave, LogbookEntry
-from troggle.core.models_survex import SurvexBlock
+from troggle.core.models.survex import SurvexBlock
 
 import troggle.settings as settings
 

core/views/survex.py

@@ -15,7 +15,7 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 import troggle.settings as settings
 import parsers.survex
 from troggle.core.models.troggle import Expedition, Person, PersonExpedition 
-from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory
+from troggle.core.models.survex import SurvexBlock, SurvexPersonRole, SurvexFile, SurvexDirectory
 from troggle.core.models.caves import Cave, PersonTrip, LogbookEntry
 from troggle.parsers.people import GetPersonExpeditionNameLookup
 

core/views/surveys.py

@@ -8,7 +8,7 @@ from django.conf import settings
 from django.shortcuts import render
 from django.http import HttpResponse, Http404
 
-from troggle.core.models_survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile
+from troggle.core.models.survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile
 from troggle.core.views.expo import getmimetype
 import parsers.surveys
 

databaseReset.py

@@ -34,7 +34,7 @@ except:
 print(" - Memory footprint after loading Django: {:.3f} MB".format(resource.getrusage(resource.RUSAGE_SELF)[2]/1024.0))
 
 from troggle.core.models import DataIssue
-import troggle.core.models_survex
+import troggle.core.models.survex
 
 from django.core import management
 from django.db import connection, close_old_connections, connections

parsers/survex.py

@@ -14,7 +14,7 @@ from django.utils.timezone import make_aware
 import troggle.settings as settings
 import troggle.core.models as models
 import troggle.core.models.caves as models_caves
-import troggle.core.models_survex as models_survex
+import troggle.core.models.survex as models_survex
 from troggle.core.utils import get_process_memory, chaosmonkey
 from troggle.parsers.people import GetPersonExpeditionNameLookup
 from troggle.parsers.logbooks import GetCaveLookup

parsers/surveys.py

@@ -11,7 +11,7 @@ from PIL import Image
 from functools import reduce
 
 import settings
-from troggle.core.models_survex import SingleScan, ScansFolder, TunnelFile
+from troggle.core.models.survex import SingleScan, ScansFolder, TunnelFile
 from troggle.core.models.troggle import DataIssue
 from troggle.core.utils import save_carefully