dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 9746 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-02-06 00:39:00 +0100
message:
  (PT) Cache friendly params order + (GIS) Update bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic1.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2013-01-10 15:19:14 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/core.js	2013-02-05 23:26:21 +0000
@@ -1069,6 +1069,8 @@
 			}
 			return gis.conf.finals.widget.loadtype_organisationunit;
 		}
+
+        gis.olmap.mask.hide();
 	};
 
     loadOrganisationUnits = function(view) {
@@ -1284,6 +1286,8 @@
 				return gis.conf.finals.widget.loadtype_legend;
 			}
 		}
+
+        gis.olmap.mask.hide();
 	};
 
     loadOrganisationUnits = function(view) {
@@ -1572,6 +1576,8 @@
 			}
 			return gis.conf.finals.widget.loadtype_legend;
 		}
+
+        gis.olmap.mask.hide();
 	};
 
     loadOrganisationUnits = function(view) {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic1.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic1.js	2013-02-05 20:19:14 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic1.js	2013-02-05 23:26:21 +0000
@@ -238,7 +238,6 @@
 			config = this.getLegendConfig();
 
         for (var key in config) {
-console.log(key, config[key]);
 			if (config.hasOwnProperty(key)) {
 				child = document.createElement("div");
 				child.style.height = "14px";

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-02-05 19:43:30 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-02-05 23:26:21 +0000
@@ -437,7 +437,8 @@
 								alert('Empty dimension');
 								return;
 							}
-							
+
+							Ext.Array.sort(dim);
 							paramString += 'dimension=' + key + ':' + dim.join(';') + '&';
 						}
 					}
@@ -739,12 +740,6 @@
 			};
 
 			getEmptyItem = function() {
-				//return {
-					//colspan: pt.config.rows.dims,
-					//rowspan: pt.config.cols.dims,
-					//baseCls: 'pivot-empty'
-				//};
-
 				return '<td class="pivot-empty" colspan="' + pt.config.rows.dims + '" rowspan="' + pt.config.cols.dims + '"></td>';
 			};
 
@@ -910,29 +905,6 @@
 					autoScroll: true,
 					html: html
 				});
-				
-				//var config = {
-					//layout: {
-						//type: 'table',
-						//columns: pt.config.cols.size + pt.config.rows.dims + 1
-					//},
-					//autoScroll: true,
-					//bodyStyle: 'border:0 none',
-					//defaults: {
-						//baseCls: 'td'
-					//},
-					//listeners: {
-						//resize: function(p) {
-							//addTdClasses(p);
-						//}
-					//}
-				//};
-
-				//if (pt.el) {
-					//config.renderTo = pt.el;
-				//};
-
-				//return Ext.create('Ext.panel.Panel', config);
 			};
 			
 			initialize = function() {
@@ -956,7 +928,6 @@
 					disableCaching: false,
 					failure: function() {
 						pt.util.mask.hideMask();
-						console.log(arguments);
 						alert('Data request failed');
 					},						
 					success: function(r) {