Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2030 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: trunk
timestamp: Wed 2010-11-10 15:49:00 +0100
message:
(GIS) Drilldown code improved.
modified:
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/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/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2010-11-09 17:31:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js 2010-11-10 14:45:56 +0000
@@ -1016,7 +1016,7 @@
var east_panel = Ext.getCmp('east');
var x = east_panel.x - 210;
var y = east_panel.y + 41;
-
+
if (GLOBALS.vars.activePanel.isPolygon() && GLOBALS.vars.mapSourceType.isDatabase()) {
if (feature.attributes.hasChildrenWithCoordinates) {
if (GLOBALS.vars.locateFeatureWindow) {
@@ -1025,6 +1025,7 @@
Ext.getCmp('map_tf').setValue(feature.data.name);
Ext.getCmp('map_tf').value = feature.attributes.id;
+ choropleth.updateValues = true;
choropleth.organisationUnitSelectionType.setParent(feature.attributes.id);
choropleth.loadFromDatabase(feature.attributes.id, true);
}
@@ -1658,15 +1659,14 @@
},
applyValues: function() {
- var options = {};
- this.indicator = 'value';
- options.indicator = this.indicator;
- options.method = Ext.getCmp('method_cb').getValue();
- options.numClasses = Ext.getCmp('numClasses_cb').getValue();
- options.colors = this.getColors();
+ var options = {
+ indicator: 'value',
+ method: Ext.getCmp('method_cb').getValue(),
+ numClasses: Ext.getCmp('numClasses_cb').getValue(),
+ colors: this.getColors()
+ };
- this.coreComp.updateOptions(options);
- this.coreComp.applyClassification();
+ this.coreComp.applyClassification(options);
this.classificationApplied = true;
GLOBALS.vars.mask.hide();
=== 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 2010-11-09 17:31:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js 2010-11-10 14:45:56 +0000
@@ -992,6 +992,7 @@
Ext.getCmp('map_tf2').setValue(feature.data.name);
Ext.getCmp('map_tf2').value = feature.attributes.id;
+ proportionalSymbol.updateValues = true;
proportionalSymbol.organisationUnitSelectionType.setParent(feature.attributes.id);
proportionalSymbol.loadFromDatabase(feature.attributes.id, true);
}
@@ -1625,15 +1626,14 @@
},
applyValues: function() {
- var options = {};
- this.indicator = 'value';
- options.indicator = this.indicator;
- options.method = Ext.getCmp('method_cb2').getValue();
- options.numClasses = Ext.getCmp('numClasses_cb2').getValue();
- options.colors = this.getColors();
+ var options = {
+ indicator: 'value',
+ method: Ext.getCmp('method_cb2').getValue(),
+ numClasses: Ext.getCmp('numClasses_cb2').getValue(),
+ colors: this.getColors()
+ };
- this.coreComp.updateOptions(options);
- this.coreComp.applyClassification();
+ this.coreComp.applyClassification(options);
this.classificationApplied = true;
GLOBALS.vars.mask.hide();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
