From a5647d41c8814d67a6c2f0e5d4c237b330899c97 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Tue, 5 May 2020 15:00:53 +0300 Subject: Add missing columns to db downloaded from AWS --- scripts/add_missing_columns.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 scripts/add_missing_columns.sh diff --git a/scripts/add_missing_columns.sh b/scripts/add_missing_columns.sh new file mode 100644 index 00000000..70d5fdeb --- /dev/null +++ b/scripts/add_missing_columns.sh @@ -0,0 +1,24 @@ + #! /bin/bash + # + # Add missing columns to test db downloaded from: + # https://s3.amazonaws.com/genenetwork2/db_webqtl_s.zip + + QUERY=" + ALTER TABLE InbredSet + ADD Family varchar(20) AFTER FullName, + ADD FamilyOrder varchar(20) AFTER Family, + ADD MenuOrderId smallint(6) AFTER FamilyOrder, + ADD InbredSetCode varchar(5) AFTER MenuOrderId; + + ALTER TABLE PublishXRef + ADD mean double AFTER DataId; + + -- This takes some time + ALTER TABLE ProbeSet + ADD UniProtID varchar(20) AFTER ProteinName; + " + + USER=gn2 + DBNAME=db_webqtl_s + PASS=mysql_password + mysql -u"$USER" -p"$PASS" -h localhost -D "$DBNAME" -e "$QUERY" -- cgit v1.2.3 From bb1f1608edb23d5e5be16b5c4573d7696d985aff Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Tue, 5 May 2020 15:17:52 +0300 Subject: Use GUIX javascript Datatables package --- wqflask/wqflask/templates/admin/group_manager.html | 2 +- wqflask/wqflask/templates/collections/list.html | 2 +- wqflask/wqflask/templates/collections/view.html | 2 +- wqflask/wqflask/templates/correlation_matrix.html | 2 +- wqflask/wqflask/templates/correlation_page.html | 2 +- wqflask/wqflask/templates/gsearch_gene.html | 2 +- wqflask/wqflask/templates/gsearch_pheno.html | 2 +- wqflask/wqflask/templates/mapping_results.html | 2 +- wqflask/wqflask/templates/pair_scan_results.html | 2 +- wqflask/wqflask/templates/search_result_page.html | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wqflask/wqflask/templates/admin/group_manager.html b/wqflask/wqflask/templates/admin/group_manager.html index ea9026a6..1c536cb2 100644 --- a/wqflask/wqflask/templates/admin/group_manager.html +++ b/wqflask/wqflask/templates/admin/group_manager.html @@ -46,7 +46,7 @@ {% block js %} - + diff --git a/wqflask/wqflask/templates/collections/list.html b/wqflask/wqflask/templates/collections/list.html index 3829b950..34224d68 100644 --- a/wqflask/wqflask/templates/collections/list.html +++ b/wqflask/wqflask/templates/collections/list.html @@ -66,7 +66,7 @@ {% block js %} - + diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html index 6639f46a..f7065cdb 100644 --- a/wqflask/wqflask/templates/collections/view.html +++ b/wqflask/wqflask/templates/collections/view.html @@ -166,7 +166,7 @@ - + diff --git a/wqflask/wqflask/templates/correlation_matrix.html b/wqflask/wqflask/templates/correlation_matrix.html index 9af52021..2a207c80 100644 --- a/wqflask/wqflask/templates/correlation_matrix.html +++ b/wqflask/wqflask/templates/correlation_matrix.html @@ -135,7 +135,7 @@ - + - + diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html index 556d46d3..555f9aa1 100644 --- a/wqflask/wqflask/templates/gsearch_gene.html +++ b/wqflask/wqflask/templates/gsearch_gene.html @@ -48,7 +48,7 @@ {% block js %} - + diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html index f6ffff47..ed892ec0 100644 --- a/wqflask/wqflask/templates/gsearch_pheno.html +++ b/wqflask/wqflask/templates/gsearch_pheno.html @@ -48,7 +48,7 @@ {% block js %} - + diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html index 7e05be18..a1ea6d89 100644 --- a/wqflask/wqflask/templates/mapping_results.html +++ b/wqflask/wqflask/templates/mapping_results.html @@ -333,7 +333,7 @@ - + diff --git a/wqflask/wqflask/templates/pair_scan_results.html b/wqflask/wqflask/templates/pair_scan_results.html index 1ccb2b27..38c0489c 100644 --- a/wqflask/wqflask/templates/pair_scan_results.html +++ b/wqflask/wqflask/templates/pair_scan_results.html @@ -65,7 +65,7 @@ - + diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 0f5c39b0..3cd51e2e 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -152,7 +152,7 @@ - + -- cgit v1.2.3 From 8df6a19e487e31dfa4a184444e8eace11cda9b15 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 6 May 2020 01:24:36 +0300 Subject: Replace CSS dependencies for datatables --- wqflask/utility/tools.py | 2 +- wqflask/wqflask/templates/collections/list.html | 2 +- wqflask/wqflask/templates/collections/view.html | 2 +- wqflask/wqflask/templates/corr_scatterplot.html | 2 +- wqflask/wqflask/templates/correlation_matrix.html | 2 +- wqflask/wqflask/templates/correlation_page.html | 2 +- wqflask/wqflask/templates/gsearch_gene.html | 2 +- wqflask/wqflask/templates/gsearch_pheno.html | 2 +- wqflask/wqflask/templates/mapping_results.html | 2 +- wqflask/wqflask/templates/pair_scan_results.html | 2 +- wqflask/wqflask/templates/search_error.html | 2 +- wqflask/wqflask/templates/search_result_page.html | 2 +- wqflask/wqflask/templates/show_trait.html | 2 +- wqflask/wqflask/templates/snp_browser.html | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py index 2914d354..89d88516 100644 --- a/wqflask/utility/tools.py +++ b/wqflask/utility/tools.py @@ -292,7 +292,7 @@ JS_GUIX_PATH = get_setting("JS_GUIX_PATH") assert_dir(JS_GUIX_PATH) assert_dir(JS_GUIX_PATH+'/cytoscape-panzoom') -CSS_PATH = "UNKNOWN" +CSS_PATH = JS_GUIX_PATH # The CSS is bundled together with the JS # assert_dir(JS_PATH) JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("javascript-twitter-post-fetcher")) diff --git a/wqflask/wqflask/templates/collections/list.html b/wqflask/wqflask/templates/collections/list.html index 34224d68..c8705c7d 100644 --- a/wqflask/wqflask/templates/collections/list.html +++ b/wqflask/wqflask/templates/collections/list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Your Collections{% endblock %} {% block css %} - + {% endblock %} diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html index f7065cdb..34734a01 100644 --- a/wqflask/wqflask/templates/collections/view.html +++ b/wqflask/wqflask/templates/collections/view.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}View Collection{% endblock %} {% block css %} - + {% endblock %} diff --git a/wqflask/wqflask/templates/corr_scatterplot.html b/wqflask/wqflask/templates/corr_scatterplot.html index ffc8244d..5877e367 100644 --- a/wqflask/wqflask/templates/corr_scatterplot.html +++ b/wqflask/wqflask/templates/corr_scatterplot.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block css %} - + diff --git a/wqflask/wqflask/templates/correlation_matrix.html b/wqflask/wqflask/templates/correlation_matrix.html index 2a207c80..cb9fb815 100644 --- a/wqflask/wqflask/templates/correlation_matrix.html +++ b/wqflask/wqflask/templates/correlation_matrix.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block css %} - + diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html index c4782bb9..b696a3fa 100644 --- a/wqflask/wqflask/templates/correlation_page.html +++ b/wqflask/wqflask/templates/correlation_page.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block css %} - + {% endblock %} diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html index 555f9aa1..8c261eec 100644 --- a/wqflask/wqflask/templates/gsearch_gene.html +++ b/wqflask/wqflask/templates/gsearch_gene.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Search Results{% endblock %} {% block css %} - + {% endblock %} {% block content %} diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html index ed892ec0..05b2f988 100644 --- a/wqflask/wqflask/templates/gsearch_pheno.html +++ b/wqflask/wqflask/templates/gsearch_pheno.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Search Results{% endblock %} {% block css %} - + {% endblock %} {% block content %} diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html index a1ea6d89..8699343f 100644 --- a/wqflask/wqflask/templates/mapping_results.html +++ b/wqflask/wqflask/templates/mapping_results.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Mapping Results{% endblock %} {% block css %} - + diff --git a/wqflask/wqflask/templates/pair_scan_results.html b/wqflask/wqflask/templates/pair_scan_results.html index 38c0489c..b13b393f 100644 --- a/wqflask/wqflask/templates/pair_scan_results.html +++ b/wqflask/wqflask/templates/pair_scan_results.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Pair Scan{% endblock %} {% block css %} - + diff --git a/wqflask/wqflask/templates/search_error.html b/wqflask/wqflask/templates/search_error.html index 7399b377..df8d9dff 100644 --- a/wqflask/wqflask/templates/search_error.html +++ b/wqflask/wqflask/templates/search_error.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Search Results{% endblock %} {% block css %} - + {% endblock %} {% block content %} diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 3cd51e2e..767e3487 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block title %}Search Results{% endblock %} {% block css %} - + diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index 27c3e398..d29be30b 100644 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -6,7 +6,7 @@ - + diff --git a/wqflask/wqflask/templates/snp_browser.html b/wqflask/wqflask/templates/snp_browser.html index 4422ba73..88cb4d31 100644 --- a/wqflask/wqflask/templates/snp_browser.html +++ b/wqflask/wqflask/templates/snp_browser.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block css %} - + -- cgit v1.2.3