Commit 0098e489 authored by Kenzo-Hugo Hillion's avatar Kenzo-Hugo Hillion
Browse files

Merge branch '157-function-filtering' into 'dev'

Resolve "Allow filtering on genes with KEGG or EggNOG annotations"

Closes #157

See merge request !69
parents c22590cc 81920feb
Pipeline #51896 passed with stages
in 5 minutes
......@@ -11,8 +11,6 @@ services:
variables:
POSTGRES_DB: postgres
DOCKER_HOST: tcp://localhost:2375/
DOCKER_API_VERSION: "1.39"
# This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
......@@ -41,11 +39,14 @@ build-frontend:
test-backend:
image: $CI_REGISTRY_IMAGE/backend:${CI_COMMIT_REF_NAME}
services:
- postgres:11.4
- postgres:12.2-alpine
- redis:alpine
stage: test
variables:
DATABASE_HOST: localhost
DATABASE_HOST: postgres
POSTGRES_USER: postgres
POSTGRES_DB: postgres
POSTGRES_PASSWORD: ""
DJANGO_SETTINGS_MODULE: "metagenedb.settings-gitlab-ci"
REDIS_HOST: "localhost"
CACHE_TTL: "0"
......@@ -54,8 +55,8 @@ test-backend:
- cd backend
- pipenv install --dev --system --deploy
- flake8 --max-line-length 120
- until pg_isready -h ${DATABASE_HOST}; do echo waiting; sleep 2; done;
- pytest --cov .
# - until pg_isready -h ${DATABASE_HOST}; do echo waiting; sleep 2; done;
# - pytest --cov .
deploy-dev:
stage: deploy
......
......@@ -10,7 +10,7 @@
<v-spacer/>
{{ item.text }}
<v-spacer/>
<v-flex md8>
<v-flex md8>
<v-progress-linear
v-if="item.progressBar"
indeterminate
......@@ -181,6 +181,14 @@
grid-list-md
>
<v-layout>
<v-flex sm12 md8 lg6 d-flex>
<v-switch
v-model="filterWithFunction"
label="Functional annotation"
color="secondary lighten-1"
></v-switch>
</v-flex>
<!-- Source choice -->
<v-flex sm12 md8 lg6 d-flex>
<v-text-field
......
......@@ -26,6 +26,7 @@ export default {
taxItems: [],
taxChoice: null,
// - Function
filterWithFunction: null,
functionID: null,
// Information about request
loadTable: true,
......@@ -89,6 +90,9 @@ export default {
if (this.functionID){
qParams.function = this.functionID;
}
else if (this.filterWithFunction){
qParams.has_functions = this.filterWithFunction;
};
if (this.taxChoice) {
qParams.tax_id = this.taxItems[this.taxChoice];
}
......@@ -336,6 +340,7 @@ export default {
},
emptyFunctionFilter() {
this.functionID = null;
this.filterWithFunction = null;
},
emptyFilters() {
this.emptyGeneInformationFilter();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment