Merge pull request #133 from jpmorganchase/date-category-axis

Fixed datetime category axes
finos · Jun 11, 2018 · 8143f56 · 8143f56
2 parents d9a6703 + d417b77
commit 8143f56
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/perspective-viewer-highcharts/src/js/draw.js b/packages/perspective-viewer-highcharts/src/js/draw.js
@@ -48,10 +48,10 @@ export const draw = (mode) => async function(el, view, task) {
         xaxis_type = schema[xaxis_name],
         yaxis_name = aggregates.length > 1 ? aggregates[1].column : undefined,
         yaxis_type = schema[yaxis_name],
-        // xtree_name = row_pivots.length > 0 ? row_pivots[row_pivots.length - 1] : undefined,
-        xtree_type = tschema[xaxis_name],
-        //ytree_name = col_pivots.length > 1 ? col_pivots[col_pivots.length - 1] : undefined,
-        ytree_type = tschema[yaxis_name],
+        xtree_name = row_pivots.length > 0 ? row_pivots[row_pivots.length - 1] : undefined,
+        xtree_type = tschema[xtree_name],
+        ytree_name = col_pivots.length > 1 ? col_pivots[col_pivots.length - 1] : undefined,
+        ytree_type = tschema[ytree_name],
         num_aggregates = aggregates.length - hidden.length;
 
     if (mode === 'scatter') {