dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15434
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5587: GIS layer gui bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5587 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-12-25 17:33:32 +0100
message:
GIS layer gui bug fixed.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.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/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js 2011-12-09 14:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js 2011-12-25 16:31:14 +0000
@@ -598,9 +598,10 @@
listeners: {
'select': {
scope: this,
- fn: function() {
+ fn: function(c) {
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
}
}
}
@@ -640,6 +641,7 @@
tree.selectedNode = n;
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
}
}
}
@@ -1035,6 +1037,9 @@
classify: function(exception, lockPosition) {
if (this.formValidation.validateForm.apply(this, [exception])) {
+ if (!this.layer.features.length) {
+ this.loadGeoJson();
+ }
G.vars.mask.msg = G.i18n.aggregating_map_values;
G.vars.mask.show();
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-12-12 10:31:20 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2011-12-25 16:31:14 +0000
@@ -898,9 +898,10 @@
listeners: {
'select': {
scope: this,
- fn: function() {
+ fn: function(c) {
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
}
}
}
@@ -940,6 +941,7 @@
tree.selectedNode = n;
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
}
}
}
@@ -1665,6 +1667,10 @@
classify: function(exception, lockPosition) {
if (this.formValidation.validateForm.apply(this, [exception])) {
+ if (!this.layer.features.length) {
+ this.loadGeoJson();
+ }
+
G.vars.mask.msg = G.i18n.loading;
G.vars.mask.show();
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-12-09 14:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js 2011-12-25 16:31:14 +0000
@@ -898,9 +898,10 @@
listeners: {
'select': {
scope: this,
- fn: function() {
+ fn: function(c) {
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
}
}
}
@@ -940,6 +941,7 @@
tree.selectedNode = n;
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
}
}
}
@@ -1665,6 +1667,10 @@
classify: function(exception, lockPosition) {
if (this.formValidation.validateForm.apply(this, [exception])) {
+ if (!this.layer.features.length) {
+ this.loadGeoJson();
+ }
+
G.vars.mask.msg = G.i18n.loading;
G.vars.mask.show();
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-12-12 11:01:38 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2011-12-25 16:31:14 +0000
@@ -405,9 +405,10 @@
listeners: {
'select': {
scope: this,
- fn: function() {
+ fn: function(c) {
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(null, null, null, c.getValue(), c.getRawValue());
}
}
}
@@ -447,6 +448,7 @@
tree.selectedNode = n;
this.requireUpdate = true;
this.formValidation.validateForm.call(this);
+ this.organisationUnitSelection.setValues(n.attributes.id, n.attributes.text, n.attributes.level);
}
}
}
@@ -804,6 +806,9 @@
classify: function(exception, lockPosition) {
if (this.formValidation.validateForm.apply(this, [exception])) {
+ if (!this.layer.features.length) {
+ this.loadGeoJson();
+ }
G.vars.lockPosition = lockPosition;
