dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 9745 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-05 21:19:36 +0100
message:
  (GIS) Minor fixes.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic2.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css


--
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/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-01-17 13:09:10 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-02-05 20:19:14 +0000
@@ -4248,9 +4248,10 @@
 		};
 
 		setGui = function(view) {
-
 			// Components
-			groupSet.setValue(view.organisationUnitGroupSet.id);
+            gis.store.groupSets.loadFn( function() {
+                groupSet.setValue(view.organisationUnitGroupSet.id);
+            });
 
 			gis.store.organisationUnitLevels.loadFn( function() {
 				level.setValue(view.organisationUnitLevel.id);

=== 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-04 20:51:33 +0000
+++ 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
@@ -118,7 +118,7 @@
 			parent = orgUnit ? orgUnit.name : '',
 			level = orgUnitLevel ? orgUnitLevel.name : '',
 			what = indicator ? indicator.name : (dataElement ? dataElement.name : ''),
-			when = period ? period.name : '',
+			when = period ? period.id : '',
 			where = parent + ' / ' + level;
 
 		return {
@@ -238,6 +238,7 @@
 			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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic2.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic2.js	2013-02-04 20:51:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/mapfish/core/GeoStat/Thematic2.js	2013-02-05 20:19:14 +0000
@@ -118,7 +118,7 @@
 			parent = orgUnit ? orgUnit.name : '',
 			level = orgUnitLevel ? orgUnitLevel.name : '',
 			what = indicator ? indicator.name : (dataElement ? dataElement.name : ''),
-			when = period ? period.name : '',
+			when = period ? period.id : '',
 			where = parent + ' / ' + level;
 
 		return {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2012-11-29 16:37:11 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-02-05 20:19:14 +0000
@@ -372,8 +372,6 @@
 	padding: 5px 8px 5px 8px;
 	border-bottom-left-radius: 2px;
 	border-bottom-right-radius: 2px;
-	-webkit-text-stroke-width: 0.2px;
-	-webkit-text-stroke-color: #fff;
 	color: #fff;
 	font-weight: bold;
 	letter-spacing: 1px;