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

Remove unused Survey object

Browse Source
This commit is contained in:
Philip Sargent
2020-06-04 23:16:26 +01:00
parent 43c6e2f2e1
commit ac9ac5e397
5 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/models_caves.py
View File

@@ -559,26 +559,26 @@ def get_scan_path(instance, filename):
# 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)
# 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')