thermokarst/ccdb-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak Collections Label

Browse source
This commit is contained in:
Matthew Ryan Dillon 2016-02-03 11:45:29 -07:00
parent e361ba26e2
commit f630cd9e11
3 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ccdb/collections_ccdb/models.py
View file

@ -76,10 +76,9 @@ class Collection(models.Model):
display_name = models.CharField(max_length=255, editable=False)
def save(self, *args, **kwargs):
self.display_name = "{} {} {} {} {} {}".format(self.project,
self.study_location, self.collection_start_date,
self.collection_end_date, self.collection_type,
self.collection_method)
self.display_name = "{}_{}_{}_{}".format(self.project,
self.collection_end_date.date(), self.study_location,
self.collection_type)
super(Collection, self).save(*args, **kwargs)
def __str__(self):
@ -88,6 +87,7 @@ class Collection(models.Model):
class Meta:
unique_together = ('project', 'study_location', 'collection_type',
'collection_start_date', 'collection_end_date', 'collection_method')
ordering = ['project', 'collection_end_date']
class DatasheetAttachment(models.Model):
@ -105,7 +105,8 @@ class CollectionTrap(models.Model):
time_closed = models.TimeField()
def __str__(self):
return "{collection} {number_of_traps} {date_opened} {date_closed}".format(self)
return "{} # Traps: {} {} {}".format(
self.collection, self.number_of_traps, self.date_opened, self.date_closed)
class Meta:
unique_together = ('collection', 'date_opened', 'time_opened', 'date_closed', 'time_closed')