Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back dashboard (also the user login) #140

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5334fc9
update document for dashboard
hsiaoyi0504 May 22, 2018
9729e1b
blast in dashboard
hsiaoyi0504 May 22, 2018
4df2eeb
hmmer in dashboard
hsiaoyi0504 May 22, 2018
6ea1d5a
clustal in dashboard
hsiaoyi0504 May 22, 2018
b91062c
user authentication
Nov 28, 2017
a5ad778
fix bugs of organism checkbox
Dec 19, 2017
ccd297c
add migrations
hsiaoyi0504 Dec 22, 2017
a117fb5
fix bug of all-organism checkbox
Jan 2, 2018
085c124
updating migrations
childers Jan 4, 2018
48bec5f
fix path in dashboard.views and urls in dashboard templates
hsiaoyi0504 Jan 8, 2018
9cd58bc
use model name as url in suit menu setting
hsiaoyi0504 Jan 11, 2018
78186e5
fix user without login can see other query result
hsiaoyi0504 Jan 11, 2018
0359b8e
fix a if conditional in dashboard.views
hsiaoyi0504 Jan 11, 2018
3f81dc0
fix dashboard views.py logic
hsiaoyi0504 Jan 16, 2018
c7b672f
fix form in dashboard templates
hsiaoyi0504 Jan 16, 2018
73b474a
handle database file name with multiple dot when recovering the searc…
hsiaoyi0504 Jan 16, 2018
9000d67
add navbar and template inheritance
Jan 29, 2018
72e0ecc
fix issues in PR
Jan 30, 2018
b9c75f0
update syntax of importing css
hsiaoyi0504 Jan 30, 2018
ae1e588
solve menubar covers the main page.
Feb 11, 2018
fd575a2
run setup.py before migrate
hsiaoyi0504 May 11, 2018
a80c88b
fix migrations
hsiaoyi0504 May 11, 2018
085c576
remove codes for exception reporter filer, see https://docs.djangopro…
hsiaoyi0504 May 11, 2018
fbfebfd
Boolean field can only be True or False (can't be string)
hsiaoyi0504 May 12, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ matrix:

# command to install dependencies
install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install enchant; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install rabbitmq; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install memcached; fi
Expand Down Expand Up @@ -52,8 +53,9 @@ before_script:
- sudo chmod 666 /var/log/django/django.log
- sudo touch /var/log/django/i5k.log
- sudo chmod 666 /var/log/django/i5k.log
- sudo python2 manage.py migrate
- sudo python2 setup.py
- sudo python2 manage.py migrate
- sudo python2 manage.py collectstatic --noinput

# command to run tests
script:
Expand Down
9 changes: 9 additions & 0 deletions blast/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,12 @@ def get_model_perms(self, request):


admin.site.register(JbrowseSetting, JbrowseSettingAdmin)

class BlastSearchAdmin(admin.ModelAdmin):
list_display = ('task_id', 'sequence',)
search_fields = ('task_id', 'sequence',)
actions_on_top = True
actions_on_bottom = True
admin.site.register(BlastSearch, BlastSearchAdmin)


52 changes: 52 additions & 0 deletions blast/migrations/0007_auto_20180104_1513.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations, models
from django.conf import settings
import filebrowser.fields


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('blast', '0006_auto_20150410_1038'),
]

operations = [
migrations.CreateModel(
name='BlastSearch',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('task_id', models.CharField(max_length=50, null=True)),
('search_tag', models.CharField(max_length=64)),
('enqueue_date', models.DateTimeField()),
('sequence', models.TextField(null=True)),
('program', models.CharField(max_length=32)),
('soft_masking', models.BooleanField()),
('low_complexity', models.BooleanField()),
('penalty', models.IntegerField()),
('evalue', models.DecimalField(max_digits=10, decimal_places=5)),
('gapopen', models.IntegerField()),
('strand', models.CharField(max_length=10)),
('gapextend', models.IntegerField()),
('word_size', models.IntegerField()),
('reward', models.IntegerField()),
('max_target_seqs', models.IntegerField()),
('organisms', models.TextField(null=True)),
('matrix', models.CharField(max_length=10, null=True)),
('threshold', models.IntegerField(null=True)),
('user', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True)),
],
),
migrations.AlterField(
model_name='blastdb',
name='fasta_file',
field=filebrowser.fields.FileBrowseField(max_length=200, verbose_name=b'FASTA file path'),
),
migrations.AlterField(
model_name='blastdb',
name='organism',
field=models.ForeignKey(to='app.Organism'),
),
]
16 changes: 16 additions & 0 deletions blast/migrations/0008_merge_20180511_1254.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-05-11 16:54
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('blast', '0007_auto_20180104_1513'),
('blast', '0007_auto_20180104_1450'),
]

operations = [
]
28 changes: 28 additions & 0 deletions blast/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,3 +218,31 @@ class JbrowseSetting(models.Model):

def __unicode__(self):
return self.url

class BlastSearch(models.Model):
task_id = models.CharField(null=True, max_length=50)
search_tag = models.CharField(max_length=64)
enqueue_date = models.DateTimeField()
sequence = models.TextField(null=True)
program = models.CharField(max_length=32)
user = models.ForeignKey(User, null=True, blank=True)
soft_masking = models.BooleanField()
low_complexity = models.BooleanField()
penalty = models.IntegerField()
#tr_box = models.BooleanField(default=False)
#ga_box = models.BooleanField(default=False)
#pep_box = models.BooleanField(default=False)
evalue = models.DecimalField(max_digits=10, decimal_places=5)
gapopen = models.IntegerField()
strand = models.CharField(max_length=10)
gapextend = models.IntegerField()
word_size = models.IntegerField()
reward = models.IntegerField()
max_target_seqs = models.IntegerField()
organisms = models.TextField(null=True)
matrix = models.CharField(max_length=10, null=True)
threshold = models.IntegerField(null=True)

def __unicode__(self):
return self.search_tag

Loading