dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19365
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-06-11 16:45:23 +0200
message:
  GIS value parsing bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.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-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-06-09 14:00:51 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2015-06-11 14:45:23 +0000
@@ -512,13 +512,13 @@
 							layout: 'column',
 							iconCls: 'gis-window-title-icon-information',
 							cls: 'gis-container-default',
-							width: 460,
+							//width: 550,
 							height: 400, //todo
 							period: null,
 							items: [
 								{
 									cls: 'gis-container-inner',
-									columnWidth: 0.4,
+									width: 180,
 									bodyStyle: 'padding-right:4px',
 									items: function() {
 										var a = [];
@@ -569,7 +569,7 @@
 								{
 									xtype: 'form',
 									cls: 'gis-container-inner gis-form-widget',
-									columnWidth: 0.6,
+									//width: 360,
 									bodyStyle: 'padding-left:4px',
 									items: [
 										{
@@ -587,7 +587,7 @@
 											displayField: 'name',
 											emptyText: 'Select period',
 											forceSelection: true,
-											width: 258, //todo
+											width: 350, //todo
 											labelWidth: 70,
 											store: {
 												fields: ['id', 'name'],
@@ -656,10 +656,12 @@
                                                                 }
 
                                                                 // records
-                                                                for (var i = 0; i < r.rows.length; i++) {
+                                                                for (var i = 0, value; i < r.rows.length; i++) {
+                                                                    value = r.rows[i][valueIndex];
+
                                                                     records.push({
                                                                         name: r.metaData.names[r.rows[i][dxIndex]],
-                                                                        value: Ext.isNumeric ? parseFloat(r.rows[i][valueIndex]) : r.rows[i][valueIndex]
+                                                                        value: Ext.isNumeric(value) ? parseFloat(value) : value
                                                                     });
                                                                 }
 
@@ -674,7 +676,7 @@
 											xtype: 'grid',
 											cls: 'gis-grid plain',
 											height: 313, //todo
-											width: 258,
+											width: 350,
 											scroll: 'vertical',
 											columns: [
 												{
@@ -682,14 +684,14 @@
 													text: 'Data element',
 													dataIndex: 'name',
 													sortable: true,
-													width: 195
+													width: 200
 												},
 												{
 													id: 'value',
 													header: 'Value',
 													dataIndex: 'value',
 													sortable: true,
-													width: 63
+													width: 150
 												}
 											],
 											disableSelection: true,