diff options
| -rw-r--r-- | core/TESTS/test_imports.py | 2 | ||||
| -rw-r--r-- | core/admin.py | 2 | ||||
| -rw-r--r-- | core/models/caves.py | 2 | ||||
| -rw-r--r-- | core/models/survex.py (renamed from core/models_survex.py) | 0 | ||||
| -rw-r--r-- | core/models/troggle.py | 2 | ||||
| -rw-r--r-- | core/views/logbooks.py | 2 | ||||
| -rw-r--r-- | core/views/statistics.py | 2 | ||||
| -rw-r--r-- | core/views/survex.py | 2 | ||||
| -rw-r--r-- | core/views/surveys.py | 2 | ||||
| -rw-r--r-- | databaseReset.py | 2 | ||||
| -rw-r--r-- | parsers/survex.py | 2 | ||||
| -rw-r--r-- | parsers/surveys.py | 2 |
12 files changed, 11 insertions, 11 deletions
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py index 8c5abe3..489c70f 100644 --- a/core/TESTS/test_imports.py +++ b/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): diff --git a/core/admin.py b/core/admin.py index 4adb153..0e69527 100644 --- a/core/admin.py +++ b/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' diff --git a/core/models/caves.py b/core/models/caves.py index b0ecb53..be44e8f 100644 --- a/core/models/caves.py +++ b/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) diff --git a/core/models_survex.py b/core/models/survex.py index 989b9a6..989b9a6 100644 --- a/core/models_survex.py +++ b/core/models/survex.py diff --git a/core/models/troggle.py b/core/models/troggle.py index 760c94f..cf32893 100644 --- a/core/models/troggle.py +++ b/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 diff --git a/core/views/logbooks.py b/core/views/logbooks.py index 2729135..9508877 100644 --- a/core/views/logbooks.py +++ b/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 diff --git a/core/views/statistics.py b/core/views/statistics.py index bc6bced..fc62754 100644 --- a/core/views/statistics.py +++ b/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 diff --git a/core/views/survex.py b/core/views/survex.py index 46ddb88..2bcf79f 100644 --- a/core/views/survex.py +++ b/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 diff --git a/core/views/surveys.py b/core/views/surveys.py index 7cf0d83..22be7ec 100644 --- a/core/views/surveys.py +++ b/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 diff --git a/databaseReset.py b/databaseReset.py index a21bd30..af65e15 100644 --- a/databaseReset.py +++ b/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 diff --git a/parsers/survex.py b/parsers/survex.py index 0a5bf33..95953b6 100644 --- a/parsers/survex.py +++ b/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 diff --git a/parsers/surveys.py b/parsers/surveys.py index c75bf7c..66a3299 100644 --- a/parsers/surveys.py +++ b/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 |