summaryrefslogtreecommitdiffstats
path: root/core/models_survex.py
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2019-06-26 20:57:24 +0100
committerSam Wenham <sam@wenhams.co.uk>2019-06-26 20:57:24 +0100
commit97426a0ddbd8892c575b571f5bbc237860bfbf5e (patch)
treea8b5ddcc45e9ccb0bac9652f9730f234eeba03a7 /core/models_survex.py
parent8a1be45aacd3d44a49ea14a31cedd78493f8432b (diff)
downloadtroggle-97426a0ddbd8892c575b571f5bbc237860bfbf5e.tar.gz
troggle-97426a0ddbd8892c575b571f5bbc237860bfbf5e.tar.bz2
troggle-97426a0ddbd8892c575b571f5bbc237860bfbf5e.zip
Backed out changeset: 4552f42bdf54
Diffstat (limited to 'core/models_survex.py')
-rw-r--r--core/models_survex.py16
1 files changed, 2 insertions, 14 deletions
diff --git a/core/models_survex.py b/core/models_survex.py
index 897844e..3bae04c 100644
--- a/core/models_survex.py
+++ b/core/models_survex.py
@@ -29,9 +29,6 @@ class SurvexFile(models.Model):
class Meta:
ordering = ('id',)
-
- def __unicode__(self):
- return self.path + '.svx' or 'no file'
def exists(self):
fname = os.path.join(settings.SURVEX_DATA, self.path + ".svx")
@@ -69,9 +66,6 @@ class SurvexStation(models.Model):
x = models.FloatField(blank=True, null=True)
y = models.FloatField(blank=True, null=True)
z = models.FloatField(blank=True, null=True)
-
- def __unicode__(self):
- return self.block.cave.slug() + '/' + self.block.name + '/' + self.name or 'No station name'
def path(self):
r = self.name
@@ -115,7 +109,7 @@ class SurvexBlock(models.Model):
text = models.TextField()
cave = models.ForeignKey('Cave', blank=True, null=True)
- date = models.DateTimeField(blank=True, null=True)
+ date = models.DateField(blank=True, null=True)
expeditionday = models.ForeignKey("ExpeditionDay", null=True)
expedition = models.ForeignKey('Expedition', blank=True, null=True)
@@ -183,7 +177,7 @@ ROLE_CHOICES = (
class SurvexPersonRole(models.Model):
survexblock = models.ForeignKey('SurvexBlock')
nrole = models.CharField(choices=ROLE_CHOICES, max_length=200, blank=True, null=True)
- # increasing levels of precision
+ # increasing levels of precision
personname = models.CharField(max_length=100)
person = models.ForeignKey('Person', blank=True, null=True)
personexpedition = models.ForeignKey('PersonExpedition', blank=True, null=True)
@@ -200,9 +194,6 @@ class SurvexScansFolder(models.Model):
class Meta:
ordering = ('walletname',)
-
- def __unicode__(self):
- return self.walletname or 'no wallet'
def get_absolute_url(self):
return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansfolder', kwargs={"path":re.sub("#", "%23", self.walletname)}))
@@ -214,9 +205,6 @@ class SurvexScanSingle(models.Model):
class Meta:
ordering = ('name',)
-
- def __unicode__(self):
- return self.survexscansfolder.walletname + '/' + self.name
def get_absolute_url(self):
return urlparse.urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name}))