Added Support for Stacked Bar Chart and Column Chart for YUI

demo_project/demo/templates/demo/yui.html

@@ -69,6 +69,22 @@ <h2>Column Chart</h2>
             chart = yui.ColumnChart(data_source, options={'title': "Sales/ Expense"})
     </div>
 
+  <br />
+
+    <h2> Stacked Column Chart</h2>
+    <div id="column_chart" class="well">
+        {{ stacked_column_chart.as_html }}
+        <pre class="code">
+            data = [
+                   ['Year', 'Sales', 'Expenses', 'Items Sold', 'Net Profit'],
+                   ['2004', 1000, 400, 100, 600],
+                   ['2005', 1170, 460, 120, 310],
+                   ['2006', 660, 1120, 50, -460],
+                   ['2007', 1030, 540, 100, 200],
+                   ]
+            data_source = SimpleDataSource(data)
+            chart = yui.StackedColumnChart(data_source, options={'title': "Sales/ Expense"})
+    </div>
     <br />
 
     <h2>Bar Chart</h2>
@@ -79,11 +95,27 @@ <h2>Bar Chart</h2>
 			chart = yui.BarChart(data_source, options={'title': "Expense Growth"})
         </pre>
     </div>
+   <br />
+
+    <h2>Stacked Bar Chart</h2>
+    <div id="stacked_bar_chart" class="well">
+        {{ stacked_bar_chart.as_html }}
+        <pre class="code">
+            data = [
+                   ['Year', 'Sales', 'Expenses', 'Items Sold', 'Net Profit'],
+                   ['2004', 1000, 400, 100, 600],
+                   ['2005', 1170, 460, 120, 310],
+                   ['2006', 660, 1120, 50, -460],
+                   ['2007', 1030, 540, 100, 200],
+                   ]
+            data_source = SimpleDataSource(data)
+            chart = yui.StackedBarChart(data_source, options={'title': "Sales/ Expense"})
+    </div>
     <br />
 
     <h2>Candlestick Chart</h2>
     <div id="candlestick_chart" class="well">
-        {{ candlestick_chart.as_html }}
+        {{ candlestick_chart.as_html}}
     </div>
 
     <h2>Pie Chart</h2>

demo_project/demo/views.py

@@ -221,10 +221,17 @@ def get_context_data(self, **kwargs):
                                       fields=['year', 'sales'])
         area_chart = self.renderer.AreaChart(data_source)
         area_spline_chart = self.renderer.AreaSplineChart(data_source)
+        simple_data_source = SimpleDataSource(data=data)
+        stacked_bar_chart = self.renderer.StackedBarChart(simple_data_source,
+                                           options={'title': "Expense Growth"})
+        stacked_column_chart = self.renderer.StackedColumnChart(simple_data_source,
+                                                          options={'title': "Sales/ Expense"})
         spline_chart = self.renderer.SplineChart(SimpleDataSource(data=data))
         context.update({'area_chart': area_chart,
                         'area_spline_chart': area_spline_chart,
-                        'spline_chart': spline_chart})
+                        'spline_chart': spline_chart,
+                        'stacked_column_chart': stacked_column_chart,
+                        'stacked_bar_chart': stacked_bar_chart})
         return context
 
 yui_demo = YUIDemo.as_view(renderer=yui)

graphos/renderers/yui.py

@@ -41,6 +41,12 @@ def get_js_template(self):
     def get_chart_type(self):
         return "bar"
 
+class StackedBarChart(BaseYuiChart):
+    def get_js_template(self):
+        return "graphos/yui/stacked_bar_chart.html"
+
+    def get_chart_type(self):
+        return "bar"
 
 class ColumnChart(BaseYuiChart):
     def get_js_template(self):
@@ -49,6 +55,12 @@ def get_js_template(self):
     def get_chart_type(self):
         return "column"
 
+class StackedColumnChart(BaseYuiChart):
+    def get_js_template(self):
+        return "graphos/yui/stacked_column_chart.html"
+
+    def get_chart_type(self):
+        return "column"
 
 class PieChart(BaseYuiChart):
     def get_js_template(self):

graphos/templates/graphos/yui/base_stacked.html

@@ -0,0 +1,18 @@
+<script>
+// Create a new YUI instance and populate it with the required modules.
+YUI().use('charts', function (Y) {
+    var datasets = {{ chart.get_data_json|safe }};
+
+    {% block yui_chart_type %}
+        // Instantiate and render the chart
+        var mychart = new Y.Chart({
+            dataProvider: datasets,
+            render: "#{{ chart.get_html_id }}",
+            type: "{{chart.get_chart_type}}",
+            categoryKey:"{{ chart.get_category_key }}",
+            styles: {{ chart.get_options_json|safe }},
+            stacked:true
+        });
+    {% endblock %}
+});
+</script>

graphos/templates/graphos/yui/stacked_bar_chart.html

@@ -0,0 +1 @@
+{% extends "graphos/yui/base_stacked.html" %}

graphos/templates/graphos/yui/stacked_column_chart.html

@@ -0,0 +1 @@
+{% extends "graphos/yui/base_stacked.html" %}