added NA for heatmap

proost · Sep 12, 2017 · c02fea3 · c02fea3
1 parent 0739c00
commit c02fea3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/planet/controllers/heatmap.py b/planet/controllers/heatmap.py
@@ -93,7 +93,7 @@ def heatmap_inchlib_json(cluster_id):
             "nodes": {a["name"]: {
                 "count": 1,
                 "distance": 0,
-                "features": [round(a["values"][o], 3) for o in current_heatmap["order"]],
+                "features": [round(a["values"][o], 3) if a["values"][o] != '-' else None for o in current_heatmap["order"]],
                 "objects": [a["name"]]
             } for a in current_heatmap['heatmap_data']},
             "feature_names": [o for o in current_heatmap["order"]]

diff --git a/planet/models/expression/profiles.py b/planet/models/expression/profiles.py
@@ -128,7 +128,7 @@ def get_heatmap(species_id, probes):
 
             for o in order:
                 if row_mean == 0 or values[o] == 0:
-                    values[o] = 0
+                    values[o] = '-'
                 else:
                     values[o] = log(values[o]/row_mean, 2)
 

diff --git a/planet/templates/expression_heatmap.html b/planet/templates/expression_heatmap.html
@@ -67,7 +67,7 @@ <h1>Heatmap</h1>
                     <td><div><span>{{ p.name }}</span></div></td>
                     {% endif %}
                     {% for o in order %}
-                    <td class="value">{{ p['values'][o]|round(2) }}</td>
+                    <td class="value">{% if p['values'][o] != '-' %}{{ p['values'][o]|round(2) }}{% else %}-{% endif %}</td>
                     {% endfor %}
                 </tr>
             {% endfor %}