dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4882 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-07 15:05:55 +0200
message:
  (DV) Bugs fixed.
modified:
  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/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-07 10:33:31 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js	2011-10-07 13:02:10 +0000
@@ -193,7 +193,7 @@
                 getNames: function() {
                     var a = [];
                     DV.util.getCmp('multiselect[name="selectedIndicators"]').store.each( function(r) {
-                        a.push(r.data.shortName);
+                        a.push(r.data.shortName.replace(/\./g,''));
                     });
                     return a;
                 }
@@ -209,7 +209,7 @@
                 getNames: function() {
                     var a = [];
                     DV.util.getCmp('multiselect[name="selectedDataElements"]').store.each( function(r) {
-                        a.push(r.data.shortName);
+                        a.push(r.data.shortName.replace(/\./g,'')); 
                     });
                     return a;
                 }
@@ -510,7 +510,7 @@
             
             Ext.Array.each(DV.data.data, function(item) {
                 for (var i = 0; i < DV.state.series.data.length; i++) {
-                    for (var j = 0; i < DV.data.values.length; j++) {
+                    for (var j = 0; j < DV.data.values.length; j++) {
                         if (DV.data.values[j][DV.state.category.dimension] === item.x && DV.data.values[j][DV.state.series.dimension] === DV.state.series.data[i]) {
                             item[DV.data.values[j][DV.state.series.dimension]] = DV.data.values[j].v;
                             break;
@@ -546,7 +546,9 @@
                 animate: true,
                 store: DV.store.chart,
                 legend: {
-                    position: 'top'
+                    position: 'top',
+                    boxStroke: '#ffffff',
+                    boxStrokeWidth: 0
                 },
                 axes: [
                     {
@@ -1372,7 +1374,7 @@
                     }
                 }
             },
-            {   
+            {
                 region: 'center',
                 layout: 'fit',
                 bodyStyle: 'padding:10px',
@@ -1381,7 +1383,7 @@
                         xtype: 'button',
                         name: 'resize',
                         text: '<span style="font-weight:bold"><<<</span>',
-                        tooltip: 'Show/hide panel',                            
+                        tooltip: 'Show/hide panel',
                         handler: function() {
                             var p = DV.util.getCmp('panel[region="west"]');
                             if (p.collapsed) {