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

Fixing storage location code

Browse source
This commit is contained in:
Matthew Dillon 2016-01-30 15:54:10 -07:00
parent e5a3edb75e
commit e397e96dab
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ccdb/locations/admin.py
View file

@ -68,17 +68,16 @@ class StudyLocationAdmin(admin.ModelAdmin):
class StorageLocationAdmin(admin.ModelAdmin):
list_display = ('__str__', 'facility', 'building', 'room', 'freezer', 'temp_c',
list_display = ('code', 'facility', 'building', 'room', 'freezer', 'temp_c',
'description', 'sort_order')
list_display_links = ('__str__',)
search_fields = ('facility', 'building', 'room', 'freezer', 'temp_c',
'description')
list_display_links = ('code',)
search_fields = ('code', 'facility', 'building', 'room', 'freezer',
'temp_c', 'description')
list_per_page = 25
fields = ('facility', 'building', 'room', 'freezer', 'temp_c',
fields = ('code', 'facility', 'building', 'room', 'freezer', 'temp_c',
'description', 'sort_order')
admin.site.register(Region, RegionAdmin)
admin.site.register(Site, SiteAdmin)
admin.site.register(MunicipalLocation, MunicipalLocationAdmin)

1
ccdb/locations/migrations/0001_initial.py
View file

@ -60,6 +60,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('facility', models.CharField(max_length=100)),
('building', models.CharField(max_length=100)),
('code', models.CharField(max_length=100)),
('room', models.CharField(max_length=50, blank=True)),
('freezer', models.CharField(max_length=50, blank=True)),
('temp_c', models.IntegerField(null=True, blank=True)),

12
ccdb/locations/models.py
View file

@ -70,6 +70,7 @@ class StudyLocation(models.Model):
class StorageLocation(models.Model):
code = models.CharField(max_length=100)
facility = models.CharField(max_length=100)
building = models.CharField(max_length=100)
room = models.CharField(max_length=50, blank=True)
@ -79,16 +80,7 @@ class StorageLocation(models.Model):
sort_order = models.IntegerField(blank=True, null=True)
def __str__(self):
bldg = "".join(e[0].upper() for e in self.building.split())
temp_c = '20'
if self.temp_c:
temp_c = self.temp_c
freezer = 'No Freezer'
if self.freezer:
freezer = self.freezer
return " ".join([bldg, str(temp_c)+'C', str(freezer)])
return self.code
class Meta:
ordering = ['sort_order']