dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29314
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14777: ER, option window for cases, eventdate formatting, url encoding.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 14777 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-04-10 22:36:40 +0200
message:
ER, option window for cases, eventdate formatting, url encoding.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.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-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2014-04-09 11:45:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2014-04-10 07:27:08 +0000
@@ -773,7 +773,7 @@
itemOrganisationUnitGroups.clear();
rewindRelativePeriods = false;
digitGroupSeparator = NUMBER_FORMATTING_SPACE;
- sortOrder = 0;
+ sortOrder = NONE;
topLimit = 0;
}
=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-09 17:53:41 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-10 11:33:51 +0000
@@ -3,7 +3,7 @@
AggregateLayoutWindow,
QueryLayoutWindow,
- OptionsWindow,
+ AggregateOptionsWindow,
FavoriteWindow,
SharingWindow,
InterpretationWindow,
@@ -1516,7 +1516,7 @@
return window;
};
- OptionsWindow = function() {
+ AggregateOptionsWindow = function() {
var showTotals,
showSubTotals,
hideEmptyRows,
@@ -1793,6 +1793,218 @@
return window;
};
+ QueryOptionsWindow = function() {
+ var showHierarchy,
+ digitGroupSeparator,
+ displayDensity,
+ fontSize,
+ reportingPeriod,
+ organisationUnit,
+ parentOrganisationUnit,
+
+ data,
+ style,
+ parameters,
+
+ comboboxWidth = 262,
+ window;
+
+ showHierarchy = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.show_hierarchy,
+ style: 'margin-bottom:4px'
+ });
+
+ displayDensity = Ext.create('Ext.form.field.ComboBox', {
+ cls: 'ns-combo',
+ style: 'margin-bottom:2px',
+ width: comboboxWidth,
+ labelWidth: 130,
+ fieldLabel: NS.i18n.display_density,
+ labelStyle: 'color:#333',
+ queryMode: 'local',
+ valueField: 'id',
+ editable: false,
+ value: 'normal',
+ store: Ext.create('Ext.data.Store', {
+ fields: ['id', 'text'],
+ data: [
+ {id: 'comfortable', text: NS.i18n.comfortable},
+ {id: 'normal', text: NS.i18n.normal},
+ {id: 'compact', text: NS.i18n.compact}
+ ]
+ })
+ });
+
+ fontSize = Ext.create('Ext.form.field.ComboBox', {
+ cls: 'ns-combo',
+ style: 'margin-bottom:2px',
+ width: comboboxWidth,
+ labelWidth: 130,
+ fieldLabel: NS.i18n.font_size,
+ labelStyle: 'color:#333',
+ queryMode: 'local',
+ valueField: 'id',
+ editable: false,
+ value: 'normal',
+ store: Ext.create('Ext.data.Store', {
+ fields: ['id', 'text'],
+ data: [
+ {id: 'large', text: NS.i18n.large},
+ {id: 'normal', text: NS.i18n.normal},
+ {id: 'small', text: NS.i18n.small_}
+ ]
+ })
+ });
+
+ digitGroupSeparator = Ext.create('Ext.form.field.ComboBox', {
+ labelStyle: 'color:#333',
+ cls: 'ns-combo',
+ style: 'margin-bottom:2px',
+ width: comboboxWidth,
+ labelWidth: 130,
+ fieldLabel: NS.i18n.digit_group_separator,
+ queryMode: 'local',
+ valueField: 'id',
+ editable: false,
+ value: 'space',
+ store: Ext.create('Ext.data.Store', {
+ fields: ['id', 'text'],
+ data: [
+ {id: 'comma', text: 'Comma'},
+ {id: 'space', text: 'Space'},
+ {id: 'none', text: 'None'}
+ ]
+ })
+ });
+
+ //legendSet = Ext.create('Ext.form.field.ComboBox', {
+ //cls: 'ns-combo',
+ //style: 'margin-bottom:3px',
+ //width: comboboxWidth,
+ //labelWidth: 130,
+ //fieldLabel: NS.i18n.legend_set,
+ //valueField: 'id',
+ //displayField: 'name',
+ //editable: false,
+ //value: 0,
+ //store: ns.app.stores.legendSet
+ //});
+
+ organisationUnits = {
+ bodyStyle: 'border:0 none',
+ style: 'margin-left:14px',
+ items: [
+ showHierarchy
+ ]
+ };
+
+ style = {
+ bodyStyle: 'border:0 none',
+ style: 'margin-left:14px',
+ items: [
+ displayDensity,
+ fontSize,
+ digitGroupSeparator
+ //legendSet
+ ]
+ };
+
+ window = Ext.create('Ext.window.Window', {
+ title: NS.i18n.table_options,
+ bodyStyle: 'background-color:#fff; padding:5px 5px 3px',
+ closeAction: 'hide',
+ autoShow: true,
+ modal: true,
+ resizable: false,
+ hideOnBlur: true,
+ getOptions: function() {
+ return {
+ showTotals: false,
+ showSubTotals: false,
+ hideEmptyRows: false,
+ sortOrder: 0,
+ topLimit: 0,
+ showHierarchy: showHierarchy.getValue(),
+ displayDensity: displayDensity.getValue(),
+ fontSize: fontSize.getValue(),
+ digitGroupSeparator: digitGroupSeparator.getValue()
+ //legendSet: {id: legendSet.getValue()}
+ };
+ },
+ setOptions: function(layout) {
+ showHierarchy.setValue(Ext.isBoolean(layout.showHierarchy) ? layout.showHierarchy : false);
+ displayDensity.setValue(Ext.isString(layout.displayDensity) ? layout.displayDensity : 'normal');
+ fontSize.setValue(Ext.isString(layout.fontSize) ? layout.fontSize : 'normal');
+ digitGroupSeparator.setValue(Ext.isString(layout.digitGroupSeparator) ? layout.digitGroupSeparator : 'space');
+ //legendSet.setValue(Ext.isObject(layout.legendSet) && Ext.isString(layout.legendSet.id) ? layout.legendSet.id : 0);
+ },
+ items: [
+ {
+ bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
+ style: 'margin-bottom:6px; margin-left:2px',
+ html: NS.i18n.organisation_units
+ },
+ organisationUnits,
+ {
+ bodyStyle: 'border:0 none; padding:5px'
+ },
+ {
+ bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
+ style: 'margin-bottom:6px; margin-left:2px',
+ html: NS.i18n.style
+ },
+ style
+ ],
+ bbar: [
+ '->',
+ {
+ text: NS.i18n.hide,
+ handler: function() {
+ window.hide();
+ }
+ },
+ {
+ text: '<b>' + NS.i18n.update + '</b>',
+ handler: function() {
+ var config = ns.core.web.report.getLayoutConfig();
+ //layout = ns.core.api.layout.Layout(config);
+
+ if (!config) {
+ return;
+ }
+
+ ns.core.web.report.getData(config, false);
+
+ window.hide();
+ }
+ }
+ ],
+ listeners: {
+ show: function(w) {
+ if (ns.app.optionsButton.rendered) {
+ ns.core.web.window.setAnchorPosition(w, ns.app.optionsButton);
+
+ if (!w.hasHideOnBlurHandler) {
+ ns.core.web.window.addHideOnBlurHandler(w);
+ }
+ }
+
+ //if (!legendSet.store.isLoaded) {
+ //legendSet.store.load();
+ //}
+
+ // cmp
+ w.showHierarchy = showHierarchy;
+ w.displayDensity = displayDensity;
+ w.fontSize = fontSize;
+ w.digitGroupSeparator = digitGroupSeparator;
+ }
+ }
+ });
+
+ return window;
+ };
+
FavoriteWindow = function() {
// Objects
@@ -3008,8 +3220,8 @@
}
// options
- if (ns.app.optionsWindow) {
- ns.app.optionsWindow.setOptions(layout);
+ if (ns.app.aggregateOptionsWindow) {
+ ns.app.aggregateOptionsWindow.setOptions(layout);
}
};
@@ -5218,15 +5430,17 @@
web.report.getLayoutConfig = function() {
var view = ns.app.widget.getView(),
- options = ns.app.optionsWindow.getOptions();
+ options = {};
if (!view) {
return;
}
- Ext.applyIf(view, options);
-
if (view.dataType === 'aggregated_values') {
+ options = ns.app.aggregateOptionsWindow.getOptions();
+ Ext.applyIf(view, options);
+
+ // if order and limit -> sort
if (view.sortOrder && view.topLimit) {
view.sorting = {
id: 1,
@@ -5236,6 +5450,9 @@
}
if (view.dataType === 'individual_cases') {
+ //options = ns.app.queryOptionsWindow.getOptions();
+ //Ext.applyIf(view, options);
+
view.paging = {
page: ns.app.statusBar.getCurrentPage(),
pageSize: 100
@@ -5459,7 +5676,6 @@
shareButton,
statusBar,
centerRegion,
- setGui,
getLayoutWindow,
viewport;
@@ -5677,11 +5893,7 @@
text: NS.i18n.options,
menu: {},
handler: function() {
- if (!ns.app.optionsWindow) {
- ns.app.optionsWindow = OptionsWindow();
- }
-
- ns.app.optionsWindow.show();
+ getOptionsWindow(typeToolbar.getType()).show();
},
listeners: {
added: function() {
@@ -6013,220 +6225,7 @@
}
});
- setGui = function(layout, xLayout, updateGui) {
- var dimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || []));
- //dimMap = ns.core.service.layout.getObjectNameDimensionMapFromDimensionArray(dimensions),
- //recMap = ns.core.service.layout.getObjectNameDimensionItemsMapFromDimensionArray(dimensions),
- //graphMap = layout.parentGraphMap,
- //objectName,
- //periodRecords,
- //fixedPeriodRecords = [],
- //dimNames = [],
- //isOu = false,
- //isOuc = false,
- //isOugc = false,
- //levels = [],
- //groups = [],
- //orgunits = [];
-
- // state
- downloadButton.enable();
-
- if (layout.id) {
- //shareButton.enable();
- }
-
- return;
-
- // set gui
- if (!updateGui) {
- return;
- }
-
- // data
- indicatorSelectedStore.removeAll();
- objectName = dimConf.indicator.objectName;
- if (dimMap[objectName]) {
- indicatorSelectedStore.add(Ext.clone(recMap[objectName]));
- ns.core.web.multiSelect.filterAvailable({store: indicatorAvailableStore}, {store: indicatorSelectedStore});
- }
-
- // Data elements
- dataElementSelectedStore.removeAll();
- objectName = dimConf.dataElement.objectName;
- if (dimMap[objectName]) {
- dataElementSelectedStore.add(Ext.clone(recMap[objectName]));
- ns.core.web.multiSelect.filterAvailable({store: dataElementAvailableStore}, {store: dataElementSelectedStore});
- dataElementDetailLevel.setValue(objectName);
- }
-
- // Operands
- objectName = dimConf.operand.objectName;
- if (dimMap[objectName]) {
- dataElementSelectedStore.add(Ext.clone(recMap[objectName]));
- ns.core.web.multiSelect.filterAvailable({store: dataElementAvailableStore}, {store: dataElementSelectedStore});
- dataElementDetailLevel.setValue(objectName);
- }
-
- // Data sets
- dataSetSelectedStore.removeAll();
- objectName = dimConf.dataSet.objectName;
- if (dimMap[objectName]) {
- dataSetSelectedStore.add(Ext.clone(recMap[objectName]));
- ns.core.web.multiSelect.filterAvailable({store: dataSetAvailableStore}, {store: dataSetSelectedStore});
- }
-
- // Periods
- fixedPeriodSelectedStore.removeAll();
- period.resetRelativePeriods();
- periodRecords = recMap[dimConf.period.objectName] || [];
- for (var i = 0, periodRecord, checkbox; i < periodRecords.length; i++) {
- periodRecord = periodRecords[i];
- checkbox = ns.app.relativePeriodCmpMap[periodRecord.id];
- if (checkbox) {
- checkbox.setValue(true);
- }
- else {
- fixedPeriodRecords.push(periodRecord);
- }
- }
- fixedPeriodSelectedStore.add(fixedPeriodRecords);
- ns.core.web.multiSelect.filterAvailable({store: fixedPeriodAvailableStore}, {store: fixedPeriodSelectedStore});
-
- // Group sets
- for (var key in dimensionIdSelectedStoreMap) {
- if (dimensionIdSelectedStoreMap.hasOwnProperty(key)) {
- var a = dimensionIdAvailableStoreMap[key],
- s = dimensionIdSelectedStoreMap[key];
-
- if (s.getCount() > 0) {
- a.reset();
- s.removeAll();
- }
-
- if (recMap[key]) {
- s.add(recMap[key]);
- ns.core.web.multiSelect.filterAvailable({store: a}, {store: s});
- }
- }
- }
-
- // Layout
- ns.app.stores.dimension.reset(true);
- ns.app.aggregateLayoutWindow.colStore.removeAll();
- ns.app.layoutWiaggregateLayoutWindowndow.rowStore.removeAll();
- ns.app.aggregateLayoutWindow.filterStore.removeAll();
-
- if (layout.columns) {
- dimNames = [];
-
- for (var i = 0, dim; i < layout.columns.length; i++) {
- dim = dimConf.objectNameMap[layout.columns[i].dimension];
-
- if (!Ext.Array.contains(dimNames, dim.dimensionName)) {
- ns.app.aggregateLayoutWindow.colStore.add({
- id: dim.dimensionName,
- name: dimConf.objectNameMap[dim.dimensionName].name
- });
-
- dimNames.push(dim.dimensionName);
- }
-
- ns.app.stores.dimension.remove(ns.app.stores.dimension.getById(dim.dimensionName));
- }
- }
-
- if (layout.rows) {
- dimNames = [];
-
- for (var i = 0, dim; i < layout.rows.length; i++) {
- dim = dimConf.objectNameMap[layout.rows[i].dimension];
-
- if (!Ext.Array.contains(dimNames, dim.dimensionName)) {
- ns.app.stores.row.add({
- id: dim.dimensionName,
- name: dimConf.objectNameMap[dim.dimensionName].name
- });
-
- dimNames.push(dim.dimensionName);
- }
-
- ns.app.stores.dimension.remove(ns.app.stores.dimension.getById(dim.dimensionName));
- }
- }
-
- if (layout.filters) {
- dimNames = [];
-
- for (var i = 0, dim; i < layout.filters.length; i++) {
- dim = dimConf.objectNameMap[layout.filters[i].dimension];
-
- if (!Ext.Array.contains(dimNames, dim.dimensionName)) {
- ns.app.stores.filter.add({
- id: dim.dimensionName,
- name: dimConf.objectNameMap[dim.dimensionName].name
- });
-
- dimNames.push(dim.dimensionName);
- }
-
- ns.app.stores.dimension.remove(ns.app.stores.dimension.getById(dim.dimensionName));
- }
- }
-
- // Options
- if (ns.app.optionsWindow) {
- ns.app.optionsWindow.setOptions(layout);
- }
-
- // Organisation units
- if (recMap[dimConf.organisationUnit.objectName]) {
- for (var i = 0, ouRecords = recMap[dimConf.organisationUnit.objectName]; i < ouRecords.length; i++) {
- if (ouRecords[i].id === 'USER_ORGUNIT') {
- isOu = true;
- }
- else if (ouRecords[i].id === 'USER_ORGUNIT_CHILDREN') {
- isOuc = true;
- }
- else if (ouRecords[i].id === 'USER_ORGUNIT_GRANDCHILDREN') {
- isOugc = true;
- }
- else if (ouRecords[i].id.substr(0,5) === 'LEVEL') {
- levels.push(parseInt(ouRecords[i].id.split('-')[1]));
- }
- else if (ouRecords[i].id.substr(0,8) === 'OU_GROUP') {
- groups.push(ouRecords[i].id.split('-')[1]);
- }
- else {
- orgunits.push(ouRecords[i].id);
- }
- }
-
- if (levels.length) {
- toolMenu.clickHandler('level');
- organisationUnitLevel.setValue(levels);
- }
- else if (groups.length) {
- toolMenu.clickHandler('group');
- organisationUnitGroup.setValue(groups);
- }
- else {
- toolMenu.clickHandler('orgunit');
- userOrganisationUnit.setValue(isOu);
- userOrganisationUnitChildren.setValue(isOuc);
- userOrganisationUnitGrandChildren.setValue(isOugc);
- }
-
- if (!(isOu || isOuc || isOugc)) {
- if (Ext.isObject(graphMap)) {
- treePanel.selectGraphMap(graphMap);
- }
- }
- }
- else {
- treePanel.reset();
- }
- };
+
getLayoutWindow = function(dataType) {
if (dataType === 'aggregated_values') {
@@ -6240,10 +6239,21 @@
return null;
};
+ getOptionsWindow = function(dataType) {
+ if (dataType === 'aggregated_values') {
+ return ns.app.aggregateOptionsWindow;
+ }
+
+ if (dataType === 'individual_cases') {
+ return ns.app.queryOptionsWindow;
+ }
+
+ return null;
+ };
+
viewport = Ext.create('Ext.container.Viewport', {
layout: 'border',
getLayoutWindow: getLayoutWindow,
- setGui: setGui,
items: [
westRegion,
centerRegion
@@ -6256,8 +6266,10 @@
ns.app.aggregateLayoutWindow.hide();
ns.app.queryLayoutWindow = QueryLayoutWindow();
ns.app.queryLayoutWindow.hide();
- ns.app.optionsWindow = OptionsWindow();
- ns.app.optionsWindow.hide();
+ ns.app.aggregateOptionsWindow = AggregateOptionsWindow();
+ ns.app.aggregateOptionsWindow.hide();
+ ns.app.queryOptionsWindow = QueryOptionsWindow();
+ ns.app.queryOptionsWindow.hide();
},
afterrender: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-04-09 11:45:21 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-04-10 20:31:46 +0000
@@ -1082,18 +1082,20 @@
return function() {
// items
- for (var i = 0, dim, ids; i < dimensions.length; i++) {
+ for (var i = 0, dim, header; i < dimensions.length; i++) {
dim = dimensions[i];
dim.items = [];
- ids = xResponse.nameHeaderMap[dim.dimension].ids;
-
- for (var j = 0, id; j < ids.length; j++) {
- id = ids[j];
-
- dim.items.push({
- id: id,
- name: xResponse.metaData.names[id] || id
- });
+ header = xResponse.nameHeaderMap[dim.dimension];
+
+ if (header) {
+ for (var j = 0, id; j < header.ids.length; j++) {
+ id = header.ids[j];
+
+ dim.items.push({
+ id: id,
+ name: xResponse.metaData.names[id] || id
+ });
+ }
}
}
@@ -1406,6 +1408,24 @@
return layout.showHierarchy && Ext.isObject(response.metaData.ouHierarchy) && response.metaData.ouHierarchy.hasOwnProperty(id);
};
+ service.layout.getHierarchyName = function(ouHierarchy, names, id) {
+ var graph = ouHierarchy[id],
+ ids = Ext.Array.clean(graph.split('/')),
+ hierarchyName = '';
+
+ if (ids.length < 2) {
+ return names[id];
+ }
+
+ for (var i = 0; i < ids.length; i++) {
+ hierarchyName += names[ids[i]] + ' / ';
+ }
+
+ hierarchyName += names[id];
+
+ return hierarchyName;
+ };
+
service.layout.layout2plugin = function(layout, el) {
var layout = Ext.clone(layout),
dimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || []));
@@ -1511,11 +1531,13 @@
service.response.aggregate.getExtendedResponse = function(xLayout, response) {
var emptyId = 'N/A',
meta = ['ou', 'pe'],
+ ouHierarchy,
names,
headers;
response = Ext.clone(response);
headers = response.headers;
+ ouHierarchy = response.metaData.ouHierarchy,
names = response.metaData.names;
names[emptyId] = emptyId;
@@ -1552,11 +1574,18 @@
header.ids = Ext.Array.pluck(objects, 'id');
}
else {
- for (var j = 0, id, fullId; j < response.rows.length; j++) {
+ for (var j = 0, id, fullId, name, isHierarchy; j < response.rows.length; j++) {
id = response.rows[j][i] || emptyId;
fullId = header.name + id;
-
- names[fullId] = (isMeta ? '' : header.column + ' ') + (names[id] || id);
+ isHierarchy = service.layout.isHierarchy(xLayout, response, id);
+
+ // add dimension name prefix if not pe/ou
+ name = isMeta ? '' : header.column + ' ';
+
+ // add hierarchy if ou and showHierarchy
+ name = isHierarchy ? service.layout.getHierarchyName(ouHierarchy, names, id) : (names[id] || id);
+
+ names[fullId] = name;
response.rows[j][i] = fullId;
header.ids.push(fullId);
}
@@ -1620,10 +1649,17 @@
nameHeaderMap[header.name] = header;
if (header.type === 'java.lang.Double') {
- for (var j = 0, value; j < xResponse.rows.length; j++) {
+ for (var j = 0; j < xResponse.rows.length; j++) {
xResponse.rows[j][i] = parseFloat(xResponse.rows[j][i]);
}
}
+
+ if (header.name === 'eventdate') {
+ for (var j = 0; j < xResponse.rows.length; j++) {
+ xResponse.rows[j][i] = xResponse.rows[j][i].substr(0,10);
+ }
+ }
+
}
for (var i = 0, name; i < dimensionNames.length; i++) {
@@ -1692,7 +1728,7 @@
web.analytics.getParamString = function(view, format) {
var paramString,
- dimensions = Ext.Array.clean([].concat(view.columns || [], view.rows || [], view.filters || [])),
+ dimensions = Ext.Array.clean([].concat(view.columns || [], view.rows || [])),
ignoreKeys = ['longitude', 'latitude'],
dataTypeMap = {
'aggregated_values': 'aggregate',
@@ -1707,28 +1743,56 @@
paramString += 'stage=' + view.programStage.id;
// dimensions
- for (var i = 0, dim, con; i < dimensions.length; i++) {
- dim = dimensions[i];
-
- if (Ext.Array.contains(ignoreKeys, dim.dimension)) {
- continue;
- }
-
- paramString += '&dimension=' + dim.dimension;
-
- if (dim.items && dim.items.length) {
- paramString += ':';
-
- for (var j = 0, item; j < dim.items.length; j++) {
- item = dim.items[j];
-
- paramString += item.id + ((j < (dim.items.length - 1)) ? ';' : '');
- }
- }
- else if (dim.operator && !Ext.isEmpty(dim.filter)) {
- paramString += ':' + dim.operator + ':' + dim.filter;
- }
- }
+ if (dimensions) {
+ for (var i = 0, dim; i < dimensions.length; i++) {
+ dim = dimensions[i];
+
+ if (Ext.Array.contains(ignoreKeys, dim.dimension)) {
+ continue;
+ }
+
+ paramString += '&dimension=' + dim.dimension;
+
+ if (dim.items && dim.items.length) {
+ paramString += ':';
+
+ for (var j = 0, item; j < dim.items.length; j++) {
+ item = dim.items[j];
+
+ paramString += encodeURIComponent(item.id) + ((j < (dim.items.length - 1)) ? ';' : '');
+ }
+ }
+ else if (dim.operator && !Ext.isEmpty(dim.filter)) {
+ paramString += ':' + dim.operator + ':' + encodeURIComponent(dim.filter);
+ }
+ }
+ }
+
+ // filters
+ if (view.filters) {
+ for (var i = 0, dim; i < view.filters.length; i++) {
+ dim = view.filters[i];
+
+ if (Ext.Array.contains(ignoreKeys, dim.dimension)) {
+ continue;
+ }
+
+ paramString += '&filter=' + dim.dimension;
+
+ if (dim.items && dim.items.length) {
+ paramString += ':';
+
+ for (var j = 0, item; j < dim.items.length; j++) {
+ item = dim.items[j];
+
+ paramString += encodeURIComponent(item.id) + ((j < (dim.items.length - 1)) ? ';' : '');
+ }
+ }
+ else if (dim.operator && !Ext.isEmpty(dim.filter)) {
+ paramString += ':' + dim.operator + ':' + encodeURIComponent(dim.filter);
+ }
+ }
+ }
// dates
if (view.startDate && view.endDate) {
