dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27960
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13944: GIS, paging, work in progress.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13944 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-02-05 18:32:31 +0100
message:
GIS, paging, work in progress.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.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/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-02-05 12:56:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-02-05 17:28:35 +0000
@@ -6369,18 +6369,16 @@
GIS.app.LayerWidgetThematic = function(layer) {
- // Stores
var indicatorsByGroupStore,
dataElementsByGroupStore,
periodsByTypeStore,
infrastructuralDataElementValuesStore,
legendsByLegendSetStore,
- // Togglers
valueTypeToggler,
legendTypeToggler,
- // Components
+ isScrolled,
valueType,
indicatorGroup,
indicator,
@@ -6417,18 +6415,14 @@
lowPanel,
highPanel,
- // Functions
- //createSelectHandlers,
reset,
setGui,
getView,
- // Convenience
dimConf = gis.conf.finals.dimension,
-
panel;
-
- // Stores
+
+ // stores
indicatorsByGroupStore = Ext.create('Ext.data.Store', {
fields: ['id', 'name', 'legendSet'],
@@ -6465,95 +6459,206 @@
dataElementsByGroupStore = Ext.create('Ext.data.Store', {
fields: ['id', 'name'],
- proxy: {
- type: 'ajax',
- url: '',
- reader: {
- type: 'json',
- root: 'dataElements'
- }
- },
- isLoaded: false,
- loadFn: function(fn) {
- if (this.isLoaded) {
- fn.call();
- }
- else {
- this.load(fn);
- }
- },
+ lastPage: null,
+ nextPage: 1,
+ isPending: false,
+ reset: function() {
+ this.removeAll();
+ this.lastPage = null;
+ this.nextPage = 1;
+ this.isPending = false;
+ //dataElementSearch.hideFilter();
+ },
+ loadPage: function(uid, filter, append) {
+ uid = (Ext.isString(uid) || Ext.isNumber(uid)) ? uid : dataElementGroup.getValue();
+ //filter = filter || dataElementFilter.getValue() || null;
+ filter = filter || null;
+
+ if (!append) {
+ this.lastPage = null;
+ this.nextPage = 1;
+ }
+
+ if (dataElementDetailLevel.getValue() === dimConf.dataElement.objectName) {
+ this.loadTotalsPage(uid, filter, append);
+ }
+ else if (dataElementDetailLevel.getValue() === dimConf.operand.objectName) {
+ this.loadDetailsPage(uid, filter, append);
+ }
+ },
+ loadTotalsPage: function(uid, filter, append) {
+ var store = this,
+ filterPath = filter ? '/query/' + filter : '',
+ path;
+
+ if (store.nextPage === store.lastPage) {
+ return;
+ }
+
+ if (Ext.isString(uid)) {
+ path = '/dataElementGroups/' + uid + '/members' + filterPath + '.json';
+ }
+ else if (uid === 0) {
+ path = '/dataElements' + filterPath + '.json?domainType=aggregate';
+ }
+
+ if (!path) {
+ alert('Available data elements: invalid id');
+ return;
+ }
+
+ store.isPending = true;
+
+ Ext.Ajax.request({
+ url: gis.init.contextPath + '/api' + path,
+ params: {
+ viewClass: 'basic',
+ links: 'false',
+ page: store.nextPage,
+ pageSize: 50
+ },
+ failure: function() {
+ store.isPending = false;
+ },
+ success: function(r) {
+ var response = Ext.decode(r.responseText),
+ data = response.dataElements || [],
+ pager = response.pager;
+
+ store.loadStore(data, pager, append);
+ }
+ });
+ },
+ loadDetailsPage: function(uid, filter, append) {
+ var store = this,
+ filterPath = filter ? '/query/' + filter : '',
+ path;
+
+ if (store.nextPage === store.lastPage) {
+ return;
+ }
+
+ if (Ext.isString(uid)) {
+ path = '/dataElementGroups/' + uid + '/operands' + filterPath + '.json';
+ }
+ else if (uid === 0) {
+ path = '/generatedDataElementOperands' + filterPath + '.json';
+ }
+
+ if (!path) {
+ alert('Available data elements: invalid id');
+ return;
+ }
+
+ store.isPending = true;
+
+ Ext.Ajax.request({
+ url: gis.init.contextPath + '/api' + path,
+ params: {
+ viewClass: 'basic',
+ links: 'false',
+ page: store.nextPage,
+ pageSize: 50
+ },
+ failure: function() {
+ store.isPending = false;
+ },
+ success: function(r) {
+ var response = Ext.decode(r.responseText),
+ data = response.dataElementOperands || [],
+ pager = response.pager;
+
+ for (var i = 0; i < data.length; i++) {
+ data[i].id = data[i].id.split('.').join('-');
+ }
+
+ store.loadStore(data, pager, append);
+ }
+ });
+ },
+ loadStore: function(data, pager, append) {
+ this.loadData(data, append);
+ this.lastPage = this.nextPage;
+
+ if (pager.pageCount > this.nextPage) {
+ this.nextPage++;
+ }
+
+ this.isPending = false;
+ //ns.core.web.multiSelects.filterAvailable({store: dataElementAvailableStore}, {store: dataElementSelectedStore});
+ },
sortStore: function() {
this.sort('name', 'ASC');
},
- setTotalsProxy: function(uid, preventLoad, callbackFn) {
- var path;
-
- if (Ext.isString(uid)) {
- path = '/dataElementGroups/' + uid + '.json?domainType=aggregate&links=false&paging=false';
- }
- else if (uid === 0) {
- path = '/dataElements.json?domainType=aggregate&paging=false&links=false';
- }
-
- if (!path) {
- alert('Invalid parameter');
- return;
- }
-
- this.setProxy({
- type: 'ajax',
- url: gis.init.contextPath + '/api' + path,
- reader: {
- type: 'json',
- root: 'dataElements'
- }
- });
-
- if (!preventLoad) {
- this.load({
- scope: this,
- callback: function() {
- this.sortStore();
-
- if (Ext.isFunction(callbackFn)) {
- callbackFn();
- }
- }
- });
- }
- },
- setDetailsProxy: function(uid, preventLoad, callbackFn) {
- if (Ext.isString(uid)) {
- this.setProxy({
- type: 'ajax',
- url: gis.init.contextPath + '/api/generatedDataElementOperands.json?links=false&dataElementGroup=' + uid,
- reader: {
- type: 'json',
- root: 'dataElementOperands'
- }
- });
-
- if (!preventLoad) {
- this.load({
- scope: this,
- callback: function() {
- this.each(function(r) {
- r.set('id', r.data.id.split('.').join('-'));
- });
-
- this.sortStore();
-
- if (Ext.isFunction(callbackFn)) {
- callbackFn();
- }
- }
- });
- }
- }
- else {
- alert('Invalid parameter');
- }
- },
+ //setTotalsProxy: function(uid, preventLoad, callbackFn) {
+ //var path;
+
+ //if (Ext.isString(uid)) {
+ //path = '/dataElementGroups/' + uid + '.json?domainType=aggregate&links=false&paging=false';
+ //}
+ //else if (uid === 0) {
+ //path = '/dataElements.json?domainType=aggregate&paging=false&links=false';
+ //}
+
+ //if (!path) {
+ //alert('Invalid parameter');
+ //return;
+ //}
+
+ //this.setProxy({
+ //type: 'ajax',
+ //url: gis.init.contextPath + '/api' + path,
+ //reader: {
+ //type: 'json',
+ //root: 'dataElements'
+ //}
+ //});
+
+ //if (!preventLoad) {
+ //this.load({
+ //scope: this,
+ //callback: function() {
+ //this.sortStore();
+
+ //if (Ext.isFunction(callbackFn)) {
+ //callbackFn();
+ //}
+ //}
+ //});
+ //}
+ //},
+ //setDetailsProxy: function(uid, preventLoad, callbackFn) {
+ //if (Ext.isString(uid)) {
+ //this.setProxy({
+ //type: 'ajax',
+ //url: gis.init.contextPath + '/api/generatedDataElementOperands.json?links=false&dataElementGroup=' + uid,
+ //reader: {
+ //type: 'json',
+ //root: 'dataElementOperands'
+ //}
+ //});
+
+ //if (!preventLoad) {
+ //this.load({
+ //scope: this,
+ //callback: function() {
+ //this.each(function(r) {
+ //r.set('id', r.data.id.split('.').join('-'));
+ //});
+
+ //this.sortStore();
+
+ //if (Ext.isFunction(callbackFn)) {
+ //callbackFn();
+ //}
+ //}
+ //});
+ //}
+ //}
+ //else {
+ //alert('Invalid parameter');
+ //}
+ //},
listeners: {
load: function() {
if (!this.isLoaded) {
@@ -6631,7 +6736,7 @@
}
});
- // Togglers
+ // togglers
valueTypeToggler = function(valueType) {
if (valueType === dimConf.indicator.objectName) {
@@ -6672,7 +6777,14 @@
}
};
- // Components
+ // form
+
+ isScrolled = function(e) {
+ var el = e.srcElement,
+ scrollBottom = el.scrollTop + ((el.clientHeight / el.scrollHeight) * el.scrollHeight);
+
+ return scrollBottom / el.scrollHeight > 0.9;
+ };
valueType = Ext.create('Ext.form.field.ComboBox', {
fieldLabel: GIS.i18n.value_type,
@@ -6776,18 +6888,7 @@
data: gis.init.dataElementGroups
},
loadAvailable: function(preventLoad) {
- var store = dataElementsByGroupStore,
- detailLevel = dataElementDetailLevel.getValue(),
- value = this.getValue();
-
- if (value) {
- if (detailLevel === gis.conf.finals.dimension.dataElement.objectName) {
- store.setTotalsProxy(value, preventLoad);
- }
- else {
- store.setDetailsProxy(value, preventLoad);
- }
- }
+ dataElementsByGroupStore.loadPage(this.getValue());
},
listeners: {
select: function(cb) {
@@ -6844,6 +6945,20 @@
}
}
});
+ },
+ expand: function(cmp) {
+ Ext.defer( function() {
+ var el = Ext.get(cmp.listKeyNav.boundList.getEl().id + '-listEl').dom;
+
+ el.addEventListener('scroll', function(e) {
+ if (isScrolled(e) && !dataElementsByGroupStore.isPending) {
+ dataElementsByGroupStore.loadPage(null, null, true);
+ }
+ });
+ }, 100);
+ },
+ collapse: function(cmp) {
+ console.log("collapsed");
}
}
});
@@ -7324,7 +7439,7 @@
if (!r.data.leaf) {
v.menu.add({
id: 'treepanel-contextmenu-item',
- text: gis.i18n.select_all_children,
+ text: GIS.i18n.select_all_children,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
