=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2011-12-21 11:19:47 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2011-12-21 13:57:22 +0000 @@ -76,17 +76,21 @@ public static final String TYPE_LINE3D = "line3d"; public static final String TYPE_PIE3D = "pie3d"; - public static final String TYPE_COLUMN = "column"; - public static final String TYPE_STACKED_COLUMN = "stackedColumn"; - public static final String TYPE_BAR = "bar"; - public static final String TYPE_STACKED_BAR = "stackedBar"; - public static final String TYPE_LINE = "line"; - public static final String TYPE_AREA = "area"; - public static final String TYPE_PIE = "pie"; - - public static final String DIMENSION_DATA = "data"; - public static final String DIMENSION_PERIOD = "period"; - public static final String DIMENSION_ORGANISATIONUNIT = "organisationUnit"; + public static final String SIZE_NORMAL = "normal"; + public static final String SIZE_WIDE = "wide"; + public static final String SIZE_TALL = "tall"; + + public static final String TYPE_COLUMN = "COLUMN"; + public static final String TYPE_STACKED_COLUMN = "STACKEDCOLUMN"; + public static final String TYPE_BAR = "BAR"; + public static final String TYPE_STACKED_BAR = "STACKEDBAR"; + public static final String TYPE_LINE = "LINE"; + public static final String TYPE_AREA = "AREA"; + public static final String TYPE_PIE = "PIE"; + + public static final String DIMENSION_DATA = "DATA"; + public static final String DIMENSION_PERIOD = "PERIOD"; + public static final String DIMENSION_ORGANISATIONUNIT = "ORGANISATIONUNIT"; private String domainAxixLabel; === 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-12-20 20:02:03 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-12-21 13:55:28 +0000 @@ -66,9 +66,9 @@ category: 'category', filter: 'filter', column: 'column', - column_stacked: 'column_stacked', + stackedcolumn: 'stackedcolumn', bar: 'bar', - bar_stacked: 'bar_stacked', + stackedbar: 'stackedbar', line: 'line', area: 'area', pie: 'pie' @@ -114,8 +114,8 @@ DV.init.initialize = function() { DV.util.combobox.filter.category(); DV.store.column = DV.store.defaultChartStore; - DV.store.column_stacked = DV.store.defaultChartStore; - DV.store.bar_stacked = DV.store.bar; + DV.store.stackedcolumn = DV.store.defaultChartStore; + DV.store.stackedbar = DV.store.bar; DV.store.line = DV.store.defaultChartStore; DV.store.area = DV.store.defaultChartStore; DV.store.pie = DV.store.defaultChartStore; @@ -705,6 +705,7 @@ var store = DV.store.favorite; params.uid = store.getAt(store.findExact('name', params.name)).data.id; } + Ext.Ajax.request({ url: DV.conf.finals.ajax.path_visualizer + DV.conf.finals.ajax.favorite_addorupdate, params: params, @@ -978,10 +979,10 @@ }, getParams: function() { var obj = {}; - obj.type = this.type; - obj.series = this.series.dimension; - obj.category = this.category.dimension; - obj.filter = this.filter.dimension; + obj.type = this.type.toUpperCase(); + obj.series = this.series.dimension.toUpperCase(); + obj.category = this.category.dimension.toUpperCase(); + obj.filter = this.filter.dimension.toUpperCase(); obj.indicatorIds = this.indicatorIds; obj.dataElementIds = this.dataelementIds; obj.organisationUnitIds = this.organisationunitIds; @@ -1003,6 +1004,11 @@ } var f = Ext.JSON.decode(r.responseText), indiment = []; + f.type = f.type.toLowerCase(); + f.series = f.series.toLowerCase(); + f.category = f.category.toLowerCase(); + f.filter = f.filter.toLowerCase(); + f.names = { data: [], period: [], @@ -1217,7 +1223,7 @@ ] }); }, - column_stacked: function() { + stackedcolumn: function() { this.column(true); }, bar: function(stacked) { @@ -1259,7 +1265,7 @@ ] }); }, - bar_stacked: function() { + stackedbar: function() { this.bar(true); }, line: function() { @@ -1480,7 +1486,7 @@ { xtype: 'button', icon: 'images/column-stacked.png', - name: DV.conf.finals.chart.column_stacked, + name: DV.conf.finals.chart.stackedcolumn, tooltip: 'Stacked column chart', width: 40 }, @@ -1494,7 +1500,7 @@ { xtype: 'button', icon: 'images/bar-stacked.png', - name: DV.conf.finals.chart.bar_stacked, + name: DV.conf.finals.chart.stackedbar, tooltip: 'Stacked bar chart', width: 40 },