summaryrefslogtreecommitdiffstats
path: root/core/models_caves.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-06-04 21:57:04 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-06-04 21:57:04 +0100
commitb7fea2042feb5ad12d99e7279498ad68c00c983b (patch)
treefe871bf7c98c28286b45277e6f432cf3a6aa05ad /core/models_caves.py
parentc6d68749e06892ce6607819081e4639a9d589409 (diff)
downloadtroggle-b7fea2042feb5ad12d99e7279498ad68c00c983b.tar.gz
troggle-b7fea2042feb5ad12d99e7279498ad68c00c983b.tar.bz2
troggle-b7fea2042feb5ad12d99e7279498ad68c00c983b.zip
merge exptl & stats, delete millenial & eyecandy
Diffstat (limited to 'core/models_caves.py')
-rw-r--r--core/models_caves.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/models_caves.py b/core/models_caves.py
index eaad454..0d35583 100644
--- a/core/models_caves.py
+++ b/core/models_caves.py
@@ -128,7 +128,7 @@ class Cave(TroggleModel):
return str("slug:"+self.slug())
def get_QMs(self):
- return QM.objects.filter(found_by__cave_slug=self.caveslug_set.all())
+ return QM.objects.filter(found_by__cave_slug=self.caveslug_set.all())
def new_QM_number(self, year=datetime.date.today().year):
"""Given a cave and the current year, returns the next QM number."""
@@ -275,7 +275,7 @@ class Entrance(TroggleModel):
def find_location(self):
r = {'': 'To be entered ',
- '?': 'To be confirmed:',
+ '?': 'To be confirmed:',
'S': '',
'L': 'Lost:',
'R': 'Refindable:'}[self.findability]
@@ -566,12 +566,12 @@ class Survey(TroggleModel):
comments = models.TextField(blank=True,null=True)
location = models.CharField(max_length=400,blank=True,null=True) #REDUNDANT
subcave = models.ForeignKey('NewSubCave', blank=True, null=True)
- #notes_scan = models.ForeignKey('ScannedImage',related_name='notes_scan',blank=True, null=True) #Replaced by contents field of ScannedImage model
+ #notes_scan = models.ForeignKey('ScannedImage',related_name='notes_scan',blank=True, null=True) #Replaced by contents field of ScannedImage model
survex_block = models.OneToOneField('SurvexBlock',blank=True, null=True)
logbook_entry = models.ForeignKey('LogbookEntry')
centreline_printed_on = models.DateField(blank=True, null=True)
centreline_printed_by = models.ForeignKey('Person',related_name='centreline_printed_by',blank=True,null=True)
- #sketch_scan = models.ForeignKey(ScannedImage,blank=True, null=True) #Replaced by contents field of ScannedImage model
+ #sketch_scan = models.ForeignKey(ScannedImage,blank=True, null=True) #Replaced by contents field of ScannedImage model
tunnel_file = models.FileField(upload_to='surveyXMLfiles',blank=True, null=True)
tunnel_main_sketch = models.ForeignKey('Survey',blank=True,null=True)
integrated_into_main_sketch_on = models.DateField(blank=True,null=True)