Set up admin for project-level items
This commit is contained in:
parent
510568d53b
commit
db8d52ef68
3 changed files with 47 additions and 22 deletions
|
|
@ -1,7 +1,8 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from .models import CollectionType, CollectionMethod, Flaw, ADFGPermit, \
|
||||
DatasheetAttachment, CollectionTrap
|
||||
from .models import (CollectionType, CollectionMethod, Flaw, ADFGPermit,
|
||||
DatasheetAttachment, CollectionTrap, Collection)
|
||||
from ..species.models import CollectionSpecies
|
||||
|
||||
|
||||
class CollectionTypeAdmin(admin.ModelAdmin):
|
||||
|
|
@ -45,11 +46,25 @@ class DatasheetAttachmentAdmin(admin.ModelAdmin):
|
|||
|
||||
class CollectionTrapAdmin(admin.ModelAdmin):
|
||||
list_display = ('collection', 'number_of_traps', 'date_opened',
|
||||
'time_opened', 'date_closed', 'time_closed')
|
||||
'time_opened', 'date_closed', 'time_closed')
|
||||
list_display_links = ('number_of_traps',)
|
||||
list_per_page = 25
|
||||
fields = ('collection', 'number_of_traps', 'date_opened',
|
||||
'time_opened', 'date_closed', 'time_closed')
|
||||
'time_opened', 'date_closed', 'time_closed')
|
||||
|
||||
|
||||
class CollectionSpeciesInlineAdmin(admin.TabularInline):
|
||||
model = CollectionSpecies
|
||||
|
||||
|
||||
class CollectionAdmin(admin.ModelAdmin):
|
||||
inlines = (CollectionSpeciesInlineAdmin, )
|
||||
list_display = ('project', 'study_location', 'collection_end_date',
|
||||
'collection_type', 'collection_method')
|
||||
list_display_links = ('project', 'study_location', 'collection_end_date',
|
||||
'collection_type', 'collection_method')
|
||||
list_filter = ('project', 'study_location', 'collection_type',
|
||||
'collection_method')
|
||||
|
||||
|
||||
admin.site.register(CollectionType, CollectionTypeAdmin)
|
||||
|
|
@ -58,3 +73,4 @@ admin.site.register(Flaw, FlawAdmin)
|
|||
admin.site.register(ADFGPermit, ADFGPermitAdmin)
|
||||
admin.site.register(DatasheetAttachment, DatasheetAttachmentAdmin)
|
||||
admin.site.register(CollectionTrap, CollectionTrapAdmin)
|
||||
admin.site.register(Collection, CollectionAdmin)
|
||||
|
|
|
|||
|
|
@ -56,15 +56,18 @@ class Collection(models.Model):
|
|||
project = models.ForeignKey('projects.Project', related_name='collections')
|
||||
study_location = models.ForeignKey('locations.StudyLocation',
|
||||
related_name='collections')
|
||||
collection_type = models.ForeignKey(CollectionType, related_name='collections')
|
||||
collection_method = models.ForeignKey(CollectionMethod, related_name='collections')
|
||||
collection_type = models.ForeignKey(CollectionType,
|
||||
related_name='collections')
|
||||
collection_method = models.ForeignKey(CollectionMethod,
|
||||
related_name='collections')
|
||||
number_of_traps = models.IntegerField(blank=True, null=True)
|
||||
collection_start_date = models.DateField(blank=True, null=True)
|
||||
collection_start_time = models.TimeField(blank=True, null=True)
|
||||
collection_end_date = models.DateField(blank=True, null=True)
|
||||
collection_end_time = models.TimeField(blank=True, null=True)
|
||||
storage_location = models.ForeignKey('locations.StorageLocation', blank=True,
|
||||
null=True, related_name='collections')
|
||||
storage_location = models.ForeignKey('locations.StorageLocation',
|
||||
blank=True, null=True,
|
||||
related_name='collections')
|
||||
specimen_state = models.CharField(max_length=50, blank=True)
|
||||
process_type = models.ForeignKey('processing.ProcessType', blank=True,
|
||||
null=True, related_name='collections')
|
||||
|
|
@ -72,13 +75,15 @@ class Collection(models.Model):
|
|||
related_name='collections')
|
||||
adfg_permit = models.ForeignKey(ADFGPermit, blank=True, null=True,
|
||||
related_name='collections')
|
||||
flaw = models.ForeignKey(Flaw, blank=True, null=True, related_name='collections')
|
||||
flaw = models.ForeignKey(Flaw, blank=True, null=True,
|
||||
related_name='collections')
|
||||
display_name = models.CharField(max_length=255, editable=False)
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self.display_name = "{}_{}_{}_{}".format(self.project,
|
||||
self.collection_end_date, self.study_location,
|
||||
self.collection_type)
|
||||
self.collection_end_date,
|
||||
self.study_location,
|
||||
self.collection_type)
|
||||
super(Collection, self).save(*args, **kwargs)
|
||||
|
||||
def __str__(self):
|
||||
|
|
@ -86,14 +91,15 @@ class Collection(models.Model):
|
|||
|
||||
class Meta:
|
||||
unique_together = ('project', 'study_location', 'collection_type',
|
||||
'collection_start_date', 'collection_end_date', 'collection_method')
|
||||
'collection_start_date', 'collection_end_date',
|
||||
'collection_method')
|
||||
ordering = ['project', 'collection_end_date']
|
||||
|
||||
|
||||
class DatasheetAttachment(models.Model):
|
||||
collection = models.ForeignKey(Collection, related_name='datasheets')
|
||||
datasheet = models.FileField("Datasheet",
|
||||
upload_to='collections/datasheets/%Y/%m/%d')
|
||||
upload_to='collections/datasheets/%Y/%m/%d')
|
||||
|
||||
|
||||
class CollectionTrap(models.Model):
|
||||
|
|
@ -105,8 +111,10 @@ class CollectionTrap(models.Model):
|
|||
time_closed = models.TimeField()
|
||||
|
||||
def __str__(self):
|
||||
return "{} # Traps: {} {} {}".format(
|
||||
self.collection, self.number_of_traps, self.date_opened, self.date_closed)
|
||||
return "{} # Traps: {} {} {}".format(self.collection,
|
||||
self.number_of_traps,
|
||||
self.date_opened,
|
||||
self.date_closed)
|
||||
|
||||
class Meta:
|
||||
unique_together = ('collection', 'date_opened', 'time_opened',
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ class ProjectGrantInline(admin.TabularInline):
|
|||
|
||||
|
||||
class ProjectAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'code', 'iacuc_number', 'description', 'sort_order')
|
||||
list_display = ('name', 'code', 'iacuc_number', 'description',
|
||||
'sort_order')
|
||||
list_display_links = ('name',)
|
||||
search_fields = ('name', 'code', 'iacuc_number', 'description')
|
||||
list_per_page = 25
|
||||
|
|
@ -27,14 +28,14 @@ class GrantAdmin(admin.ModelAdmin):
|
|||
|
||||
|
||||
class GrantReportAdmin(admin.ModelAdmin):
|
||||
list_display = ('grant_title', 'title', 'report_type', 'description', 'due_date',
|
||||
'submitted_date', 'attachment', 'sort_order')
|
||||
list_display = ('grant_title', 'title', 'report_type', 'description',
|
||||
'due_date', 'submitted_date', 'attachment', 'sort_order')
|
||||
list_display_links = ('title',)
|
||||
search_fields = ('grant__title', 'title', 'report_type', 'description', 'due_date',
|
||||
'submitted_date', 'attachment')
|
||||
search_fields = ('grant__title', 'title', 'report_type', 'description',
|
||||
'due_date', 'submitted_date', 'attachment')
|
||||
list_per_page = 25
|
||||
fields = ('title', 'report_type', 'description', 'due_date',
|
||||
'submitted_date', 'attachment', 'sort_order')
|
||||
fields = ('grant', 'title', 'report_type', 'description', 'due_date',
|
||||
'submitted_date', 'attachment', 'sort_order')
|
||||
|
||||
def grant_title(self, obj):
|
||||
return obj.grant.title
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue