expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-14 21:37:13 +00:00
Code Issues 18 Projects 3 Activity

remove Survey & virtual survey wallet - never used

Browse Source
This commit is contained in:
Philip Sargent
2020-06-16 16:17:35 +01:00
parent 1b693da5ed
commit 9f5e779b5e
5 changed files with 1 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
core/models_caves.py
View File

@@ -18,7 +18,7 @@ from django.conf import settings
from django.core.urlresolvers import reverse
from django.template import Context, loader
from troggle.core.models import TroggleModel, TroggleImageModel, Person, Expedition
from troggle.core.models import TroggleModel, Person, Expedition
from troggle.core.models_survex import SurvexStation
class Area(TroggleModel):
@@ -537,58 +537,6 @@ def get_scan_path(instance, filename):
if str(instance.survey.wallet_letter) != "None":
number=str(instance.survey.wallet_letter) + number #two strings formatting because convention is 2009#01 or 2009#X01
return os.path.join('./',year,year+r'#'+number,str(instance.contents)+str(instance.number_in_wallet)+r'.jpg')
# class ScannedImage(TroggleImageModel):
# file = models.ImageField(storage=scansFileStorage, upload_to=get_scan_path)
# scanned_by = models.ForeignKey(Person,blank=True, null=True)
# scanned_on = models.DateField(null=True)
# survey = models.ForeignKey('Survey')
# contents = models.CharField(max_length=20,choices=(('notes','notes'),('plan','plan_sketch'),('elevation','elevation_sketch')))
# number_in_wallet = models.IntegerField(null=True)
# lon_utm = models.FloatField(blank=True,null=True)
# lat_utm = models.FloatField(blank=True,null=True)
# #content_type = models.ForeignKey(ContentType)
# #object_id = models.PositiveIntegerField()
# #location = generic.GenericForeignKey('content_type', 'object_id')
# #This is an ugly hack to deal with the #s in our survey scan paths. The correct thing is to write a custom file storage backend which calls urlencode on the name for making file.url but not file.path.
# def correctURL(self):
# return string.replace(self.file.url,r'#',r'%23')
# def __str__(self):
# return get_scan_path(self,'')
# class Survey(TroggleModel):
# expedition = models.ForeignKey('Expedition') #REDUNDANT (logbook_entry)
# wallet_number = models.IntegerField(blank=True,null=True)
# wallet_letter = models.CharField(max_length=1,blank=True,null=True)
# comments = models.TextField(blank=True,null=True)
# location = models.CharField(max_length=400,blank=True,null=True) #REDUNDANT
# subcave = models.ForeignKey('NewSubCave', blank=True, null=True)
# #notes_scan = models.ForeignKey('ScannedImage',related_name='notes_scan',blank=True, null=True) #Replaced by contents field of ScannedImage model
# survex_block = models.OneToOneField('SurvexBlock',blank=True, null=True)
# logbook_entry = models.ForeignKey('LogbookEntry')
# centreline_printed_on = models.DateField(blank=True, null=True)
# centreline_printed_by = models.ForeignKey('Person',related_name='centreline_printed_by',blank=True,null=True)
# #sketch_scan = models.ForeignKey(ScannedImage,blank=True, null=True) #Replaced by contents field of ScannedImage model
# tunnel_file = models.FileField(upload_to='surveyXMLfiles',blank=True, null=True)
# tunnel_main_sketch = models.ForeignKey('Survey',blank=True,null=True)
# integrated_into_main_sketch_on = models.DateField(blank=True,null=True)
# integrated_into_main_sketch_by = models.ForeignKey('Person' ,related_name='integrated_into_main_sketch_by', blank=True,null=True)
# rendered_image = models.ImageField(upload_to='renderedSurveys',blank=True,null=True)
# def __str__(self):
# return self.expedition.year+"#"+"%02d" % int(self.wallet_number)
# def notes(self):
# return self.scannedimage_set.filter(contents='notes')
# def plans(self):
# return self.scannedimage_set.filter(contents='plan')
# def elevations(self):
# return self.scannedimage_set.filter(contents='elevation')
#
# Single Person going on a trip, which may or may not be written up (accounts for different T/U for people in same logbook entry)
#