dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30955
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15739: PT, api sync.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 15739 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-06-18 10:07:32 +0200
message:
PT, api sync.
modified:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-06-12 11:37:11 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-06-18 07:58:40 +0000
@@ -930,8 +930,6 @@
ns.app.stores.reportTable.loadStore();
- ns.app.shareButton.enable();
-
window.destroy();
}
});
@@ -947,7 +945,7 @@
if (id && name) {
Ext.Ajax.request({
- url: ns.core.init.contextPath + '/api/reportTables/' + id + '.json?viewClass=dimensional&links=false',
+ url: ns.core.init.contextPath + '/api/reportTables/' + id + '.json?fields=' + ns.core.conf.url.analysisFields.join(','),
method: 'GET',
failure: function(r) {
ns.core.web.mask.hide(ns.app.centerRegion);
@@ -1049,7 +1047,7 @@
this.currentValue = this.getValue();
var value = this.getValue(),
- url = value ? ns.core.init.contextPath + '/api/reportTables.json?viewClass=sharing&fields=id,name,access' + (value ? '&filter=name:like:' + value : '') : null;
+ url = value ? ns.core.init.contextPath + '/api/reportTables.json?fields=id,name,access' + (value ? '&filter=name:like:' + value : '') : null;
store = ns.app.stores.reportTable;
store.page = 1;
@@ -1065,7 +1063,7 @@
text: NS.i18n.prev,
handler: function() {
var value = searchTextfield.getValue(),
- url = value ? ns.core.init.contextPath + '/api/reportTables.json?viewClass=sharing&fields=id,name,access' + (value ? '&filter=name:like:' + value : '') : null;
+ url = value ? ns.core.init.contextPath + '/api/reportTables.json?fields=id,name,access' + (value ? '&filter=name:like:' + value : '') : null;
store = ns.app.stores.reportTable;
store.page = store.page <= 1 ? 1 : store.page - 1;
@@ -1077,7 +1075,7 @@
text: NS.i18n.next,
handler: function() {
var value = searchTextfield.getValue(),
- url = value ? ns.core.init.contextPath + '/api/reportTables.json?viewClass=sharing&fields=id,name,access' + (value ? '&filter=name:like:' + value : '') : null;
+ url = value ? ns.core.init.contextPath + '/api/reportTables.json?fields=id,name,access' + (value ? '&filter=name:like:' + value : '') : null;
store = ns.app.stores.reportTable;
store.page = store.page + 1;
@@ -1170,8 +1168,6 @@
ns.app.xLayout.name = true;
ns.app.stores.reportTable.loadStore();
-
- ns.app.shareButton.enable();
}
});
}
@@ -2274,7 +2270,7 @@
}
Ext.Ajax.request({
- url: init.contextPath + '/api/reportTables/' + id + '.json?viewClass=dimensional&links=false',
+ url: init.contextPath + '/api/reportTables/' + id + '.json?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
alert(r.responseText);
@@ -2871,7 +2867,7 @@
isLoaded: false,
pageSize: 10,
page: 1,
- defaultUrl: ns.core.init.contextPath + '/api/reportTables.json?viewClass=sharing&fields=id,name,access',
+ defaultUrl: ns.core.init.contextPath + '/api/reportTables.json?fields=id,name,access',
loadStore: function(url) {
this.proxy.url = url || this.defaultUrl;
@@ -5259,6 +5255,7 @@
shareButton = Ext.create('Ext.button.Button', {
text: NS.i18n.share,
+ disabled: true,
xableItems: function() {
interpretationItem.xable();
pluginItem.xable();
@@ -5504,10 +5501,7 @@
// State
downloadButton.enable();
-
- if (layout.id) {
- shareButton.enable();
- }
+ shareButton.enable();
// Set gui
if (!updateGui) {
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2014-05-27 11:08:21 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2014-06-18 07:58:40 +0000
@@ -188,6 +188,48 @@
'large': '13px'
}
};
+
+ conf.url = {
+ analysisFields: [
+ '*',
+ 'program[id,name]',
+ 'programStage[id,name]',
+ 'columns[dimension,filter,items[id,name]]',
+ 'rows[dimension,filter,items[id,name]]',
+ 'filters[dimension,filter,items[id,name]]',
+ '!lastUpdated',
+ '!href',
+ '!created',
+ '!publicAccess',
+ '!rewindRelativePeriods',
+ '!userOrganisationUnit',
+ '!userOrganisationUnitChildren',
+ '!userOrganisationUnitGrandChildren',
+ '!externalAccess',
+ '!access',
+ '!relativePeriods',
+ '!columnDimensions',
+ '!rowDimensions',
+ '!filterDimensions',
+ '!user',
+ '!organisationUnitGroups',
+ '!itemOrganisationUnitGroups',
+ '!userGroupAccesses',
+ '!indicators',
+ '!dataElements',
+ '!dataElementOperands',
+ '!dataElementGroups',
+ '!dataSets',
+ '!periods',
+ '!organisationUnitLevels',
+ '!organisationUnits'
+ ],
+ sharingFields: [
+ 'id',
+ 'name',
+ 'access'
+ ]
+ };
}());
// api
@@ -1719,6 +1761,7 @@
delete layout.cumulative;
delete layout.sortOrder;
delete layout.topLimit;
+ delete layout.aggregationType;
return layout;
};
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js 2014-06-12 11:37:11 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js 2014-06-18 07:58:40 +0000
@@ -2744,7 +2744,7 @@
});
requests.push({
- url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&links=false',
+ url: url + '/api/organisationUnits.jsonp?userOnly=true&fields=id,name,children[id,name]&paging=false',
success: function(r) {
var organisationUnits = r.organisationUnits || [],
ou = [],
@@ -2885,9 +2885,9 @@
}
Ext.data.JsonP.request({
- url: init.contextPath + '/api/reportTables/' + id + '.jsonp?viewClass=dimensional&links=false',
+ url: init.contextPath + '/api/reportTables/' + id + '.jsonp?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
- window.open(init.contextPath + '/api/reportTables/' + id + '.json?viewClass=dimensional&links=false', '_blank');
+ window.open(init.contextPath + '/api/reportTables/' + id + '.json?fields=' + conf.url.analysisFields.join(',')', '_blank');
},
success: function(r) {
var layout = api.layout.Layout(r);
