diff options
Diffstat (limited to 'core/models')
-rw-r--r-- | core/models/caves.py | 5 | ||||
-rw-r--r-- | core/models/logbooks.py | 4 | ||||
-rw-r--r-- | core/models/survex.py | 5 | ||||
-rw-r--r-- | core/models/wallets.py | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index 9d508fc..12941d0 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -1,18 +1,17 @@ import os -import os import re from collections import defaultdict from datetime import datetime, timezone from pathlib import Path -from django.db import models, DataError +from django.db import DataError, models from django.template import loader import settings from troggle.core.models.logbooks import QM from troggle.core.models.survex import SurvexStation, utmToLatLng from troggle.core.models.troggle import DataIssue, TroggleModel -from troggle.core.utils import TROG, writetrogglefile, parse_aliases +from troggle.core.utils import TROG, parse_aliases, writetrogglefile # Use the TROG global object to cache the cave lookup list. No good for multi-user.., or even multi-page. Pointless in fact. Gcavelookup = TROG["caves"]["gcavelookup"] diff --git a/core/models/logbooks.py b/core/models/logbooks.py index 7bad58f..a5239f7 100644 --- a/core/models/logbooks.py +++ b/core/models/logbooks.py @@ -1,16 +1,14 @@ import re - from pathlib import Path from urllib.parse import urljoin from django.db import models -from django.urls import reverse from django.template import loader +from django.urls import reverse import settings 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 cb5c26e..6b9a818 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -1,12 +1,13 @@ -import math +import math import os import re -from urllib.parse import urljoin 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.utils import height_from_utm, throw # from troggle.core.models.troggle import DataIssue # circular import. Hmm diff --git a/core/models/wallets.py b/core/models/wallets.py index 5c8202c..288608a 100644 --- a/core/models/wallets.py +++ b/core/models/wallets.py @@ -10,8 +10,8 @@ from django.conf import settings from django.db import models from django.urls import reverse -from troggle.core.models.troggle import DataIssue from troggle.core.models.caves import get_cave_leniently +from troggle.core.models.troggle import DataIssue # from troggle.core.models.survex import SurvexBlock # from troggle.core.models.troggle import DataIssue # circular import. Hmm |