diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models/caves.py | 3 | ||||
| -rw-r--r-- | core/views/caves.py | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/core/models/caves.py b/core/models/caves.py index 35b07f2..45a7b5e 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -266,6 +266,9 @@ class Entrance(TroggleModel): def __str__(self): return str(self.slug) + + def name(self): + return str(self.slug)[5:] def single(self, station): if not station: diff --git a/core/views/caves.py b/core/views/caves.py index ccea4dc..7272cb5 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -167,7 +167,10 @@ def padnumber(x): def numericalcmp(x, y): return cmp(padnumber(x), padnumber(y)) - +def entKey(e): + k = caveKey(e.firstcave()) + return k + def caveKey(c): """This function goes into a lexicographic sort function, and the values are strings, but we want to sort numerically on kataster number before sorting on unofficial number. @@ -239,6 +242,26 @@ def entranceindex(request): {"entrances": ents}, ) +def entrancetags(request): + ents = list(Entrance.objects.all()) + ents1623 = [] + for e in ents: + if e.slug[:4] == "1623": + if e.firstcave().kataster_number: + if int(e.firstcave().kataster_number) < 35: + continue + if e.best_station(): + continue + if e.findability != "S": # it says we do not have coordinates + ents1623.append(e) + ents1623.sort(key=entKey) + + return render( + request, + "entrancetags.html", + {"entrances": ents1623}, + ) + def cave3d(request, cave_id=""): """This is used to create a download url in templates/cave.html if anyone wants to download the .3d file |