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

Not quite so broken QMs from survex files

Browse Source
This commit is contained in:
Philip Sargent
2022-07-05 22:40:58 +03:00
parent 2bd617b543
commit 0ea3ed1ef2
6 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/models/caves.py
View File

@@ -498,15 +498,16 @@ class QM(TroggleModel):
area = models.CharField(max_length=100,blank=True, null=True)
completion_description = models.TextField(blank=True,null=True)
comment=models.TextField(blank=True,null=True)
blockname=models.TextField(blank=True,null=True)
def __str__(self):
return f'{self.code()}'
def code(self):
if self.found_by:
return f'{str(self.found_by.cave_slug)[5:]}-{self.found_by.date.year}-{self.number}'
return f'{str(self.found_by.cave_slug)[5:]}-{self.found_by.date.year}-{self.blockname}{self.number}{self.grade}'
else:
return f'{self.cave.slug()[5:]}-xxxx-{self.number}'
return f'{self.cave.slug()[5:]}-xxxx-{self.blockname}{self.number}{self.grade}'
def get_absolute_url(self):
if self.found_by:
@@ -514,7 +515,7 @@ class QM(TroggleModel):
else:
qmyear = "1986" # HACK to check if other bits work
#return settings.URL_ROOT + '/cave/' + self.found_by.cave.kataster_number + '/' + str(self.found_by.date.year) + '-' + '%02d' %self.number
return urljoin(settings.URL_ROOT, reverse('qm',kwargs={'cave_id':self.cave.slug(),'year':qmyear,'qm_id':self.number,'grade':self.grade}))
return urljoin(settings.URL_ROOT, reverse('qm',kwargs={'cave_id':self.cave.slug(),'year':qmyear, 'blockname':self.blockname,'qm_id':self.number,'grade':self.grade}))
def get_next_by_id(self):