xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Simple renaming too-similar variables

Browse Source
This commit is contained in:
Philip Sargent
2020-06-24 00:18:01 +01:00
parent 9cd70b31ac
commit c91aa4be47
10 changed files with 36 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/admin.py
View File

@@ -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, ScansFolder, SurvexScanSingle
from troggle.core.models_survex import SurvexBlock, SurvexPersonRole, SurvexStation, ScansFolder, SingleScan
class TroggleModelAdmin(admin.ModelAdmin):
@@ -121,7 +121,7 @@ admin.site.register(LogbookEntry, LogbookEntryAdmin)
admin.site.register(QM, QMAdmin)
admin.site.register(SurvexStation)
admin.site.register(ScansFolder)
admin.site.register(SurvexScanSingle)
admin.site.register(SingleScan)
admin.site.register(DataIssue)
def export_as_json(modeladmin, request, queryset):

34
core/migrations/0001_initial.py
View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.29 on 2020-06-23 18:44
# Generated by Django 1.11.29 on 2020-06-23 22:48
from __future__ import unicode_literals
from django.conf import settings
@@ -307,6 +307,18 @@ class Migration(migrations.Migration):
'ordering': ('walletname',),
},
),
migrations.CreateModel(
name='SingleScan',
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)),
('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')),
],
options={
'ordering': ('name',),
},
),
migrations.CreateModel(
name='SurvexBlock',
fields=[
@@ -322,6 +334,7 @@ class Migration(migrations.Migration):
('expedition', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Expedition')),
('expeditionday', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ExpeditionDay')),
('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexBlock')),
('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')),
],
options={
'ordering': ('id',),
@@ -370,18 +383,6 @@ class Migration(migrations.Migration):
('survexblock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.SurvexBlock')),
],
),
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)),
('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')),
],
options={
'ordering': ('name',),
},
),
migrations.CreateModel(
name='SurvexStation',
fields=[
@@ -414,7 +415,7 @@ class Migration(migrations.Migration):
('npaths', models.IntegerField(default=0)),
('manyscansfolders', models.ManyToManyField(to='core.ScansFolder')),
('survexblocks', models.ManyToManyField(to='core.SurvexBlock')),
('survexscans', models.ManyToManyField(to='core.SurvexScanSingle')),
('survexscans', models.ManyToManyField(to='core.SingleScan')),
('survextitles', models.ManyToManyField(to='core.SurvexTitle')),
('tunnelcontains', models.ManyToManyField(to='core.TunnelFile')),
],
@@ -432,11 +433,6 @@ class Migration(migrations.Migration):
name='survexfile',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexFile'),
),
migrations.AddField(
model_name='survexblock',
name='scansfolder',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder'),
),
migrations.AddField(
model_name='qm',
name='nearest_station',

17
core/models_survex.py
View File

@@ -81,15 +81,9 @@ class SurvexStation(models.Model):
else:
return r
# class SurvexLeg(models.Model):
# block = models.ForeignKey('SurvexBlock',on_delete=models.CASCADE)
# #title = models.ForeignKey('SurvexTitle',on_delete=models.CASCADE)
# stationfrom = models.ForeignKey('SurvexStation', related_name='stationfrom',on_delete=models.CASCADE)
# stationto = models.ForeignKey('SurvexStation', related_name='stationto',on_delete=models.CASCADE)
# tape = models.FloatField()
# compass = models.FloatField()
# clino = models.FloatField()
class SurvexLeg():
"""No longer a models.Model subclass, so no longer a database table
"""
tape = 0.0
compass = 0.0
clino = 0.0
@@ -112,7 +106,6 @@ class SurvexBlock(models.Model):
objects = SurvexBlockLookUpManager()
name = models.CharField(max_length=100)
parent = models.ForeignKey('SurvexBlock', blank=True, null=True,on_delete=models.CASCADE)
# text = models.TextField()
cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE)
date = models.DateField(blank=True, null=True)
@@ -120,11 +113,9 @@ class SurvexBlock(models.Model):
expedition = models.ForeignKey('Expedition', blank=True, null=True,on_delete=models.CASCADE)
survexfile = models.ForeignKey("SurvexFile", blank=True, null=True,on_delete=models.CASCADE)
# 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
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
legssplay = models.IntegerField(null=True) # summary data for this block
@@ -208,7 +199,7 @@ class ScansFolder(models.Model):
def __str__(self):
return str(self.walletname) + " (Survey Scans Folder)"
class SurvexScanSingle(models.Model):
class SingleScan(models.Model):
ffile = models.CharField(max_length=200)
name = models.CharField(max_length=200)
scansfolder = models.ForeignKey("ScansFolder", null=True,on_delete=models.CASCADE)
@@ -227,7 +218,7 @@ class TunnelFile(models.Model):
tunnelname = models.CharField(max_length=200)
bfontcolours = models.BooleanField(default=False)
manyscansfolders = models.ManyToManyField("ScansFolder")
survexscans = models.ManyToManyField("SurvexScanSingle")
survexscans = models.ManyToManyField("SingleScan")
survexblocks = models.ManyToManyField("SurvexBlock")
tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type
filesize = models.IntegerField(default=0)

6
core/view_surveys.py
View File

@@ -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 ScansFolder, SurvexScanSingle, SurvexBlock, TunnelFile
from troggle.core.models_survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile
from troggle.flatpages import views as flatviews
import parsers.surveys
#from . import fileAbstraction
@@ -75,9 +75,9 @@ def surveyscansfolder(request, path):
def surveyscansingle(request, path, file):
scansfolder = ScansFolder.objects.get(walletname=urllib.parse.unquote(path))
survexscansingle = SurvexScanSingle.objects.get(scansfolder=scansfolder, name=file)
singlescan = SingleScan.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 HttpResponse(content=open(singlescan.ffile,"rb"), content_type=flatviews.getmimetype(file))
#return render_to_response('scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings })
def expofilessingle(request, filepath):