From 1debb0849066a31c8538b529536a9a7a12a0a8f9 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Fri, 6 Apr 2018 10:21:35 +0000 Subject: See #308. Cytoscape and related is now loaded from Guix. Use the latest GN2_PROFILE. --- wqflask/utility/tools.py | 12 +++++++++--- wqflask/wqflask/templates/ctl_results.html | 22 ++++++++++++++-------- wqflask/wqflask/templates/network_graph.html | 28 ++++++++++++++++++---------- wqflask/wqflask/views.py | 10 +++++++++- 4 files changed, 50 insertions(+), 22 deletions(-) (limited to 'wqflask') diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py index 59bb49d8..ea216a35 100644 --- a/wqflask/utility/tools.py +++ b/wqflask/utility/tools.py @@ -285,10 +285,16 @@ TEMPDIR = tempdir() # defaults to UNIX TMPDIR assert_dir(TEMPDIR) # ---- Handle specific JS modules +JS_GUIX_PATH = get_setting("JS_GUIX_PATH") +assert_dir(JS_GUIX_PATH) +assert_dir(JS_GUIX_PATH+'/cytoscape-panzoom') +CSS_PATH = "UNKNOWN" +# assert_dir(JS_PATH) JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("Twitter-Post-Fetcher")) assert_dir(JS_TWITTER_POST_FETCHER_PATH) - -from six import string_types +assert_file(JS_TWITTER_POST_FETCHER_PATH+"/js/twitterFetcher_min.js") +JS_CYTOSCAPE_PATH = get_setting("JS_CYTOSCAPE_PATH",js_path("cytoscape")) +assert_dir(JS_CYTOSCAPE_PATH) +assert_file(JS_CYTOSCAPE_PATH+'/cytoscape.min.js') # assert_file(PHEWAS_FILES+"/auwerx/PheWAS_pval_EMMA_norm.RData") -assert_file(JS_TWITTER_POST_FETCHER_PATH+"/js/twitterFetcher_min.js") diff --git a/wqflask/wqflask/templates/ctl_results.html b/wqflask/wqflask/templates/ctl_results.html index 969ca18a..d85075a9 100644 --- a/wqflask/wqflask/templates/ctl_results.html +++ b/wqflask/wqflask/templates/ctl_results.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block css %} - + {% endblock %} {% block content %} - + {{ header("Network Graph") }}
@@ -39,7 +39,7 @@ {% endfor %} - + Correlation Coefficient ? @@ -69,9 +69,9 @@ - + - +

Download

@@ -102,11 +102,19 @@ - - - - - + + + + + + + + {% endblock %} diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index a65924d8..3c2cca94 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -54,7 +54,7 @@ from wqflask.ctl import ctl_analysis #from wqflask.trait_submission import submit_trait from utility import temp_data -from utility.tools import SQL_URI,TEMPDIR,USE_REDIS,USE_GN_SERVER,GN_SERVER_URL,GN_VERSION,JS_TWITTER_POST_FETCHER_PATH +from utility.tools import SQL_URI,TEMPDIR,USE_REDIS,USE_GN_SERVER,GN_SERVER_URL,GN_VERSION,JS_TWITTER_POST_FETCHER_PATH,JS_GUIX_PATH, CSS_PATH from utility.helper_functions import get_species_groups from base import webqtlFormData @@ -151,6 +151,14 @@ def tmp_page(img_path): return render_template("show_image.html", img_base64 = bytesarray ) +@app.route("/js/") +def js(filename): + return send_from_directory(JS_GUIX_PATH, filename) + +@app.route("/css/") +def css(filename): + return send_from_directory(CSS_PATH, filename) + @app.route("/twitter/") def twitter(filename): return send_from_directory(JS_TWITTER_POST_FETCHER_PATH, filename) -- cgit v1.2.3