dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4896 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-10-11 15:22:36 +0200
message:
  (DV) Bug fixed: No chart shown for last5years.
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/InitializeAction.java
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/InitializeAction.java'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/InitializeAction.java	2011-09-29 13:48:07 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/InitializeAction.java	2011-10-11 12:11:00 +0000
@@ -183,6 +183,9 @@
         
         rp.clear().setLastYear( true );
         lastYear = periodService.reloadPeriods( setNames( rp.getRelativePeriods() ) );
+        
+        rp.clear().setLast5Years( true );
+        lastFiveYears = periodService.reloadPeriods( setNames( rp.getRelativePeriods() ) );
 
         return SUCCESS;
     }

=== 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-11 11:21:03 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-11 13:19:20 +0000
@@ -406,13 +406,16 @@
             this[DV.state.type](exe);
         },
         defaultChartStore: function(exe) {
-            var properties = Ext.Object.getKeys(DV.data.data[0]);
+            var keys = [];
+            Ext.Array.each(DV.data.data, function(item) {
+                keys = Ext.Array.merge(keys, Ext.Object.getKeys(item));
+            });
             this.chart = Ext.create('Ext.data.Store', {
-                fields: properties,
+                fields: keys,
                 data: DV.data.data
             });
-            this.chart.bottom = properties.slice(0, 1);
-            this.chart.left = properties.slice(1, properties.length);
+            this.chart.bottom = keys.slice(0, 1);
+            this.chart.left = keys.slice(1, keys.length);
             
             if (exe) {
                 DV.chart.getChart(true);
@@ -627,7 +630,7 @@
                         }
                     },
                     {
-                        title: this.isInit() ? 'Category dimension' : DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
+                        title: this.isInit() ? 'Categories' : DV.conf.finals.dimension[DV.state.category.dimension].rawvalue,
                         type: 'Category',
                         position: 'bottom',
                         fields: DV.store.chart.bottom
@@ -1404,13 +1407,13 @@
                                                     {
                                                         xtype: 'checkbox',
                                                         paramName: 'monthsThisYear',
-                                                        boxLabel: 'Months this year'
+                                                        boxLabel: 'Months this year',
+                                                        checked: true
                                                     },
                                                     {
                                                         xtype: 'checkbox',
                                                         paramName: 'monthsLastYear',
-                                                        boxLabel: 'Months last year',
-                                                        checked: true
+                                                        boxLabel: 'Months last year'
                                                     }
                                                 ]
                                             },