rename SurvexScansFolders and tidy survex parser

core/models_survex.py

@@ -123,7 +123,7 @@ class SurvexBlock(models.Model):
 #    begin_char = models.IntegerField()  # code for where in the survex data files this block sits
     survexpath = models.CharField(max_length=200)   # the path for the survex stations
     
-    survexscansfolder = models.ForeignKey("SurvexScansFolder", null=True,on_delete=models.CASCADE)  
+    survexscansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE)  
     #refscandir = models.CharField(max_length=100)
     
     legsall   = models.IntegerField(null=True)  # summary data for this block
@@ -195,7 +195,7 @@ class SurvexPersonRole(models.Model):
     def __str__(self):
         return str(self.person) + " - " + str(self.survexblock) + " - " + str(self.nrole)
 
-class SurvexScansFolder(models.Model):
+class ScansFolder(models.Model):
     fpath               = models.CharField(max_length=200)
     walletname          = models.CharField(max_length=200)
     
@@ -211,7 +211,7 @@ class SurvexScansFolder(models.Model):
 class SurvexScanSingle(models.Model):
     ffile               = models.CharField(max_length=200)
     name                = models.CharField(max_length=200)
-    survexscansfolder   = models.ForeignKey("SurvexScansFolder", null=True,on_delete=models.CASCADE)
+    survexscansfolder   = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE)
     
     class Meta:
         ordering = ('name',)
@@ -226,7 +226,7 @@ class TunnelFile(models.Model):
     tunnelpath          = models.CharField(max_length=200)
     tunnelname          = models.CharField(max_length=200)
     bfontcolours        = models.BooleanField(default=False)
-    survexscansfolders  = models.ManyToManyField("SurvexScansFolder")
+    manyscansfolders  = models.ManyToManyField("ScansFolder")
     survexscans         = models.ManyToManyField("SurvexScanSingle")
     survexblocks        = models.ManyToManyField("SurvexBlock")
     tunnelcontains      = models.ManyToManyField("TunnelFile")  # case when its a frame type