Merge pull request #1298 from isb-cgc/sprint_34_elee_0612

Sprint 34 elee 0612
isb-cgc · Jun 18, 2019 · 51e1b65 · 51e1b65
2 parents 490287e + aa18465
commit 51e1b65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/static/js/visualizations/createOncogridPlot.js b/static/js/visualizations/createOncogridPlot.js
@@ -69,7 +69,7 @@ define (['jquery', 'oncogridjs'],
 
     var donorFill = function (d) {
         var fieldname = d.fieldName;
-        var data_value = d.value ? d.value.toLowerCase() : 'not reported';
+        var data_value = d.value ? (isNaN(d.value) ? d.value.toLowerCase() : d.value) : 'not reported';
         if (data_value === 'not reported')
             return 'white';
         var field_legend;

diff --git a/visualizations/oncogrid_data_views_v2.py b/visualizations/oncogrid_data_views_v2.py
@@ -132,7 +132,7 @@ def get_donor_data_list(bq_statement):
             age_at_diagnosis = row['f'][6]['v']
             days_to_death = row['f'][7]['v']
             data_category = row['f'][8]['v']
-            score = row['f'][9]['v']
+            score = int(row['f'][9]['v'])
             if case_barcode not in donors:
                 donors[case_barcode] = {
                     'case_code': project_short_name + ' / ' + case_barcode,