diff options
Diffstat (limited to 'core/models_survex.py')
| -rw-r--r-- | core/models_survex.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/core/models_survex.py b/core/models_survex.py index 629b4df..e58cf49 100644 --- a/core/models_survex.py +++ b/core/models_survex.py @@ -1,8 +1,9 @@ -from django.db import models -from django.conf import settings import os import urllib.parse import re + +from django.db import models +from django.conf import settings from django.core.urlresolvers import reverse @@ -21,7 +22,8 @@ class SurvexDirectory(models.Model): class Meta: ordering = ('id',) - + + class SurvexFile(models.Model): path = models.CharField(max_length=200) survexdirectory = models.ForeignKey("SurvexDirectory", blank=True, null=True) @@ -49,6 +51,7 @@ class SurvexFile(models.Model): self.survexdirectory = survexdirectory self.save() + class SurvexEquate(models.Model): cave = models.ForeignKey('Cave', blank=True, null=True) @@ -87,7 +90,6 @@ class SurvexLeg(models.Model): compass = models.FloatField() clino = models.FloatField() - # # Single SurvexBlock # @@ -152,7 +154,6 @@ class SurvexBlock(models.Model): def DayIndex(self): return list(self.expeditionday.survexblock_set.all()).index(self) - class SurvexTitle(models.Model): survexblock = models.ForeignKey('SurvexBlock') @@ -186,8 +187,7 @@ class SurvexPersonRole(models.Model): def __str__(self): return str(self.person) + " - " + str(self.survexblock) + " - " + str(self.nrole) - - + class SurvexScansFolder(models.Model): fpath = models.CharField(max_length=200) walletname = models.CharField(max_length=200) @@ -200,7 +200,7 @@ class SurvexScansFolder(models.Model): def __str__(self): return str(self.walletname) + " (Survey Scans Folder)" - + class SurvexScanSingle(models.Model): ffile = models.CharField(max_length=200) name = models.CharField(max_length=200) @@ -214,8 +214,7 @@ class SurvexScanSingle(models.Model): def __str__(self): return "Survey Scan Image: " + str(self.name) + " in " + str(self.survexscansfolder) - - + class TunnelFile(models.Model): tunnelpath = models.CharField(max_length=200) tunnelname = models.CharField(max_length=200) @@ -230,5 +229,4 @@ class TunnelFile(models.Model): class Meta: - ordering = ('tunnelpath',) - + ordering = ('tunnelpath',)
\ No newline at end of file |