rename SurvexScansFolders and tidy survex parser

4 files changed, 26 insertions, 26 deletions

diff --git a/core/admin.py b/core/admin.py
index c820b77..2fc635a 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -7,7 +7,7 @@ from django.core import serializers
 from troggle.core.views_other import downloadLogbook
 from troggle.core.models import Person, PersonExpedition, Expedition, DataIssue
 from troggle.core.models_caves import Cave, Area, Entrance, CaveAndEntrance, NewSubCave, OtherCaveName, CaveDescription, LogbookEntry, PersonTrip, QM
-from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, SurvexScansFolder, SurvexScanSingle
+from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SurvexScanSingle
 
 
 class TroggleModelAdmin(admin.ModelAdmin):
@@ -120,7 +120,7 @@ admin.site.register(PersonExpedition,PersonExpeditionAdmin)
 admin.site.register(LogbookEntry, LogbookEntryAdmin)
 admin.site.register(QM, QMAdmin)
 admin.site.register(SurvexStation)
-admin.site.register(SurvexScansFolder)
+admin.site.register(ScansFolder)
 admin.site.register(SurvexScanSingle)
 admin.site.register(DataIssue)
 
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
index cbcb4a7..5e14a6c 100644
--- a/core/migrations/0001_initial.py
+++ b/core/migrations/0001_initial.py
@@ -297,6 +297,17 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
+            name='ScansFolder',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fpath', models.CharField(max_length=200)),
+                ('walletname', models.CharField(max_length=200)),
+            ],
+            options={
+                'ordering': ('walletname',),
+            },
+        ),
+        migrations.CreateModel(
             name='SurvexBlock',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -360,23 +371,12 @@ class Migration(migrations.Migration):
             ],
         ),
         migrations.CreateModel(
-            name='SurvexScansFolder',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('fpath', models.CharField(max_length=200)),
-                ('walletname', models.CharField(max_length=200)),
-            ],
-            options={
-                'ordering': ('walletname',),
-            },
-        ),
-        migrations.CreateModel(
             name='SurvexScanSingle',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('ffile', models.CharField(max_length=200)),
                 ('name', models.CharField(max_length=200)),
-                ('survexscansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexScansFolder')),
+                ('survexscansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')),
             ],
             options={
                 'ordering': ('name',),
@@ -412,9 +412,9 @@ class Migration(migrations.Migration):
                 ('bfontcolours', models.BooleanField(default=False)),
                 ('filesize', models.IntegerField(default=0)),
                 ('npaths', models.IntegerField(default=0)),
+                ('manyscansfolders', models.ManyToManyField(to='core.ScansFolder')),
                 ('survexblocks', models.ManyToManyField(to='core.SurvexBlock')),
                 ('survexscans', models.ManyToManyField(to='core.SurvexScanSingle')),
-                ('survexscansfolders', models.ManyToManyField(to='core.SurvexScansFolder')),
                 ('survextitles', models.ManyToManyField(to='core.SurvexTitle')),
                 ('tunnelcontains', models.ManyToManyField(to='core.TunnelFile')),
             ],
@@ -435,7 +435,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='survexblock',
             name='survexscansfolder',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexScansFolder'),
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder'),
         ),
         migrations.AddField(
             model_name='qm',
diff --git a/core/models_survex.py b/core/models_survex.py
index 2b1e48f..75cdec8 100644
--- a/core/models_survex.py
+++ b/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
diff --git a/core/view_surveys.py b/core/view_surveys.py
index 76f7104..fbe5c6f 100644
--- a/core/view_surveys.py
+++ b/core/view_surveys.py
@@ -6,7 +6,7 @@ from django.conf import settings
 from django.shortcuts import render_to_response
 from django.http import HttpResponse, Http404
 
-from troggle.core.models_survex import SurvexScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
+from troggle.core.models_survex import ScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
 from troggle.flatpages import views as flatviews
 import parsers.surveys
 #from . import fileAbstraction
@@ -69,12 +69,12 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary):
     return res.replace("\\", "/")
 
 def surveyscansfolder(request, path):
-    #print [ s.walletname  for s in SurvexScansFolder.objects.all() ]
-    survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path))
+    #print [ s.walletname  for s in ScansFolder.objects.all() ]
+    survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path))
     return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings })
 
 def surveyscansingle(request, path, file):
-    survexscansfolder = SurvexScansFolder.objects.get(walletname=urllib.parse.unquote(path))
+    survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path))
     survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file)
     print("SSS {} {} :{}:".format(path, file, flatviews.getmimetype(file)))
     return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=flatviews.getmimetype(file))
@@ -90,8 +90,8 @@ def cssfilessingle(request, filepath):
     return HttpResponse(content=open(settings.MEDIA_ROOT+fn,"r"),content_type="text/css")
 
 def surveyscansfolders(request):
-    survexscansfolders = SurvexScansFolder.objects.all()
-    return render_to_response('survexscansfolders.html', { 'survexscansfolders':survexscansfolders, 'settings': settings })
+    manyscansfolders = ScansFolder.objects.all()
+    return render_to_response('manyscansfolders.html', { 'manyscansfolders':manyscansfolders, 'settings': settings })
     
     
 def tunneldata(request):