diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/migrations/0001_initial.py | 4 | ||||
| -rw-r--r-- | core/models_survex.py | 8 | ||||
| -rw-r--r-- | core/view_surveys.py | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 5e14a6c..6a8a847 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -376,7 +376,7 @@ class Migration(migrations.Migration): ('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.ScansFolder')), + ('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')), ], options={ 'ordering': ('name',), @@ -434,7 +434,7 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='survexblock', - name='survexscansfolder', + name='scansfolder', field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder'), ), migrations.AddField( diff --git a/core/models_survex.py b/core/models_survex.py index 75cdec8..2b99ddc 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("ScansFolder", null=True,on_delete=models.CASCADE) + scansfolder = 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 @@ -211,16 +211,16 @@ class ScansFolder(models.Model): class SurvexScanSingle(models.Model): ffile = models.CharField(max_length=200) name = models.CharField(max_length=200) - survexscansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE) + scansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE) class Meta: ordering = ('name',) def get_absolute_url(self): - return urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.survexscansfolder.walletname), "file":self.name})) + return urljoin(settings.URL_ROOT, reverse('surveyscansingle', kwargs={"path":re.sub("#", "%23", self.scansfolder.walletname), "file":self.name})) def __str__(self): - return "Survey Scan Image: " + str(self.name) + " in " + str(self.survexscansfolder) + return "Survey Scan Image: " + str(self.name) + " in " + str(self.scansfolder) class TunnelFile(models.Model): tunnelpath = models.CharField(max_length=200) diff --git a/core/view_surveys.py b/core/view_surveys.py index fbe5c6f..73c5790 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -70,15 +70,15 @@ def SaveImageInDir(name, imgdir, project, fdata, bbinary): def surveyscansfolder(request, 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 }) + scansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) + return render_to_response('scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings }) def surveyscansingle(request, path, file): - survexscansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) - survexscansingle = SurvexScanSingle.objects.get(survexscansfolder=survexscansfolder, name=file) + scansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path)) + survexscansingle = SurvexScanSingle.objects.get(scansfolder=scansfolder, name=file) print("SSS {} {} :{}:".format(path, file, flatviews.getmimetype(file))) return HttpResponse(content=open(survexscansingle.ffile,"rb"), content_type=flatviews.getmimetype(file)) - #return render_to_response('survexscansfolder.html', { 'survexscansfolder':survexscansfolder, 'settings': settings }) + #return render_to_response('scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings }) def expofilessingle(request, filepath): # defaults to content_type="text/pain" needs fixing for PDFs |