Skip to content

Commit

Permalink
batch import sequences
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosp420 committed Aug 28, 2015
1 parent 6d21b0a commit 7225209
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 10 additions & 3 deletions voseq/public_interface/admin.py
Expand Up @@ -30,7 +30,6 @@ class FlickImageInLine(admin.StackedInline):


class BatchImportVouchersResource(resources.ModelResource):

class Meta:
model = Vouchers
import_id_fields = ('code',)
Expand All @@ -44,6 +43,14 @@ class Meta:
)


class BatchImportSequencesResource(resources.ModelResource):
class Meta:
model = Sequences
import_id_fields = ('code', 'gene_code')
fields = ('code', 'gene_code', 'sequences', 'accession', 'labPerson', 'genbank',
'notes')


# Customize what and the way you show it
class VouchersAdmin(ImportExportModelAdmin):
import_template_name = 'admin/public_interface/vouchers/batch_import.html'
Expand Down Expand Up @@ -101,16 +108,16 @@ def batch_changes(self, request, queryset):
inlines.append(FlickImageInLine)
else:
inlines.append(ImageInLine)

resource_class = BatchImportVouchersResource


class SequencesAdmin(admin.ModelAdmin):
class SequencesAdmin(ImportExportModelAdmin):
# TODO let users know that code and genecode keywords act as AND boolean search
search_fields = ['=code__code', '=gene_code']
list_display = ['code', 'gene_code', 'genbank', 'accession', 'labPerson', 'notes', 'time_edited', 'time_created']
fields = ['code', 'gene_code', 'sequences', 'genbank', 'accession', 'labPerson', 'notes']
form = SequencesAdminForm
resource_class = BatchImportSequencesResource


class TaxonSetsAdmin(admin.ModelAdmin):
Expand Down
2 changes: 1 addition & 1 deletion voseq/public_interface/models.py
Expand Up @@ -233,7 +233,7 @@ class Sequences(models.Model):
time_created = models.DateTimeField(auto_now_add=True, null=True, blank=True)
time_edited = models.DateTimeField(auto_now=True, null=True, blank=True)
notes = models.TextField(blank=True)
genbank = models.BooleanField()
genbank = models.NullBooleanField()
total_number_bp = models.IntegerField(blank=True, null=True)
number_ambiguous_bp = models.IntegerField(blank=True, null=True)

Expand Down

0 comments on commit 7225209

Please sign in to comment.