dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #00093
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 24: Geostat stable version.
------------------------------------------------------------
revno: 24
committer: janhov <janhov@laptop>
branch nick: trunk
timestamp: Tue 2009-03-10 12:01:02 +0530
message:
Geostat stable version.
modified:
gis/dhis-gis-geostat/demos/geostat/config.js
gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js
gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/ProportionalSymbol.js
=== modified file 'gis/dhis-gis-geostat/demos/geostat/config.js'
--- gis/dhis-gis-geostat/demos/geostat/config.js 2009-03-03 16:46:36 +0000
+++ gis/dhis-gis-geostat/demos/geostat/config.js 2009-03-10 06:31:02 +0000
@@ -1,5 +1,4 @@
// SHAPE FILES
-
choropleth1 = '../../../geoserver/wfs?request=GetFeature&typename=who:admin0&outputformat=json&version=1.0.0'; // country
choropleth2 = '../../../geoserver/wfs?request=GetFeature&typename=who:admin1&outputformat=json&version=1.0.0'; // provinces
choropleth3 = '../../../geoserver/wfs?request=GetFeature&typename=who:admin2&outputformat=json&version=1.0.0'; // districts
@@ -11,14 +10,15 @@
1: [ { type: "Province", name: "NAME", geocode: "NAME", value: "value" } ],
2: [ { type: "District", name: "NAME", geocode: "NAME", value: "value", parent1: "ADM1_NAME" } ],
3: [ { type: "Chiefdom", name: "CHIEFDOM", geocode: "CHIEFDOM", value: "value", parent1: "PROVINCE", parent2: "DISTRICT" } ],
- 4: [ { type: "Org. unit", name: "name", geocode: "ID", value: "value", parent1: "PROVINCE", parent2: "DISTRICT", parent3: "CHIEFDOM" } ]
-};
+ 4: [ { type: "Org. unit", name: "name", geocode: "ID", value: "value", parent1: "PROVINCE", parent2: "DISTRICT", parent3: "CHIEFDOM" } ] };
pointLayer = 4; // the shpcols point layer number
+// LAYER NAMES
+choroplethLayerName = "Choropleth";
+propSymbolLayerName = "Proportional Symbol";
+
+
// TOMCAT PORT
-
-localhost_port = 8180;
-
-
+localhost_port = 8180;
\ No newline at end of file
=== modified file 'gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js'
--- gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js 2009-03-03 16:46:36 +0000
+++ gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/Choropleth.js 2009-03-10 06:31:02 +0000
@@ -143,20 +143,31 @@
newUrl : false,
+ selectedValue : false,
+
initComponent : function() {
// DHIS
+
+ indicatorGroupStore = new Ext.data.JsonStore({
+ url: 'http://localhost:' + localhost_port + '/dhis-webservice/getAllIndicatorGroups.service',
+ baseParams: { format: 'json' },
+ root: 'indicatorGroups',
+ fields: ['id', 'name'],
+ autoLoad: true
+ });
+
indicatorStore = new Ext.data.JsonStore({
- url: 'http://localhost:8180/dhis-webservice/getAllIndicators.service?format=jsonmin',
- //baseParams: { format: 'jsonmin' },
+ url: 'http://localhost:' + localhost_port + '/dhis-webservice/getIndicatorsByIndicatorGroup.service',
+// baseParams: { format: 'json' },
root: 'indicators',
- fields: ['id', 'name']//,
- //autoLoad: true
+ fields: ['id', 'name'],
+ autoLoad: false
});
periodTypeStore = new Ext.data.JsonStore({
- url: 'http://localhost:8180/dhis-webservice/getAllPeriodTypes.service',
+ url: 'http://localhost:' + localhost_port + '/dhis-webservice/getAllPeriodTypes.service',
baseParams: { format: 'json' },
root: 'periodTypes',
fields: ['id', 'name'],
@@ -164,7 +175,7 @@
});
periodStore = new Ext.data.JsonStore({
- url: 'http://localhost:8180/dhis-webservice/getPeriodsByPeriodType.service',
+ url: 'http://localhost:' + localhost_port + '/dhis-webservice/getPeriodsByPeriodType.service',
baseParams: { periodTypeId: '9', format: 'json' },
root: 'periods',
fields: ['id', 'startDate'],
@@ -172,12 +183,21 @@
});
levelStore = new Ext.data.JsonStore({
- url: 'http://localhost:8180/dhis-webservice/getOrganisationUnitLevels.service',
+ url: 'http://localhost:' + localhost_port + '/dhis-webservice/getOrganisationUnitLevels.service',
baseParams: { format: 'json' },
root: 'organisationUnitLevels',
fields: ['level', 'name'],
autoLoad: true
});
+
+ legendStore = new Ext.data.JsonStore({
+ url: 'http://localhost:' + localhost_port + '/dhis-webservice/getLegendMinAndMaxOfIndicator.service',
+ baseParams: { indicatorId: '52460', format: 'json' },
+ root: 'legendSet',
+ fields: ['id', 'name'],
+ autoLoad: false
+ });
+
// end DHIS
@@ -185,11 +205,38 @@
this.items = [
- {
-
// DHIS
-
+
+ {
+ xtype: 'combo',
+ id: 'indicatorgroup_cb',
+ fieldLabel: 'Indicator group',
+ typeAhead: true,
+ editable: false,
+ valueField: 'id',
+ displayField: 'name',
+ mode: 'remote',
+ forceSelection: true,
+ triggerAction: 'all',
+ emptyText: 'Select group',
+ selectOnFocus: true,
+ store: indicatorGroupStore,
+ listeners: {
+ 'select': {
+ fn: function()
+ {
+ Ext.getCmp('indicator_cb').reset();
+ var igId = Ext.getCmp('indicatorgroup_cb').getValue();
+ indicatorStore.baseParams = { indicatorGroupId: igId, format: 'json' };
+ indicatorStore.reload();
+ },
+ scope: this
+ }
+ }
+ },
+
+ {
xtype: 'combo',
id: 'indicator_cb',
fieldLabel: 'Indicator',
@@ -274,29 +321,8 @@
},
{html:'<br>'},
- // end DHIS
-
-
-/*
- {
-
- xtype: 'combo',
- fieldLabel: 'Indicator',
- name: 'indicator',
- editable: false,
- valueField: 'value',
- displayField: 'text',
- mode: 'local',
- emptyText: 'Select an indicator',
- triggerAction: 'all',
- store: new Ext.data.SimpleStore({
- fields: ['value', 'text'],
- data : this.indicators
- })
-
- },
-*/
-
+
+/*
{
xtype: 'combo',
fieldLabel: 'Method',
@@ -314,7 +340,10 @@
['CLASSIFY_BY_QUANTILS', 'Quantils']]
})
- },{
+ },
+*/
+
+ {
xtype: 'combo',
fieldLabel: 'Classes',
name: 'numClasses',
@@ -330,34 +359,81 @@
})
},{
+
+
+ xtype: 'combo',
+ id: 'legend_cb',
+ fieldLabel: 'Legend set',
+ typeAhead: true,
+ editable: false,
+ valueField: 'id',
+ displayField: 'name',
+ mode: 'remote',
+ forceSelection: true,
+ triggerAction: 'all',
+ emptyText: 'Select legend',
+ selectOnFocus: true,
+ store: legendStore,
+ listeners: {
+ 'select': {
+ fn: function()
+ {
+ var iId = Ext.getCmp('indicator_cb').getValue();
+ var url = 'http://localhost:' + localhost_port + '/dhis-webservice/getLegendMinAndMaxOfIndicator.service';
+ var format = 'json';
+
+ Ext.Ajax.request({
+
+ url: url,
+ method: 'GET',
+ params: { indicatorId: iId, format: format },
+
+ success: function( responseObject )
+ {
+ var data = Ext.util.JSON.decode(responseObject.responseText);
+ var color1 = "#" + data.legendSet[0]["min-color"];
+ var color2 = "#" + data.legendSet[0]["max-color"];
+
+ Ext.getCmp('colorA_cf').setValue(color1);
+ Ext.getCmp('colorB_cf').setValue(color2);
+ },
+ failure: function()
+ {
+ alert( 'Status', 'Error while retrieving data' );
+ }
+ });
+
+ },
+ scope: this
+ }
+ }
+
+ },{
xtype: 'colorfield',
fieldLabel: 'Color',
name: 'colorA',
+ id: 'colorA_cf',
width: 100,
allowBlank: false,
- value: "#FFFF00" /*,
- listeners: {
- 'valid': {
- fn: function() {this.classify(false)},
- scope: this
- }
- }
- */
+ value: "#FFFF00"
},{
xtype: 'colorfield',
fieldLabel: 'Color',
name: 'colorB',
+ id: 'colorB_cf',
width: 100,
allowBlank: false,
value: "#FF0000"
},{
xtype: 'button',
text: 'Submit',
- handler: function() {
+ handler: function()
+ {
this.classify(true);
},
scope: this
- }
+ },
+
];
@@ -418,9 +494,7 @@
* the widget isn't ready, or no indicator is specified, or no
* method is specified.
*/
- classify: function(exception, wfs) {
-
-// alert("classify");
+ classify: function(exception) {
if (!this.ready) {
if (exception) {
@@ -455,15 +529,7 @@
options.indicator = this.indicator;
- options.method = this.form.findField('method').getValue();
- if (!options.method) {
- if (exception) {
- Ext.MessageBox.alert('Error', 'You must choose a method');
- }
- return;
- }
-
-
+ //options.method = "CLASSIFY_BY_EQUAL_INTERVALS";
options.method = mapfish.GeoStat.Distribution[options.method];
options.numClasses = this.form.findField('numClasses').getValue();
options.colors = this.getColors();
@@ -485,7 +551,8 @@
}
},
-
+
+
/**
* Method: onRender
* Called by EXT when the component is rendered.
=== modified file 'gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/ProportionalSymbol.js'
--- gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/ProportionalSymbol.js 2009-03-03 16:46:36 +0000
+++ gis/dhis-gis-geostat/mfbase/mapfish/widgets/geostat/ProportionalSymbol.js 2009-03-10 06:31:02 +0000
@@ -207,7 +207,8 @@
requestFailure: function(request) {
OpenLayers.Console.error('Ajax request failed');
},
-
+
+
/**
* Method: classify
* Reads the features to get the different value for
--
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.
