aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/utility/helper_functions.py28
-rw-r--r--wqflask/wqflask/views.py11
2 files changed, 26 insertions, 13 deletions
diff --git a/wqflask/utility/helper_functions.py b/wqflask/utility/helper_functions.py
index 4ba92ed5..e0ae3414 100644
--- a/wqflask/utility/helper_functions.py
+++ b/wqflask/utility/helper_functions.py
@@ -4,19 +4,23 @@ from base.species import TheSpecies
from utility import hmac
-from flask import Flask, g
+from flask import g
import logging
-logger = logging.getLogger(__name__ )
+logger = logging.getLogger(__name__)
+
def get_species_dataset_trait(self, start_vars):
if "temp_trait" in list(start_vars.keys()):
- if start_vars['temp_trait'] == "True":
- self.dataset = data_set.create_dataset(dataset_name = "Temp", dataset_type = "Temp", group_name = start_vars['group'])
- else:
- self.dataset = data_set.create_dataset(start_vars['dataset'])
+ if start_vars['temp_trait'] == "True":
+ self.dataset = data_set.create_dataset(
+ dataset_name="Temp",
+ dataset_type="Temp",
+ group_name=start_vars['group'])
+ else:
+ self.dataset = data_set.create_dataset(start_vars['dataset'])
else:
- self.dataset = data_set.create_dataset(start_vars['dataset'])
+ self.dataset = data_set.create_dataset(start_vars['dataset'])
logger.debug("After creating dataset")
self.species = TheSpecies(dataset=self.dataset)
logger.debug("After creating species")
@@ -35,15 +39,17 @@ def get_trait_db_obs(self, trait_db_list):
for trait in trait_db_list:
data, _separator, hmac_string = trait.rpartition(':')
data = data.strip()
- assert hmac_string==hmac.hmac_creation(data), "Data tampering?"
+ assert hmac_string == hmac.hmac_creation(data), "Data tampering?"
trait_name, dataset_name = data.split(":")
if dataset_name == "Temp":
- dataset_ob = data_set.create_dataset(dataset_name=dataset_name, dataset_type="Temp", group_name=trait_name.split("_")[2])
+ dataset_ob = data_set.create_dataset(
+ dataset_name=dataset_name, dataset_type="Temp",
+ group_name=trait_name.split("_")[2])
else:
dataset_ob = data_set.create_dataset(dataset_name)
trait_ob = create_trait(dataset=dataset_ob,
- name=trait_name,
- cellid=None)
+ name=trait_name,
+ cellid=None)
if trait_ob:
self.trait_list.append((trait_ob, dataset_ob))
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 156b4772..36033d80 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -334,26 +334,33 @@ def intro():
return render_template("docs.html", **doc.__dict__)
-
@app.route("/tutorials")
def tutorials():
return render_template("tutorials.html")
+
@app.route("/credits")
def credits():
return render_template("credits.html")
+
@app.route("/update_text", methods=('POST',))
def update_page():
update_text(request.form)
doc = Docs(request.form['entry_type'], request.form)
return render_template("docs.html", **doc.__dict__)
+
@app.route("/submit_trait")
def submit_trait_form():
logger.info(request.url)
species_and_groups = get_species_groups()
- return render_template("submit_trait.html", **{'species_and_groups' : species_and_groups, 'gn_server_url' : GN_SERVER_URL, 'version' : GN_VERSION})
+ return render_template(
+ "submit_trait.html",
+ **{'species_and_groups': species_and_groups,
+ 'gn_server_url': GN_SERVER_URL,
+ 'version': GN_VERSION})
+
@app.route("/create_temp_trait", methods=('POST',))
def create_temp_trait():