diff --git a/planet/controllers/sequence.py b/planet/controllers/sequence.py index 69b10a6..163123a 100644 --- a/planet/controllers/sequence.py +++ b/planet/controllers/sequence.py @@ -52,6 +52,19 @@ def sequence_view(sequence_id): ) +@sequence.route('/tooltip/') +@cache.cached() +def sequence_tooltip(sequence_id): + """ + Get a sequence based on the ID and show the details for this sequence + + :param sequence_id: ID of the sequence + """ + current_sequence = Sequence.query.get_or_404(sequence_id) + + return render_template('tooltips/sequence.html', sequence=current_sequence) + + @sequence.route('/modal/coding/') def sequence_modal_coding(sequence_id): """ diff --git a/planet/models/expression/profiles.py b/planet/models/expression/profiles.py index 89d0423..21e2408 100644 --- a/planet/models/expression/profiles.py +++ b/planet/models/expression/profiles.py @@ -100,7 +100,7 @@ def get_heatmap(species_id, probes): else: values[o] = log(values[o]/row_mean, 2) - output.append({"name": name, "values": values}) + output.append({"name": name, "values": values, "sequence_id": profile.sequence_id}) return {'order': order, 'heatmap_data': output} diff --git a/planet/models/trees.py b/planet/models/trees.py index d094166..ab88a57 100644 --- a/planet/models/trees.py +++ b/planet/models/trees.py @@ -24,7 +24,8 @@ class Tree(db.Model): id = db.Column(db.Integer, primary_key=True) label = db.Column(db.String(50, collation=SQL_COLLATION), index=True) - data = db.Column(db.Text) + data_newick = db.Column(db.Text) + data_phyloxml = db.Column(db.Text) method_id = db.Column(db.Integer, db.ForeignKey('tree_methods.id'), index=True) cluster_id = db.Column(db.Integer, db.ForeignKey('coexpression_clusters.id'), index=True) diff --git a/planet/templates/admin/add/sequence_descriptions.html b/planet/templates/admin/add/sequence_descriptions.html index f4ffc4b..46a00b6 100644 --- a/planet/templates/admin/add/sequence_descriptions.html +++ b/planet/templates/admin/add/sequence_descriptions.html @@ -2,7 +2,7 @@ {% block body %} {% if form %} -

Add XRefs (to sequences)

+

Add Descriptions (to sequences)

diff --git a/planet/templates/base.html b/planet/templates/base.html index 1b6d268..fae7993 100644 --- a/planet/templates/base.html +++ b/planet/templates/base.html @@ -161,8 +161,46 @@ + - -