=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-10 12:12:21 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-10 16:06:24 +0000
@@ -31,7 +31,9 @@
             category: 'category',
             filter: 'filter',
             column: 'column',
+            column_stacked: 'column_stacked',
             bar: 'bar',
+            bar_stacked: 'bar_stacked',
             line: 'line',
             area: 'area',
             pie: 'pie'
@@ -574,7 +576,7 @@
                 return this.chart;
             }
         },
-        column: function() {
+        column: function(stacked) {
             this.chart = Ext.create('Ext.chart.Chart', {
                 width: DV.util.viewport.getSize().x,
                 height: DV.util.viewport.getSize().y,
@@ -608,6 +610,7 @@
                         axis: 'left',
                         xField: DV.store.chart.bottom,
                         yField: DV.store.chart.left,
+                        stacked: stacked,
                         style: {
                             opacity: 0.8
                         }
@@ -615,7 +618,10 @@
                 ]
             });
         },
-        bar: function() {
+        column_stacked: function() {
+            this.column(true);
+        },
+        bar: function(stacked) {
             this.chart = Ext.create('Ext.chart.Chart', {
                 width: DV.util.viewport.getSize().x,
                 height: DV.util.viewport.getSize().y,
@@ -649,6 +655,7 @@
                         axis: 'bottom',
                         xField: DV.store.chart.left,
                         yField: DV.store.chart.bottom,
+                        stacked: stacked,
                         style: {
                             opacity: 0.8
                         }
@@ -656,6 +663,9 @@
                 ]
             });
         },
+        bar_stacked: function() {
+            this.bar(true);
+        },
         line: function() {
             this.chart = Ext.create('Ext.chart.Chart', {
                 width: DV.util.viewport.getSize().x,
@@ -721,7 +731,7 @@
                     xField: DV.store.chart.bottom[0],
                     yField: DV.store.chart.left,
                     style: {
-                        opacity: 0.6
+                        opacity: 0.65
                     }
                 }]
             });
@@ -754,6 +764,9 @@
                         segment: {
                             margin: 10
                         }
+                    },
+                    style: {
+                        opacity: 0.9
                     }
                 }]
             });
@@ -809,11 +822,21 @@
                                 pressed: true
                             },
                             {
+                                icon: 'images/column-stacked.png',
+                                name: DV.conf.finals.chart.column_stacked,
+                                tooltip: 'Stacked column chart'
+                            },
+                            {
                                 icon: 'images/bar.png',
                                 name: DV.conf.finals.chart.bar,
                                 tooltip: 'Bar chart'
                             },
                             {
+                                icon: 'images/bar-stacked.png',
+                                name: DV.conf.finals.chart.bar_stacked,
+                                tooltip: 'Stacked bar chart'
+                            },
+                            {
                                 icon: 'images/line.png',
                                 name: DV.conf.finals.chart.line,
                                 tooltip: 'Line chart'
@@ -1586,6 +1609,8 @@
                 c.filter(c, vp);
                 
                 DV.store.column = DV.store.defaultChartStore;
+                DV.store.column_stacked = DV.store.defaultChartStore;
+                DV.store.bar_stacked = DV.store.bar;
                 DV.store.line = DV.store.defaultChartStore;
                 DV.store.area = DV.store.defaultChartStore;
                 DV.store.pie = DV.store.defaultChartStore;

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/area.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/area.png	2011-10-10 09:47:19 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/area.png	2011-10-10 16:03:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/bar-stacked.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/bar-stacked.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/bar-stacked.png	2011-10-10 16:03:13 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/bar.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/bar.png	2011-10-04 15:49:35 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/bar.png	2011-10-10 16:03:13 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/column-stacked.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/column-stacked.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/column-stacked.png	2011-10-10 16:03:13 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/column.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/column.png	2011-09-30 15:07:44 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/column.png	2011-10-10 16:03:13 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/line.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/line.png	2011-10-10 09:47:19 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/line.png	2011-10-10 16:03:13 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png	2011-10-10 12:12:21 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/pie.png	2011-10-10 16:03:13 +0000 differ