expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 05:27:10 +00:00
Code Issues 18 Projects 3 Activity

Better standard entrances report

Browse Source
This commit is contained in:
Philip Sargent
2023-10-15 01:11:21 +03:00
parent 5d383e0445
commit c51c2326fe
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/models/caves.py
View File

@@ -265,13 +265,16 @@ class Entrance(TroggleModel):
return str(self.slug)
def single(self, station):
if not station:
return None
try:
single = SurvexStation.objects.get(name = station)
return single
except:
stations = SurvexStation.objects.filter(name = station)
print(f" # MULTIPLE stations found with same name '{station}' in Entrance {self}:")
print(f" # EXCEPTION looking for '{station}' in all stations. (Entrance {self})")
if len(stations) > 1:
print(f" # MULTIPLE stations found with same name '{station}' in Entrance {self}:")
for s in stations:
print(f" # {s.id=} - {s.name} {s.latlong()}") # .id is Django internal field, not one of ours
return stations[0]
@@ -357,6 +360,8 @@ class Entrance(TroggleModel):
def tag(self):
return self.single(self.tag_station)
def other(self):
return self.single(self.other_station)
def needs_surface_work(self):
return self.findability != "S" or not self.has_photo or self.marking != "T"
@@ -371,7 +376,12 @@ class Entrance(TroggleModel):
if e.cave:
rs.append(e.cave)
return rs
def firstcave(self):
for e in CaveAndEntrance.objects.filter(entrance=self):
if e.cave:
return(e.cave)
def get_file_path(self):
return Path(settings.ENTRANCEDESCRIPTIONS, self.filename)