From 0ea3ed1ef2463b20243d32c1e281e29908d2718b Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 5 Jul 2022 22:40:58 +0300 Subject: Not quite so broken QMs from survex files --- core/models/caves.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/models/caves.py') diff --git a/core/models/caves.py b/core/models/caves.py index d623963..4e963fb 100644 --- a/core/models/caves.py +++ b/core/models/caves.py @@ -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): -- cgit v1.2.3