diff options
| author | Zachary Sloan | 2012-10-11 18:04:27 -0500 |
|---|---|---|
| committer | Zachary Sloan | 2012-10-11 18:04:27 -0500 |
| commit | f44e0255f19fc581d4ae9f2ad253f01068508d90 (patch) | |
| tree | 0b2740af98f4e7ac073f30e98432474a7fd3be75 | |
| parent | 8f5a9ab89a77890ee620bed882fcecff63594392 (diff) | |
| download | genenetwork2-f44e0255f19fc581d4ae9f2ad253f01068508d90.tar.gz | |
Worked with the export code and Sam worked on a redesigned index page
| -rw-r--r-- | wqflask/wqflask/show_trait/export_trait_data.py | 10 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/new_index_page.html | 122 |
2 files changed, 73 insertions, 59 deletions
diff --git a/wqflask/wqflask/show_trait/export_trait_data.py b/wqflask/wqflask/show_trait/export_trait_data.py index 7c77f1c1..b1444440 100644 --- a/wqflask/wqflask/show_trait/export_trait_data.py +++ b/wqflask/wqflask/show_trait/export_trait_data.py @@ -8,8 +8,16 @@ from pprint import pformat as pf def export_sample_table(targs): #print("* keys0 args is:", targs[0].keys()) + + test_export_file = open("/home/zas1024/gene/wqflask/wqflask/show_trait/export_test.txt", "w") + for key, item in targs.iteritems(): print("[arrow] key is:", key) sample_data = json.loads(targs['json_data']) - print("sample_data is:", pf(sample_data))
\ No newline at end of file + + print("primary_samples is:", pf(sample_data['primary_samples'])) + + for key in sample_data['primary_samples'][0]: + test_export_file.write(key + ",") + test_export_file.write("\n")
\ No newline at end of file diff --git a/wqflask/wqflask/templates/new_index_page.html b/wqflask/wqflask/templates/new_index_page.html index 46839690..85c63b3f 100644 --- a/wqflask/wqflask/templates/new_index_page.html +++ b/wqflask/wqflask/templates/new_index_page.html @@ -1,85 +1,91 @@ <head> <title>GeneNetwork</title> - - <LINK REL="stylesheet" TYPE="text/css" HREF='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css'> <link REL="stylesheet" TYPE="text/css" href="/static/packages/bootstrap/css/bootstrap.min.css" /> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> - <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script> <script src="/static/packages/bootstrap/js/bootstrap.min.js"></script> </head> <body> <div class="container"> - <h2>Select and Search</h2> - - <form method="get" action="/search" class="form-search" name="SEARCHFORM"> + + <div class="hero-unit"> + <h1>Gene Network</h1> + </div> + <div> + <form method="get" action="/search" name="SEARCHFORM"> <fieldset> + <legend>Select and Search</legend> <label for="species">Species:</label> <select name="species" size="1" id="species" onchange="fillOptions('species');"> </select> - - - <label for="cross">Group:</label> - <select name="cross" id="cross" onchange="fillOptions('cross');"> - </select> <input type="button" class="btn" value="Info" onclick= - "javascript:crossinfo();"> - + + <div class="input-append"> + <label for="cross">Group: </label> + <select name="cross" id="cross" onchange="fillOptions('cross');"> + </select> + <i class="icon-question-sign"></i> + <!--<input type="button" class="btn" value="Info" onclick=--> + <!-- "javascript:crossinfo();" />--> + </div> + + <label for="type">Type:</label> <select name="tissue" id="tissue" onchange= - "fillOptions('tissue');"> - - <label for"database">Database:</label> - <select name="database" id="database"> - </select> - - <input type="submit" class="btn" value="Info" name="info_database"> - + "fillOptions('tissue');"></select> + + + <div class="input-append"> + <label for="database">Database:</label> + <select name="database" id="database"> + </select> <input type="button" class="btn" value="Info" name="info_database" /> + </div> <!-- USER HELP --> - - - <p class="fs12">Databases marked with <b>**</b> - suffix are not public yet.<br> - Access requires <a href="/account.html" target= - "_blank" class="fs14">user login</a>.</p> - + + + <!--<p >Databases marked with <b>**</b>--> + <!-- suffix are not public yet.<br>--> + <!-- Access requires <a href="/account.html" target=--> + <!-- "_blank" class="fs14">user login</a>.</p>--> + <!-- GET ANY SEARCH --> - + <label for="tfor">Search:</label> - - <input class="search-query" - id="tfor" name="ORkeyword" - type="text" maxlength="500"> - - <!-- GET ANY HELP --> - - Enter terms, genes, ID numbers in the - <b>Search</b> field.<br> - Use <b>*</b> or <b>?</b> wildcards (Cyp*a?, - synap*).<br> - Use <b>quotes</b> for terms such as <i>"tyrosine - kinase"</i>.</p> - - <!-- SEARCH, MAKE DEFAULT, ADVANCED SEARCH --> - - - <input id="btsearch" type="submit" - class="btn btn-primary" value="Search"> - - <input type= - "button" class="btn" value="Make Default" onclick= - "setDefault(this.form);"> - + + <input class="search-query" + id="tfor" name="ORkeyword" + type="text" maxlength="500"> + + <!-- GET ANY HELP --> + + </p>Enter terms, genes, ID numbers in the + <b>Search</b> field.<br> + Use <b>*</b> or <b>?</b> wildcards (Cyp*a?, + synap*).<br> + Use <b>quotes</b> for terms such as <i>"tyrosine + kinase"</i>.</p> + + <!-- SEARCH, MAKE DEFAULT, ADVANCED SEARCH --> + + + <input id="btsearch" type="submit" + class="btn btn-primary" value="Search"> + + <input type= + "button" class="btn" value="Make Default" onclick= + "setDefault(this.form);"> + <input type="button" class= "btn" value="Advanced Search" onclick= "javascript:window.open('/index3.html', '_self');"> - + <input type="hidden" name="FormID" value="searchResult"> <input type= "hidden" name="RISet" value="BXD"> </fieldset> </form> + </div> </div> - <script src="/javascript/selectDatasetMenu.js" - type="text/javascript"> - </script> -</body> + <!--<script src="/javascript/selectDatasetMenu.js"--> + <!--type="text/javascript">--> + <!--</script>--> +</body> |