diff options
Diffstat (limited to 'core/models_survex.py')
| -rw-r--r-- | core/models_survex.py | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/core/models_survex.py b/core/models_survex.py index b71c27a..808010b 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -7,13 +7,6 @@ from django.conf import settings from django.urls import reverse -########################################################### -# These will allow browsing and editing of the survex data -########################################################### -# Needs to add: -# Equates -# reloading - class SurvexDirectory(models.Model): path = models.CharField(max_length=200) cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) @@ -52,9 +45,6 @@ class SurvexFile(models.Model): self.save() -#class SurvexEquate(models.Model): -# cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) - class SurvexStationLookUpManager(models.Manager): def lookup(self, name): blocknames, sep, stationname = name.rpartition(".") @@ -132,16 +122,7 @@ class SurvexBlock(models.Model): else: res.append({'person':personrole.personexpedition.person, 'expeditionyear':personrole.personexpedition.expedition.year, 'roles':str(personrole.role)}) return res - - # def MakeSurvexStation(self, name): - # ssl = self.survexstation_set.filter(name=name) - # if ssl: - # assert len(ssl) == 1 - # return ssl[0] - # ss = SurvexStation(name=name, block=self) - # #ss.save() - # return ss - + def DayIndex(self): return list(self.expeditionday.survexblock_set.all()).index(self) @@ -211,11 +192,9 @@ class TunnelFile(models.Model): bfontcolours = models.BooleanField(default=False) manyscansfolders = models.ManyToManyField("ScansFolder") # implicitly links to SVX files scans = models.ManyToManyField("SingleScan") # implicitly links to SVX files -# survexblocks = models.ManyToManyField("SurvexBlock") tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type filesize = models.IntegerField(default=0) npaths = models.IntegerField(default=0) -# survextitles = models.ManyToManyField("SurvexTitle") survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files class Meta: |