Merge pull request #278 from edx/dsjen/stacked-bar-labels

Stacked bars will show all labels unless space is limited.

analytics_dashboard/static/js/views/bar-view.js

@@ -44,11 +44,14 @@ define(['d3', 'nvd3', 'underscore', 'utils/utils', 'views/chart-view'],
 
                 var barWidth = d3.select(self.options.barSelector).attr('width'),  // jshint ignore:line
                 // this is a rough estimate of how wide a character is
-                    chartWidth = 5,
-                    characterLimit = Math.floor(barWidth / chartWidth),
+                    charWidth = 6,
+                    characterLimit = Math.floor(barWidth / charWidth),
                     formattedLabel = d;
 
-                if (_(formattedLabel).size() > characterLimit) {
+                if (characterLimit < 3) {
+                    // no labels will be displayed if label space is limited
+                    formattedLabel = '';
+                } else if (_(formattedLabel).size() > characterLimit) {
                     formattedLabel = Utils.truncateText(d, characterLimit);
                 }
 

analytics_dashboard/static/js/views/stacked-bar-view.js

@@ -19,7 +19,8 @@ define(['nvd3', 'underscore', 'views/discrete-bar-view'],
 
                 chart.stacked(true)
                     .showControls(false)
-                    .showLegend(false);
+                    .showLegend(false)
+                    .reduceXTicks(false);  // shows all ticks
 
                 chart.tooltipContent(function(key, x, y, e) {
                     var tips = [];