diff options
Diffstat (limited to 'core/models_survex.py')
| -rw-r--r-- | core/models_survex.py | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/core/models_survex.py b/core/models_survex.py index 7f316c7..9578e78 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -52,8 +52,8 @@ class SurvexFile(models.Model): self.save() -class SurvexEquate(models.Model): - cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) +#class SurvexEquate(models.Model): +# cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) class SurvexStationLookUpManager(models.Manager): def lookup(self, name): @@ -64,7 +64,7 @@ class SurvexStationLookUpManager(models.Manager): class SurvexStation(models.Model): name = models.CharField(max_length=100) block = models.ForeignKey('SurvexBlock',on_delete=models.CASCADE) - equate = models.ForeignKey('SurvexEquate', blank=True, null=True,on_delete=models.CASCADE) +# equate = models.ForeignKey('SurvexEquate', blank=True, null=True,on_delete=models.CASCADE) objects = SurvexStationLookUpManager() x = models.FloatField(blank=True, null=True) y = models.FloatField(blank=True, null=True) @@ -140,22 +140,21 @@ class SurvexBlock(models.Model): 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] - #print name - ss = SurvexStation(name=name, block=self) - #ss.save() - return ss + # 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) class SurvexTitle(models.Model): survexblock = models.ForeignKey('SurvexBlock',on_delete=models.CASCADE) - title = models.CharField(max_length=200) + title = models.CharField(max_length=200) # needed by svxcavesingle.html template cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE) # @@ -217,14 +216,14 @@ class TunnelFile(models.Model): tunnelpath = models.CharField(max_length=200) tunnelname = models.CharField(max_length=200) bfontcolours = models.BooleanField(default=False) - manyscansfolders = models.ManyToManyField("ScansFolder") - scans = models.ManyToManyField("SingleScan") - survexblocks = models.ManyToManyField("SurvexBlock") + 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") - - +# survextitles = models.ManyToManyField("SurvexTitle") + survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files + class Meta: ordering = ('tunnelpath',)
\ No newline at end of file |