Part one of getting troggle to work with django 1.10

Major rework of how survex is processed

1 files changed, 20 insertions, 5 deletions

diff --git a/core/models_survex.py b/core/models_survex.py
index 3bae04c..e78cd48 100644
--- a/core/models_survex.py
+++ b/core/models_survex.py
@@ -18,10 +18,13 @@ class SurvexDirectory(models.Model):
     cave = models.ForeignKey('Cave', blank=True, null=True)
     primarysurvexfile = models.ForeignKey('SurvexFile', related_name='primarysurvexfile', blank=True, null=True)
     # could also include files in directory but not referenced
-    
+
+    def __unicode__(self):
+        return self.path
+
     class Meta:
-        ordering = ('id',)
-    
+        ordering = ('path',)
+
 class SurvexFile(models.Model):
     path = models.CharField(max_length=200)
     survexdirectory = models.ForeignKey("SurvexDirectory", blank=True, null=True)
@@ -29,6 +32,9 @@ 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")
@@ -66,6 +72,9 @@ 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
@@ -109,7 +118,7 @@ class SurvexBlock(models.Model):
     text       = models.TextField()
     cave       = models.ForeignKey('Cave', blank=True, null=True)
     
-    date       = models.DateField(blank=True, null=True)
+    date       = models.DateTimeField(blank=True, null=True)
     expeditionday = models.ForeignKey("ExpeditionDay", null=True)
     expedition = models.ForeignKey('Expedition', blank=True, null=True)
         
@@ -177,7 +186,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)
@@ -194,6 +203,9 @@ 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)}))
@@ -205,6 +217,9 @@ 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}))