5 files changed, 6 insertions, 58 deletions
diff --git a/core/models/caves.py b/core/models/caves.py
index 6123210..a18a996 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -1,29 +1,16 @@
-import datetime
-import json
-import operator
 import os
 import re
-import string
-import subprocess
 from collections import defaultdict
 from datetime import datetime, timezone
 from pathlib import Path
-from urllib.parse import urljoin
 
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.contrib.contenttypes.models import ContentType
-from django.core.files.storage import FileSystemStorage
 from django.db import models
-from django.db.models import Max, Min
-from django.shortcuts import render
-from django.template import Context, loader
-from django.urls import reverse
+from django.template import loader
 
 import settings
 from troggle.core.models.logbooks import QM
 from troggle.core.models.survex import SurvexStation
-from troggle.core.models.troggle import DataIssue, Expedition, Person, TroggleModel
+from troggle.core.models.troggle import DataIssue, TroggleModel
 from troggle.core.utils import TROG, writetrogglefile
 
 # Use the TROG global object to cache the cave lookup list. No good for multi-user..
@@ -149,11 +136,11 @@ class Cave(TroggleModel):
 
     def get_absolute_url(self):
         if self.kataster_number:
-            href = self.kataster_number
+            pass
         elif self.unofficial_number:
-            href = self.unofficial_number
+            pass
         else:
-            href = self.official_name.lower()
+            self.official_name.lower()
         # return settings.URL_ROOT + '/cave/' + href + '/'
         # return urljoin(settings.URL_ROOT, reverse('cave',kwargs={'cave_id':href,})) # WRONG. This produces /cave/161 and should be /1623/161
         return Path(settings.URL_ROOT) / self.url  # not good Django style.. NEEDS actual URL
@@ -392,7 +379,6 @@ class Entrance(TroggleModel):
 
     def cavelist(self):
         rs = []
-        res = ""
         for e in CaveAndEntrance.objects.filter(entrance=self):
             if e.cave:
                 rs.append(e.cave)
diff --git a/core/models/logbooks.py b/core/models/logbooks.py
index ecb7946..eac552a 100644
--- a/core/models/logbooks.py
+++ b/core/models/logbooks.py
@@ -1,28 +1,11 @@
-import datetime
-import json
-import operator
-import os
-import re
-import string
-import subprocess
-from collections import defaultdict
-from datetime import datetime, timezone
 from pathlib import Path
 from urllib.parse import urljoin
 
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.contrib.contenttypes.models import ContentType
-from django.core.files.storage import FileSystemStorage
 from django.db import models
-from django.db.models import Max, Min
-from django.shortcuts import render
-from django.template import Context, loader
 from django.urls import reverse
 
 import settings
-from troggle.core.models.survex import SurvexStation
-from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition, TroggleModel
+from troggle.core.models.troggle import Expedition, TroggleModel
 
 """The model declarations  LogBookEntry, PersonLogEntry, QM
 """
diff --git a/core/models/survex.py b/core/models/survex.py
index 11ede65..338a235 100644
--- a/core/models/survex.py
+++ b/core/models/survex.py
@@ -1,17 +1,11 @@
-import datetime
-import json
-import operator
 import os
 import re
-from functools import reduce
-from pathlib import Path
 from urllib.parse import urljoin
 
 from django.conf import settings
 from django.db import models
 from django.urls import reverse
 
-from troggle.core.models.wallets import Wallet
 
 # from troggle.core.models.troggle import DataIssue # circular import. Hmm
 
diff --git a/core/models/troggle.py b/core/models/troggle.py
index 8fe01f7..ee66b64 100644
--- a/core/models/troggle.py
+++ b/core/models/troggle.py
@@ -1,26 +1,12 @@
-import datetime
-import os
-import re
-import resource
-import string
 from decimal import Decimal, getcontext
-from subprocess import call
 from urllib.parse import urljoin
 
 getcontext().prec = 2  # use 2 significant figures for decimal calculations
 
-from django.conf import settings
-from django.contrib import admin
-from django.contrib.auth.models import User
-from django.contrib.contenttypes.models import ContentType
-from django.core.files.storage import FileSystemStorage
 from django.db import models
-from django.template import Context, loader
 from django.urls import reverse
 
 import settings
-import troggle.core.models.survex
-from troggle.core.utils import get_process_memory
 
 """This file declares TroggleModel which inherits from django.db.models.Model 
 All TroggleModel and models.Model subclasses inherit persistence in the django relational database. This is known as
diff --git a/core/models/wallets.py b/core/models/wallets.py
index 7b691d5..eb93d10 100644
--- a/core/models/wallets.py
+++ b/core/models/wallets.py
@@ -1,7 +1,6 @@
 import datetime
 import json
 import operator
-import os
 import re
 from functools import reduce
 from pathlib import Path