dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30641
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15567: Event Visualizer, work in progress.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 15567 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-06 11:11:26 +0200
message:
Event Visualizer, work in progress.
modified:
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/eventvisualizer/i18n_module.properties
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/i18n.json
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/index.html
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/core.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/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-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/eventvisualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/eventvisualizer/i18n_module.properties 2014-05-30 09:55:33 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/resources/org/hisp/dhis/eventvisualizer/i18n_module.properties 2014-06-05 15:00:36 +0000
@@ -170,4 +170,17 @@
category=Category
events=Events
tracked_entity_instances=Tracked entity instances
-count_type=Count type
\ No newline at end of file
+count_type=Count type
+trend_line=Show trend lines
+hide_subtitle=Hide chart subtitle
+hide_legend=Hide chart legend
+domain_axis_label=Domain axis title
+range_axis_label=Range axis title
+target=Target
+target_line_value=Target line value
+target_line_label=Target line label
+show_values=Show values
+hide_empty_category_items=Hide empty category items
+chart_title=Chart title
+hide_chart_title=Hide chart title
+trend=Trend
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/i18n.json'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/i18n.json 2014-05-30 09:55:33 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/i18n.json 2014-06-05 15:00:36 +0000
@@ -169,5 +169,18 @@
"category",
"events",
"tracked_entity_instances",
-"count_type"
+"count_type",
+"show_values",
+"hide_empty_category_items",
+"trend_line",
+"hide_subtitle",
+"hide_legend",
+"domain_axis_label",
+"range_axis_label",
+"target",
+"target_line_value",
+"target_line_label",
+"chart_title",
+"hide_chart_title",
+"trend"
]
=== modified file 'dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/index.html'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/index.html 2014-04-24 15:09:41 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/index.html 2014-06-06 09:05:03 +0000
@@ -2,7 +2,7 @@
<html>
<head>
- <title>Event reports</title>
+ <title>DHIS2 Event Visualizer</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -11,11 +11,17 @@
</head>
<body>
+ <form id="exportForm" method="post">
+ <input type="hidden" id="svgField" name="svg"/>
+ <input type="hidden" id="filenameField" name="filename"/>
+ </form>
+
<script src="../../dhis-web-commons/javascripts/ext/ext-all.js"></script>
<script src="../../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js"></script>
<script src="../../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js"></script>
<script src="../../dhis-web-commons/javascripts/periodTypeNoDep.js"></script>
+ <script src="../../dhis-web-commons/javascripts/simpleRegression.js"></script>
<script src="scripts/core.js"></script>
<script src="scripts/app.js"></script>
</body>
=== modified file 'dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-05-30 10:23:05 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-06-06 09:05:03 +0000
@@ -1,5 +1,5 @@
Ext.onReady( function() {
- var NS = ER,
+ var NS = EV,
AggregateLayoutWindow,
AggregateOptionsWindow,
@@ -980,10 +980,28 @@
filterStore.add(record);
});
- ms.store.on('add', function() {
+ ms.store.on('add', function(store, addedRecords) {
+ var range = store.getRange();
+
+ if (range.length > 1) {
+ var addedIds = Ext.Array.pluck(addedRecords, 'internalId'),
+ records = Ext.clone(range);
+
+ store.removeAll();
+
+ for (var i = 0; i < range.length; i++) {
+ if (Ext.Array.contains(addedIds, range[i].internalId)) {
+ store.add(range[i]);
+ }
+ else {
+ filterStore.add(range[i]);
+ }
+ }
+ }
+
Ext.defer( function() {
ms.boundList.getSelectionModel().deselectAll();
- }, 10);
+ }, 10);
});
}
}
@@ -1014,10 +1032,28 @@
filterStore.add(record);
});
- ms.store.on('add', function() {
+ ms.store.on('add', function(store, addedRecords) {
+ var range = store.getRange();
+
+ if (range.length > 1) {
+ var addedIds = Ext.Array.pluck(addedRecords, 'internalId'),
+ records = Ext.clone(range);
+
+ store.removeAll();
+
+ for (var i = 0; i < range.length; i++) {
+ if (Ext.Array.contains(addedIds, range[i].internalId)) {
+ store.add(range[i]);
+ }
+ else {
+ filterStore.add(range[i]);
+ }
+ }
+ }
+
Ext.defer( function() {
ms.boundList.getSelectionModel().deselectAll();
- }, 10);
+ }, 10);
});
}
}
@@ -1177,8 +1213,8 @@
filterStore.removeAll();
if (!isAll) {
- colStore.add({id: dimConf.organisationUnit.dimensionName, name: dimConf.organisationUnit.name});
- colStore.add({id: dimConf.period.dimensionName, name: dimConf.period.name});
+ filterStore.add({id: dimConf.organisationUnit.dimensionName, name: dimConf.organisationUnit.name});
+ rowStore.add({id: dimConf.period.dimensionName, name: dimConf.period.name});
}
fixedFilterStore.setListHeight();
@@ -1207,31 +1243,17 @@
'->',
{
text: NS.i18n.hide,
- listeners: {
- added: function(b) {
- b.on('click', function() {
- window.hide();
- });
- }
- }
+ handler: function() {
+ window.hide();
+ }
},
{
text: '<b>' + NS.i18n.update + '</b>',
- listeners: {
- added: function(b) {
- b.on('click', function() {
- var config = ns.core.web.report.getLayoutConfig();
-
- if (!config) {
- return;
- }
-
- ns.core.web.report.getData(config, false);
-
- window.hide();
- });
- }
- }
+ handler: function() {
+ ns.app.viewport.update();
+
+ window.hide();
+ }
}
],
listeners: {
@@ -1261,182 +1283,245 @@
};
AggregateOptionsWindow = function() {
- var showTotals,
- showSubTotals,
- hideEmptyRows,
- limit,
- countType,
- aggregationType,
- showHierarchy,
- digitGroupSeparator,
- displayDensity,
- fontSize,
- reportingPeriod,
- organisationUnit,
- parentOrganisationUnit,
+ var showValues,
+ hideEmptyRows,
+ showTrendLine,
+ targetLineValue,
+ targetLineTitle,
+ baseLineValue,
+ baseLineTitle,
+
+ rangeAxisMaxValue,
+ rangeAxisMinValue,
+ rangeAxisSteps,
+ rangeAxisDecimals,
+ rangeAxisTitle,
+ domainAxisTitle,
+
+ hideLegend,
+ hideTitle,
+ title,
data,
- style,
- parameters,
-
- comboboxWidth = 280,
- window;
-
- showTotals = Ext.create('Ext.form.field.Checkbox', {
- boxLabel: NS.i18n.show_totals,
- style: 'margin-bottom:4px',
- checked: true
- });
-
- showSubTotals = Ext.create('Ext.form.field.Checkbox', {
- boxLabel: NS.i18n.show_subtotals,
- style: 'margin-bottom:4px',
- checked: true
+ axes,
+ general,
+ window,
+
+ cmpWidth = 340,
+ labelWidth = 125,
+ numberWidth = 80;
+
+ showTrendLine = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.trend_line,
+ style: 'margin-bottom:6px'
+ });
+
+ targetLineValue = Ext.create('Ext.form.field.Number', {
+ width: numberWidth,
+ height: 18,
+ listeners: {
+ change: function(nf) {
+ targetLineTitle.xable();
+ }
+ }
+ });
+
+ targetLineTitle = Ext.create('Ext.form.field.Text', {
+ style: 'margin-left:1px; margin-bottom:1px',
+ fieldStyle: 'padding-left:3px',
+ emptyText: NS.i18n.target,
+ width: cmpWidth - labelWidth - 5 - numberWidth - 1,
+ maxLength: 100,
+ enforceMaxLength: true,
+ disabled: true,
+ xable: function() {
+ this.setDisabled(!targetLineValue.getValue() && !Ext.isNumber(targetLineValue.getValue()));
+ }
+ });
+
+ baseLineValue = Ext.create('Ext.form.field.Number', {
+ //cls: 'gis-numberfield',
+ width: numberWidth,
+ height: 18,
+ listeners: {
+ change: function(nf) {
+ baseLineTitle.xable();
+ }
+ }
+ });
+
+ baseLineTitle = Ext.create('Ext.form.field.Text', {
+ //cls: 'ns-textfield-alt1',
+ style: 'margin-left:1px; margin-bottom:1px',
+ fieldStyle: 'padding-left:3px',
+ emptyText: NS.i18n.base,
+ width: cmpWidth - labelWidth - 5 - numberWidth - 1,
+ maxLength: 100,
+ enforceMaxLength: true,
+ disabled: true,
+ xable: function() {
+ this.setDisabled(!baseLineValue.getValue() && !Ext.isNumber(baseLineValue.getValue()));
+ }
});
hideEmptyRows = Ext.create('Ext.form.field.Checkbox', {
- boxLabel: NS.i18n.hide_empty_rows,
+ boxLabel: NS.i18n.hide_empty_category_items,
+ style: 'margin-bottom:4px'
+ });
+
+ rangeAxisMaxValue = Ext.create('Ext.form.field.Number', {
+ width: numberWidth,
+ height: 18,
+ labelWidth: 125,
+ style: 'margin-left:1px'
+ });
+
+ rangeAxisMinValue = Ext.create('Ext.form.field.Number', {
+ width: numberWidth,
+ height: 18,
+ labelWidth: 125
+ });
+
+ rangeAxisSteps = Ext.create('Ext.form.field.Number', {
+ width: labelWidth + 5 + numberWidth,
+ height: 18,
+ fieldLabel: 'Range axis tick steps',
+ labelWidth: 125,
+ minValue: 1
+ });
+
+ rangeAxisDecimals = Ext.create('Ext.form.field.Number', {
+ width: labelWidth + 5 + numberWidth,
+ height: 18,
+ fieldLabel: 'Range axis decimals',
+ labelWidth: 125,
+ minValue: 0
+ });
+
+ showValues = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.show_values,
style: 'margin-bottom:4px',
- checked: true
- });
-
- limit = Ext.create('Ext.ux.container.LimitContainer', {
- boxLabel: NS.i18n.limit,
- sortOrder: 1,
- topLimit: 10,
- comboboxWidth: comboboxWidth
- });
-
- countType = Ext.create('Ext.form.field.ComboBox', {
- cls: 'ns-combo',
- style: 'margin-bottom:2px',
- width: comboboxWidth,
- labelWidth: 130,
- fieldLabel: NS.i18n.count_type,
- labelStyle: 'color:#333',
- queryMode: 'local',
- valueField: 'id',
- editable: false,
- value: 'events',
- store: Ext.create('Ext.data.Store', {
- fields: ['id', 'text'],
- data: [
- {id: 'events', text: NS.i18n.events},
- {id: 'tracked_entity_instances', text: NS.i18n.tracked_entity_instances}
- ]
- })
- });
-
- showHierarchy = Ext.create('Ext.form.field.Checkbox', {
- boxLabel: NS.i18n.show_hierarchy,
+ checked: true
+ });
+
+ hideLegend = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.hide_legend,
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
- //});
-
- data = {
+ hideTitle = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.hide_chart_title,
+ style: 'margin-bottom:7px',
+ listeners: {
+ change: function() {
+ title.xable();
+ }
+ }
+ });
+
+ title = Ext.create('Ext.form.field.Text', {
+ style: 'margin-bottom:2px',
+ width: cmpWidth,
+ fieldLabel: NS.i18n.chart_title,
+ labelStyle: 'color:#333',
+ labelWidth: 125,
+ maxLength: 100,
+ enforceMaxLength: true,
+ xable: function() {
+ this.setDisabled(hideTitle.getValue());
+ }
+ });
+
+ rangeAxisTitle = Ext.create('Ext.form.field.Text', {
+ width: cmpWidth,
+ fieldLabel: NS.i18n.range_axis_label,
+ labelStyle: 'color:#333',
+ labelWidth: 125,
+ maxLength: 100,
+ enforceMaxLength: true,
+ style: 'margin-bottom:1px'
+ });
+
+ domainAxisTitle = Ext.create('Ext.form.field.Text', {
+ width: cmpWidth,
+ fieldLabel: NS.i18n.domain_axis_label,
+ labelStyle: 'color:#333',
+ labelWidth: 125,
+ maxLength: 100,
+ enforceMaxLength: true,
+ style: 'margin-bottom:1px'
+ });
+
+ data = {
+ xtype: 'container',
bodyStyle: 'border:0 none',
style: 'margin-left:14px',
items: [
- showTotals,
- showSubTotals,
+ showValues,
hideEmptyRows,
- limit,
- countType
- //aggregationType
- ]
- };
-
- 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
+ showTrendLine,
+ {
+ xtype: 'container',
+ layout: 'column',
+ bodyStyle: 'border:0 none',
+ items: [
+ {
+ bodyStyle: 'border:0 none; padding-top:3px; margin-right:5px; color:#333',
+ width: 130,
+ html: 'Target value / title:'
+ },
+ targetLineValue,
+ targetLineTitle
+ ]
+ },
+ {
+ xtype: 'container',
+ layout: 'column',
+ bodyStyle: 'border:0 none',
+ items: [
+ {
+ bodyStyle: 'border:0 none; padding-top:3px; margin-right:5px; color:#333',
+ width: 130,
+ html: 'Base value / title:'
+ },
+ baseLineValue,
+ baseLineTitle
+ ]
+ }
+ ]
+ };
+
+ axes = {
+ bodyStyle: 'border:0 none',
+ style: 'margin-left:14px',
+ items: [
+ {
+ layout: 'column',
+ bodyStyle: 'border:0 none',
+ items: [
+ {
+ bodyStyle: 'border:0 none; padding-top:3px; margin-right:5px; color:#333',
+ width: 130,
+ html: 'Range axis min/max:'
+ },
+ rangeAxisMinValue,
+ rangeAxisMaxValue
+ ]
+ },
+ rangeAxisSteps,
+ rangeAxisDecimals,
+ rangeAxisTitle,
+ domainAxisTitle
+ ]
+ };
+
+ general = {
+ bodyStyle: 'border:0 none',
+ style: 'margin-left:14px',
+ items: [
+ hideLegend,
+ hideTitle,
+ title
]
};
@@ -1450,38 +1535,117 @@
hideOnBlur: true,
getOptions: function() {
return {
- showTotals: showTotals.getValue(),
- showSubTotals: showSubTotals.getValue(),
- hideEmptyRows: hideEmptyRows.getValue(),
- sortOrder: limit.getSortOrder(),
- topLimit: limit.getTopLimit(),
- countType: countType.getValue(),
- showHierarchy: showHierarchy.getValue(),
- displayDensity: displayDensity.getValue(),
- fontSize: fontSize.getValue(),
- digitGroupSeparator: digitGroupSeparator.getValue()
- //legendSet: {id: legendSet.getValue()}
+ showValues: showValues.getValue(),
+ hideEmptyRows: hideEmptyRows.getValue(),
+ showTrendLine: showTrendLine.getValue(),
+ targetLineValue: targetLineValue.getValue(),
+ targetLineTitle: targetLineTitle.getValue(),
+ baseLineValue: baseLineValue.getValue(),
+ baseLineTitle: baseLineTitle.getValue(),
+ rangeAxisMaxValue: rangeAxisMaxValue.getValue(),
+ rangeAxisMinValue: rangeAxisMinValue.getValue(),
+ rangeAxisSteps: rangeAxisSteps.getValue(),
+ rangeAxisDecimals: rangeAxisDecimals.getValue(),
+ rangeAxisTitle: rangeAxisTitle.getValue(),
+ domainAxisTitle: domainAxisTitle.getValue(),
+ hideLegend: hideLegend.getValue(),
+ hideTitle: hideTitle.getValue(),
+ title: title.getValue()
};
},
setOptions: function(layout) {
- showTotals.setValue(Ext.isBoolean(layout.showTotals) ? layout.showTotals : true);
- showSubTotals.setValue(Ext.isBoolean(layout.showSubTotals) ? layout.showSubTotals : true);
+ showValues.setValue(Ext.isBoolean(layout.showValues) ? layout.showValues : false);
hideEmptyRows.setValue(Ext.isBoolean(layout.hideEmptyRows) ? layout.hideEmptyRows : false);
- limit.setValues(layout.sortOrder, layout.topLimit);
- countType.setValue(Ext.isString(layout.countType) ? layout.countType : 'events');
- //aggregationType.setValue(Ext.isString(layout.aggregationType) ? layout.aggregationType : 'default');
- 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);
- //reportingPeriod.setValue(Ext.isBoolean(layout.reportingPeriod) ? layout.reportingPeriod : false);
- //organisationUnit.setValue(Ext.isBoolean(layout.organisationUnit) ? layout.organisationUnit : false);
- //parentOrganisationUnit.setValue(Ext.isBoolean(layout.parentOrganisationUnit) ? layout.parentOrganisationUnit : false);
- //regression.setValue(Ext.isBoolean(layout.regression) ? layout.regression : false);
- //cumulative.setValue(Ext.isBoolean(layout.cumulative) ? layout.cumulative : false);
- //sortOrder.setValue(Ext.isNumber(layout.sortOrder) ? layout.sortOrder : 0);
- //topLimit.setValue(Ext.isNumber(layout.topLimit) ? layout.topLimit : 0);
+ showTrendLine.setValue(Ext.isBoolean(layout.showTrendLine) ? layout.showTrendLine : false);
+
+ // target line
+ if (Ext.isNumber(layout.targetLineValue)) {
+ targetLineValue.setValue(layout.targetLineValue);
+ }
+ else {
+ targetLineValue.reset();
+ }
+
+ if (Ext.isString(layout.targetLineTitle)) {
+ targetLineTitle.setValue(layout.targetLineTitle);
+ }
+ else {
+ targetLineTitle.reset();
+ }
+
+ // base line
+ if (Ext.isNumber(layout.baseLineValue)) {
+ baseLineValue.setValue(layout.baseLineValue);
+ }
+ else {
+ baseLineValue.reset();
+ }
+
+ if (Ext.isString(layout.baseLineTitle)) {
+ baseLineTitle.setValue(layout.baseLineTitle);
+ }
+ else {
+ baseLineTitle.reset();
+ }
+
+ // rangeAxisMaxValue
+ if (Ext.isNumber(layout.rangeAxisMaxValue)) {
+ rangeAxisMaxValue.setValue(layout.rangeAxisMaxValue);
+ }
+ else {
+ rangeAxisMaxValue.reset();
+ }
+
+ // rangeAxisMinValue
+ if (Ext.isNumber(layout.rangeAxisMinValue)) {
+ rangeAxisMinValue.setValue(layout.rangeAxisMinValue);
+ }
+ else {
+ rangeAxisMinValue.reset();
+ }
+
+ // rangeAxisSteps
+ if (Ext.isNumber(layout.rangeAxisSteps)) {
+ rangeAxisSteps.setValue(layout.rangeAxisSteps);
+ }
+ else {
+ rangeAxisSteps.reset();
+ }
+
+ // rangeAxisDecimals
+ if (Ext.isNumber(layout.rangeAxisDecimals)) {
+ rangeAxisDecimals.setValue(layout.rangeAxisDecimals);
+ }
+ else {
+ rangeAxisDecimals.reset();
+ }
+
+ // range axis title
+ if (Ext.isString(layout.rangeAxisTitle)) {
+ rangeAxisTitle.setValue(layout.rangeAxisTitle);
+ }
+ else {
+ rangeAxisTitle.reset();
+ }
+
+ // domain axis title
+ if (Ext.isString(layout.domainAxisTitle)) {
+ domainAxisTitle.setValue(layout.domainAxisTitle);
+ }
+ else {
+ domainAxisTitle.reset();
+ }
+
+ hideLegend.setValue(Ext.isBoolean(layout.hideLegend) ? layout.hideLegend : false);
+ hideTitle.setValue(Ext.isBoolean(layout.hideTitle) ? layout.hideTitle : false);
+
+ // title
+ if (Ext.isString(layout.title)) {
+ title.setValue(layout.title);
+ }
+ else {
+ title.reset();
+ }
},
items: [
{
@@ -1496,18 +1660,18 @@
{
bodyStyle: 'border:0 none; color:#222; font-size:12px; font-weight:bold',
style: 'margin-bottom:6px; margin-left:2px',
- html: NS.i18n.organisation_units
+ html: NS.i18n.axes
},
- organisationUnits,
+ axes,
{
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
+ html: NS.i18n.general
},
- style
+ general
],
bbar: [
'->',
@@ -1520,14 +1684,7 @@
{
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);
+ ns.app.viewport.update();
window.hide();
}
@@ -1543,20 +1700,25 @@
}
}
- //if (!legendSet.store.isLoaded) {
- //legendSet.store.load();
- //}
-
// cmp
- w.showTotals = showTotals;
- w.showSubTotals = showSubTotals;
- w.hideEmptyRows = hideEmptyRows;
- w.limit = limit;
- w.countType = countType;
- w.showHierarchy = showHierarchy;
- w.displayDensity = displayDensity;
- w.fontSize = fontSize;
- w.digitGroupSeparator = digitGroupSeparator;
+ w.showValues = showValues;
+ w.hideEmptyRows = hideEmptyRows;
+ w.showTrendLine = showTrendLine;
+ w.targetLineValue = targetLineValue;
+ w.targetLineTitle = targetLineTitle;
+ w.baseLineValue = baseLineValue;
+ w.baseLineTitle = baseLineTitle;
+
+ w.rangeAxisMaxValue = rangeAxisMaxValue;
+ w.rangeAxisMinValue = rangeAxisMinValue;
+ w.rangeAxisSteps = rangeAxisSteps;
+ w.rangeAxisDecimals = rangeAxisDecimals;
+ w.rangeAxisTitle = rangeAxisTitle;
+ w.domainAxisTitle = domainAxisTitle;
+
+ w.hideLegend = hideLegend;
+ w.hideTitle = hideTitle;
+ w.title = title;
}
}
});
@@ -3198,7 +3360,7 @@
ux.setRecord(element);
}
- store = Ext.Array.contains(includeKeys, element.type) || element.optionSet ? aggWindow.rowStore : aggWindow.fixedFilterStore;
+ store = Ext.Array.contains(includeKeys, element.type) || element.optionSet ? aggWindow.colStore : aggWindow.fixedFilterStore;
if (store === aggWindow.fixedFilterStore) {
fixedFilterElementIds.push(element.id);
@@ -4445,7 +4607,7 @@
ns.app.shareButton.enable();
}
- ns.app.statusBar.setStatus(layout, response);
+ //ns.app.statusBar.setStatus(layout, response);
// set gui
if (!updateGui) {
@@ -4690,6 +4852,32 @@
}
}());
+ // support
+ (function() {
+
+ // svg
+ support.svg = support.svg || {};
+
+ support.svg.submitForm = function(type) {
+ var svg = Ext.query('svg'),
+ form = Ext.query('#exportForm')[0];
+
+ if (!(Ext.isArray(svg) && svg.length)) {
+ alert('Browser does not support SVG');
+ return;
+ }
+
+ svg = Ext.get(svg[0]);
+ svg = svg.parent().dom.innerHTML;
+
+ Ext.query('#svgField')[0].value = svg;
+ Ext.query('#filenameField')[0].value = 'test';
+
+ form.action = ns.core.init.contextPath + '/api/svg.' + type;
+ form.submit();
+ };
+ }());
+
// web
(function() {
@@ -5147,8 +5335,7 @@
direction: view.sortOrder == 1 ? 'DESC' : 'ASC'
};
}
- //}
-
+
return view;
};
@@ -5240,53 +5427,37 @@
};
web.report.createReport = function(layout, response, isUpdateGui) {
- var map = {};
-
- //map['aggregated_values'] = function() {
var xLayout,
xColAxis,
xRowAxis,
- table,
- getHtml,
+ chart,
+ //getHtml,
getXLayout = service.layout.getExtendedLayout,
getSXLayout = service.layout.getSyncronizedXLayout,
- getXResponse = service.response.aggregate.getExtendedResponse,
- getXAxis = service.layout.getExtendedAxis;
+ getXResponse = service.response.aggregate.getExtendedResponse;
+ //getXAxis = service.layout.getExtendedAxis;
response = response || ns.app.response;
- getHtml = function(xLayout, xResponse) {
- xColAxis = getXAxis(xLayout, 'col');
- xRowAxis = getXAxis(xLayout, 'row');
-
- return web.report.aggregate.getHtml(xLayout, xResponse, xColAxis, xRowAxis);
- };
-
xLayout = getXLayout(layout);
xResponse = service.response.aggregate.getExtendedResponse(xLayout, response);
xLayout = getSXLayout(xLayout, xResponse);
- table = getHtml(xLayout, xResponse);
-
- if (table.tdCount > 20000 || (layout.hideEmptyRows && table.tdCount > 10000)) {
- alert('Table has too many cells. Please reduce the table and try again.');
- web.mask.hide(ns.app.centerRegion);
- return;
- }
-
- if (layout.sorting) {
- xResponse = web.report.aggregate.sort(xLayout, xResponse, xColAxis);
- xLayout = getSXLayout(xLayout, xResponse);
- table = getHtml(xLayout, xResponse);
- }
-
- web.mask.show(ns.app.centerRegion, 'Rendering table..');
+ chart = web.report.aggregate.createChart(layout, xLayout, xResponse, ns.app.centerRegion);
+
+ //if (layout.sorting) {
+ //xResponse = web.report.aggregate.sort(xLayout, xResponse, xColAxis);
+ //xLayout = getSXLayout(xLayout, xResponse);
+ //table = getHtml(xLayout, xResponse);
+ //}
+
+ web.mask.show(ns.app.centerRegion, 'Rendering chart..');
// timing
ns.app.dateRender = new Date();
ns.app.centerRegion.removeAll(true);
- ns.app.centerRegion.update(table.html);
+ ns.app.centerRegion.add(chart);
// timing
ns.app.dateTotal = new Date();
@@ -5296,23 +5467,17 @@
ns.app.xLayout = xLayout;
ns.app.response = response;
ns.app.xResponse = xResponse;
- ns.app.xColAxis = xColAxis;
- ns.app.xRowAxis = xRowAxis;
- ns.app.uuidDimUuidsMap = table.uuidDimUuidsMap;
- ns.app.uuidObjectMap = Ext.applyIf((xColAxis ? xColAxis.uuidObjectMap : {}), (xRowAxis ? xRowAxis.uuidObjectMap : {}));
-
+ ns.app.chart = chart;
+
if (NS.isSessionStorage) {
- //web.events.setValueMouseHandlers(layout, response || xResponse, ns.app.uuidDimUuidsMap, ns.app.uuidObjectMap);
- web.events.setColumnHeaderMouseHandlers(layout, response, xResponse);
- web.storage.session.set(layout, 'table');
+ web.storage.session.set(layout, 'eventchart');
}
- ns.app.widget.setGui(layout, xLayout, response, isUpdateGui, table);
+ ns.app.widget.setGui(layout, xLayout, response, isUpdateGui); //table);
web.mask.hide(ns.app.centerRegion);
-
+
if (NS.isDebug) {
- console.log("Number of cells", table.tdCount);
console.log("DATA", (ns.app.dateCreate - ns.app.dateData) / 1000);
console.log("CREATE", (ns.app.dateRender - ns.app.dateCreate) / 1000);
console.log("RENDER", (ns.app.dateTotal - ns.app.dateRender) / 1000);
@@ -5723,6 +5888,25 @@
shadow: false,
showSeparator: false,
items: [
+ {
+ xtype: 'label',
+ text: NS.i18n.graphics,
+ style: 'padding:7px 5px 5px 7px; font-weight:bold'
+ },
+ {
+ text: 'PNG (.png)',
+ iconCls: 'ns-menu-item-image',
+ handler: function() {
+ ns.core.support.svg.submitForm('png');
+ }
+ },
+ {
+ text: 'PDF (.pdf)',
+ iconCls: 'ns-menu-item-image',
+ handler: function() {
+ ns.core.support.svg.submitForm('pdf');
+ }
+ },
{
xtype: 'label',
text: NS.i18n.plain_data_sources,
@@ -5926,16 +6110,16 @@
}
});
- statusBar = Ext.create('Ext.ux.toolbar.StatusBar', {
- height: 27,
- listeners: {
- render: function() {
- ns.app.statusBar = this;
+ //statusBar = Ext.create('Ext.ux.toolbar.StatusBar', {
+ //height: 27,
+ //listeners: {
+ //render: function() {
+ //ns.app.statusBar = this;
- this.reset();
- }
- }
- });
+ //this.reset();
+ //}
+ //}
+ //});
centerRegion = Ext.create('Ext.panel.Panel', {
region: 'center',
@@ -5982,28 +6166,16 @@
}
]
},
- bbar: statusBar,
+ //bbar: statusBar,
listeners: {
added: function() {
ns.app.centerRegion = this;
},
- afterrender: function(p) {
- var liStyle = 'padding:3px 10px; color:#333',
- html = '';
-
- html += '<div style="padding:20px">';
- html += '<div style="font-size:14px; padding-bottom:8px">' + NS.i18n.example1 + '</div>';
- html += '<div style="' + liStyle + '">- ' + NS.i18n.example2 + '</div>';
- html += '<div style="' + liStyle + '">- ' + NS.i18n.example3 + '</div>';
- html += '<div style="' + liStyle + '">- ' + NS.i18n.example4 + '</div>';
- html += '<div style="font-size:14px; padding-top:20px; padding-bottom:8px">' + NS.i18n.example5 + '</div>';
- html += '<div style="' + liStyle + '">- ' + NS.i18n.example6 + '</div>';
- html += '<div style="' + liStyle + '">- ' + NS.i18n.example7 + '</div>';
- html += '<div style="' + liStyle + '">- ' + NS.i18n.example8 + '</div>';
- html += '</div>';
-
- p.update(html);
- }
+ resize: function(p) {
+ if (ns.app.xLayout && ns.app.chart) {
+ ns.app.chart.onViewportResize();
+ }
+ }
}
});
@@ -6019,6 +6191,7 @@
layout: 'border',
getLayoutWindow: getLayoutWindow,
chartType: chartType,
+ update: update,
items: [
westRegion,
centerRegion
=== modified file 'dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/core.js 2014-05-30 10:23:05 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/core.js 2014-06-05 15:00:36 +0000
@@ -4,8 +4,8 @@
Ext.Ajax.method = 'GET';
// namespace
- ER = {};
- var NS = ER;
+ EV = {};
+ var NS = EV;
NS.instances = [];
NS.i18n = {};
@@ -194,22 +194,15 @@
multiselect_fill_reportingrates: 315
};
- conf.report = {
- digitGroupSeparator: {
- 'comma': ',',
- 'space': ' '
- },
- displayDensity: {
- 'compact': '3px',
- 'normal': '5px',
- 'comfortable': '10px',
- },
- fontSize: {
- 'small': '10px',
- 'normal': '11px',
- 'large': '13px'
- }
- };
+ conf.chart = {
+ style: {
+ inset: 30,
+ fontFamily: 'Arial,Sans-serif,Lucida Grande,Ubuntu'
+ },
+ theme: {
+ dv1: ['#94ae0a', '#0b3b68', '#a61120', '#ff8809', '#7c7474', '#a61187', '#ffd13e', '#24ad9a', '#a66111', '#414141', '#4500c4', '#1d5700']
+ }
+ };
}());
// api
@@ -286,39 +279,77 @@
getValidatedDimensionArray,
validateSpecialCases;
+ // type: string ('column') - 'column', 'stackedcolumn', 'bar', 'stackedbar', 'line', 'area', 'pie'
+
+ // program: object
+
+ // programStage: object
+
// columns: [Dimension]
// rows: [Dimension]
// filters: [Dimension]
-
- // showTotals: boolean (true)
-
- // showSubTotals: boolean (true)
+
+ // showTrendLine: boolean (false)
+
+ // targetLineValue: number
+
+ // targetLineTitle: string
+
+ // baseLineValue: number
+
+ // baseLineTitle: string
+
+ // rangeAxisMaxValue: number
+
+ // rangeAxisMinValue: number
+
+ // rangeAxisSteps: number
+
+ // rangeAxisDecimals: number
+
+ // showValues: boolean (true)
+
+ // showTotals: boolean (true)
+
+ // showSubTotals: boolean (true)
// hideEmptyRows: boolean (false)
- // aggregationType: string ('default') - 'default', 'count', 'sum'
-
- // showHierarchy: boolean (false)
-
- // displayDensity: string ('normal') - 'compact', 'normal', 'comfortable'
-
- // fontSize: string ('normal') - 'small', 'normal', 'large'
-
- // digitGroupSeparator: string ('space') - 'none', 'comma', 'space'
-
- // legendSet: object
+ // aggregationType: string ('default') - 'default', 'count', 'sum'
+
+ // showHierarchy: boolean (false)
+
+ // displayDensity: string ('normal') - 'compact', 'normal', 'comfortable'
+
+ // fontSize: string ('normal') - 'small', 'normal', 'large'
+
+ // digitGroupSeparator: string ('space') - 'none', 'comma', 'space'
+
+ // legendSet: object
+
+ // hideLegend: boolean (false)
+
+ // hideTitle: boolean (false)
+
+ // domainAxisTitle: string
+
+ // rangeAxisTitle: string
+
+ // userOrganisationUnit: boolean (false)
+
+ // userOrganisationUnitChildren: boolean (false)
// parentGraphMap: object
// sorting: transient object
- // reportingPeriod: boolean (false) //report tables only
-
- // organisationUnit: boolean (false) //report tables only
-
- // parentOrganisationUnit: boolean (false) //report tables only
+ // reportingPeriod: boolean (false) //report tables only
+
+ // organisationUnit: boolean (false) //report tables only
+
+ // parentOrganisationUnit: boolean (false) //report tables only
// regression: boolean (false)
@@ -424,8 +455,13 @@
config.filters = getValidatedDimensionArray(config.filters);
// at least one dimension specified as column or row
- if (!(config.columns || config.rows)) {
- alert(NS.i18n.at_least_one_dimension_must_be_specified_as_row_or_column);
+ if (!config.columns) {
+ alert('No series items selected');
+ return;
+ }
+
+ if (!config.rows) {
+ alert('No category items selected');
return;
}
@@ -454,35 +490,44 @@
}
// layout
+ layout.type = config.type;
+
+ layout.program = config.program;
+ layout.programStage = config.programStage;
+
layout.columns = config.columns;
layout.rows = config.rows;
layout.filters = config.filters;
// properties
- layout.showTotals = Ext.isBoolean(config.totals) ? config.totals : (Ext.isBoolean(config.showTotals) ? config.showTotals : true);
- layout.showSubTotals = Ext.isBoolean(config.subtotals) ? config.subtotals : (Ext.isBoolean(config.showSubTotals) ? config.showSubTotals : true);
- layout.hideEmptyRows = Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : false;
- layout.aggregationType = Ext.isString(config.aggregationType) ? config.aggregationType : 'default';
-
- layout.showHierarchy = Ext.isBoolean(config.showHierarchy) ? config.showHierarchy : false;
-
- layout.displayDensity = Ext.isString(config.displayDensity) && !Ext.isEmpty(config.displayDensity) ? config.displayDensity : 'normal';
- layout.fontSize = Ext.isString(config.fontSize) && !Ext.isEmpty(config.fontSize) ? config.fontSize : 'normal';
- layout.digitGroupSeparator = Ext.isString(config.digitGroupSeparator) && !Ext.isEmpty(config.digitGroupSeparator) ? config.digitGroupSeparator : 'space';
- layout.legendSet = Ext.isObject(config.legendSet) && Ext.isString(config.legendSet.id) ? config.legendSet : null;
-
- layout.parentGraphMap = Ext.isObject(config.parentGraphMap) ? config.parentGraphMap : null;
-
- layout.sorting = Ext.isObject(config.sorting) && Ext.isDefined(config.sorting.id) && Ext.isString(config.sorting.direction) ? config.sorting : null;
-
- layout.reportingPeriod = Ext.isObject(config.reportParams) && Ext.isBoolean(config.reportParams.paramReportingPeriod) ? config.reportParams.paramReportingPeriod : (Ext.isBoolean(config.reportingPeriod) ? config.reportingPeriod : false);
- layout.organisationUnit = Ext.isObject(config.reportParams) && Ext.isBoolean(config.reportParams.paramOrganisationUnit) ? config.reportParams.paramOrganisationUnit : (Ext.isBoolean(config.organisationUnit) ? config.organisationUnit : false);
- layout.parentOrganisationUnit = Ext.isObject(config.reportParams) && Ext.isBoolean(config.reportParams.paramParentOrganisationUnit) ? config.reportParams.paramParentOrganisationUnit : (Ext.isBoolean(config.parentOrganisationUnit) ? config.parentOrganisationUnit : false);
-
- layout.regression = Ext.isBoolean(config.regression) ? config.regression : false;
- layout.cumulative = Ext.isBoolean(config.cumulative) ? config.cumulative : false;
- layout.sortOrder = Ext.isNumber(config.sortOrder) ? config.sortOrder : 0;
- layout.topLimit = Ext.isNumber(config.topLimit) ? config.topLimit : 0;
+ layout.showValues = Ext.isBoolean(config.showData) ? config.showData : (Ext.isBoolean(config.showValues) ? config.showValues : true);
+ layout.hideEmptyRows = Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : (Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : true);
+ layout.showTrendLine = Ext.isBoolean(config.regression) ? config.regression : (Ext.isBoolean(config.showTrendLine) ? config.showTrendLine : false);
+ layout.targetLineValue = Ext.isNumber(config.targetLineValue) ? config.targetLineValue : null;
+ layout.targetLineTitle = Ext.isString(config.targetLineLabel) && !Ext.isEmpty(config.targetLineLabel) ? config.targetLineLabel :
+ (Ext.isString(config.targetLineTitle) && !Ext.isEmpty(config.targetLineTitle) ? config.targetLineTitle : null);
+ layout.baseLineValue = Ext.isNumber(config.baseLineValue) ? config.baseLineValue : null;
+ layout.baseLineTitle = Ext.isString(config.baseLineLabel) && !Ext.isEmpty(config.baseLineLabel) ? config.baseLineLabel :
+ (Ext.isString(config.baseLineTitle) && !Ext.isEmpty(config.baseLineTitle) ? config.baseLineTitle : null);
+
+ layout.rangeAxisMaxValue = Ext.isNumber(config.rangeAxisMaxValue) ? config.rangeAxisMaxValue : null;
+ layout.rangeAxisMinValue = Ext.isNumber(config.rangeAxisMinValue) ? config.rangeAxisMinValue : null;
+ layout.rangeAxisSteps = Ext.isNumber(config.rangeAxisSteps) ? config.rangeAxisSteps : null;
+ layout.rangeAxisDecimals = Ext.isNumber(config.rangeAxisDecimals) ? config.rangeAxisDecimals : null;
+ layout.rangeAxisTitle = Ext.isString(config.rangeAxisLabel) && !Ext.isEmpty(config.rangeAxisLabel) ? config.rangeAxisLabel :
+ (Ext.isString(config.rangeAxisTitle) && !Ext.isEmpty(config.rangeAxisTitle) ? config.rangeAxisTitle : null);
+ layout.domainAxisTitle = Ext.isString(config.domainAxisLabel) && !Ext.isEmpty(config.domainAxisLabel) ? config.domainAxisLabel :
+ (Ext.isString(config.domainAxisTitle) && !Ext.isEmpty(config.domainAxisTitle) ? config.domainAxisTitle : null);
+
+ layout.hideLegend = Ext.isBoolean(config.hideLegend) ? config.hideLegend : false;
+ layout.hideTitle = Ext.isBoolean(config.hideTitle) ? config.hideTitle : false;
+ layout.title = Ext.isString(config.title) && !Ext.isEmpty(config.title) ? config.title : null;
+
+ layout.parentGraphMap = Ext.isObject(config.parentGraphMap) ? config.parentGraphMap : null;
+
+ //layout.sorting = Ext.isObject(config.sorting) && Ext.isDefined(config.sorting.id) && Ext.isString(config.sorting.direction) ? config.sorting : null;
+ //layout.sortOrder = Ext.isNumber(config.sortOrder) ? config.sortOrder : 0;
+ //layout.topLimit = Ext.isNumber(config.topLimit) ? config.topLimit : 0;
if (!validateSpecialCases()) {
return;
@@ -688,8 +733,17 @@
// str
support.prototype.str = {};
- support.prototype.str.replaceAll = function(str, find, replace) {
- return str.replace(new RegExp(find, 'g'), replace);
+ support.prototype.str.replaceAll = function(variable, find, replace) {
+ if (Ext.isString(variable)) {
+ variable = variable.split(find).join(replace);
+ }
+ else if (Ext.isArray(variable)) {
+ for (var i = 0; i < variable.length; i++) {
+ variable[i] = variable[i].split(find).join(replace);
+ }
+ }
+
+ return variable;
};
support.prototype.str.toggleDirection = function(direction) {
@@ -1588,7 +1642,7 @@
ouHierarchy,
names,
headers;
-
+
response = Ext.clone(response);
headers = response.headers;
ouHierarchy = response.metaData.ouHierarchy,
@@ -1693,79 +1747,13 @@
for (var j = 0; j < idIndexOrder.length; j++) {
id += row[idIndexOrder[j]];
}
-
+
response.idValueMap[id] = row[valueHeaderIndex];
}
return response;
};
-
- // query
- service.response.query = {};
-
- service.response.query.getExtendedResponse = function(layout, response) {
- var xResponse = Ext.clone(response),
- metaData = xResponse.metaData,
- dimensionNames = Ext.Array.unique(Ext.Array.pluck(layout.columns, 'dimension')),
- dimensionHeaders = [],
- headers = xResponse.headers,
- nameHeaderMap = {},
- nameMap = {},
- ouIndex;
-
- nameMap['pe'] = 'eventdate';
- nameMap['ou'] = 'ouname';
-
- // get ou index
- for (var i = 0, header; i < headers.length; i++) {
- if (headers[i].name === 'ou') {
- ouIndex = i;
- break;
- }
- }
-
- // update rows
- for (var i = 0, header; i < headers.length; i++) {
- header = headers[i];
- header.index = i;
-
- nameHeaderMap[header.name] = header;
-
- if (header.type === 'java.lang.Double') {
- 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);
- }
- }
-
- // TODO, using descendants -> missing orgunits in ouHierarchy
-
- //else if (header.name === 'ouname' && layout.showHierarchy && metaData.ouHierarchy) {
- //for (var j = 0, ouId; j < xResponse.rows.length; j++) {
- //ouId = xResponse.rows[j][ouIndex];
- //xResponse.rows[j][i] = service.layout.getHierarchyName(metaData.ouHierarchy, metaData.names, ouId);
- //}
- //}
- }
-
- // dimension headers
- for (var i = 0, name; i < dimensionNames.length; i++) {
- name = nameMap[dimensionNames[i]] || dimensionNames[i];
-
- dimensionHeaders.push(nameHeaderMap[name]);
- }
-
- xResponse.dimensionHeaders = dimensionHeaders;
- xResponse.nameHeaderMap = nameHeaderMap;
-
- return xResponse;
- };
- }());
+ }());
// web
(function() {
@@ -1824,9 +1812,7 @@
ignoreKeys = ['longitude', 'latitude'],
nameItemsMap;
- format = format || 'json';
-
- paramString = '/api/analytics/events/aggregate/' + view.program.id + '.' + format + '?';
+ paramString = '/api/analytics/events/aggregate/' + view.program.id + '.' + (format || 'json') + '?';
// stage
paramString += 'stage=' + view.programStage.id;
@@ -1836,7 +1822,7 @@
for (var i = 0, dim; i < dimensions.length; i++) {
dim = dimensions[i];
- if (Ext.Array.contains(ignoreKeys, dim.dimension)) {
+ if (Ext.Array.contains(ignoreKeys, dim.dimension) || (dim.dimension === 'pe' && !dim.items && !dim.filter)) {
continue;
}
@@ -1858,12 +1844,23 @@
}
// filters
- if (view.filters) {
+ if (view.filters) {
for (var i = 0, dim; i < view.filters.length; i++) {
dim = view.filters[i];
- paramString += '&filter=' + dim.dimension;
- paramString += dim.filter ? ':' + encodeURIComponent(dim.filter) : '';
+ paramString += '&filter=' + dim.dimension;
+
+ if (dim.items) {
+ paramString += ':';
+
+ for (var i = 0; i < dim.items.length; i++) {
+ paramString += encodeURIComponent(dim.items[i].id);
+ paramString += i < dim.items.length - 1 ? ';' : '';
+ }
+ }
+ else {
+ paramString += dim.filter ? ':' + encodeURIComponent(dim.filter) : '';
+ }
}
}
@@ -1962,843 +1959,1095 @@
return xResponse;
};
- web.report.aggregate.getHtml = function(xLayout, xResponse, xColAxis, xRowAxis) {
- var getRoundedHtmlValue,
- getTdHtml,
- doSubTotals,
- doTotals,
- getColAxisHtmlArray,
- getRowHtmlArray,
- rowAxisHtmlArray,
- getColTotalHtmlArray,
- getGrandTotalHtmlArray,
- getTotalHtmlArray,
- getHtml,
- getUniqueFactor = function(xAxis) {
- if (!xAxis) {
- return null;
- }
-
- var unique = xAxis.xItems.unique;
-
- if (unique) {
- return unique.length < 2 ? 1 : (xAxis.size / unique[0].length);
- }
-
- return null;
- },
- colUniqueFactor = getUniqueFactor(xColAxis),
- rowUniqueFactor = getUniqueFactor(xRowAxis),
- valueItems = [],
- valueObjects = [],
- totalColObjects = [],
- uuidDimUuidsMap = {},
- isLegendSet = Ext.isObject(xLayout.legendSet) && Ext.isArray(xLayout.legendSet.mapLegends) && xLayout.legendSet.mapLegends.length,
- tdCount = 0,
- htmlArray;
-
- xResponse.sortableIdObjects = [];
-
- getRoundedHtmlValue = function(value, dec) {
- dec = dec || 2;
- return parseFloat(support.prototype.number.roundIf(value, 2)).toString();
- };
-
- getTdHtml = function(config, metaDataId) {
- var bgColor,
- mapLegends,
- colSpan,
- rowSpan,
- htmlValue,
- displayDensity,
- fontSize,
- isNumeric = Ext.isObject(config) && Ext.isString(config.type) && config.type.substr(0,5) === 'value' && !config.empty,
- isValue = Ext.isObject(config) && Ext.isString(config.type) && config.type === 'value' && !config.empty,
- cls = '',
- html = '';
-
- if (!Ext.isObject(config)) {
- return '';
- }
-
- if (config.hidden || config.collapsed) {
- return '';
- }
-
- // number of cells
- tdCount = tdCount + 1;
-
- // background color from legend set
- if (isNumeric && xLayout.legendSet) {
- var value = parseFloat(config.value);
- mapLegends = xLayout.legendSet.mapLegends;
-
- for (var i = 0; i < mapLegends.length; i++) {
- if (Ext.Number.constrain(value, mapLegends[i].startValue, mapLegends[i].endValue) === value) {
- bgColor = mapLegends[i].color;
- }
- }
- }
-
- colSpan = config.colSpan ? 'colspan="' + config.colSpan + '" ' : '';
- rowSpan = config.rowSpan ? 'rowspan="' + config.rowSpan + '" ' : '';
- htmlValue = config.collapsed ? '' : config.htmlValue || config.value || '';
- htmlValue = config.type !== 'dimension' ? support.prototype.number.prettyPrint(htmlValue, xLayout.digitGroupSeparator) : htmlValue;
- displayDensity = conf.report.displayDensity[config.displayDensity] || conf.report.displayDensity[xLayout.displayDensity];
- fontSize = conf.report.fontSize[config.fontSize] || conf.report.fontSize[xLayout.fontSize];
-
- cls += config.hidden ? ' td-hidden' : '';
- cls += config.collapsed ? ' td-collapsed' : '';
- //cls += isValue ? ' pointer' : '';
- cls += bgColor ? ' legend' : (config.cls ? ' ' + config.cls : '');
-
- // sorting
- if (Ext.isString(metaDataId)) {
- cls += ' td-sortable';
-
- xResponse.sortableIdObjects.push({
- id: metaDataId,
- uuid: config.uuid
- });
- }
-
- html += '<td ' + (config.uuid ? ('id="' + config.uuid + '" ') : '');
- html += ' class="' + cls + '" ' + colSpan + rowSpan
-
-
- if (bgColor) {
- html += '>';
- html += '<div class="legendCt">';
- html += '<div class="number ' + config.cls + '" style="padding:' + displayDensity + '; padding-right:3px; font-size:' + fontSize + '">' + htmlValue + '</div>';
- html += '<div class="arrowCt ' + config.cls + '">';
- html += '<div class="arrow" style="border-bottom:8px solid transparent; border-right:8px solid ' + bgColor + '"> </div>';
- html += '</div></div></div></td>';
-
- //cls = 'legend';
- //cls += config.hidden ? ' td-hidden' : '';
- //cls += config.collapsed ? ' td-collapsed' : '';
-
- //html += '<td class="' + cls + '" ';
- //html += colSpan + rowSpan + '>';
- //html += '<div class="legendCt">';
- //html += '<div style="display:table-cell; padding:' + displayDensity + '; font-size:' + fontSize + '"';
- //html += config.cls ? ' class="' + config.cls + '">' : '';
- //html += htmlValue + '</div>';
- //html += '<div class="legendColor" style="background-color:' + bgColor + '"> </div>';
- //html += '</div></td>';
- }
- else {
- html += 'style="padding:' + displayDensity + '; font-size:' + fontSize + ';"' + '>' + htmlValue + '</td>';
- }
-
- return html;
- };
-
- doSubTotals = function(xAxis) {
- return !!xLayout.showSubTotals && xAxis && xAxis.dims > 1;
-
- //var multiItemDimension = 0,
- //unique;
-
- //if (!(xLayout.showSubTotals && xAxis && xAxis.dims > 1)) {
- //return false;
- //}
-
- //unique = xAxis.xItems.unique;
-
- //for (var i = 0; i < unique.length; i++) {
- //if (unique[i].length > 1) {
- //multiItemDimension++;
- //}
- //}
-
- //return (multiItemDimension > 1);
- };
-
- doTotals = function() {
- return !!xLayout.showTotals;
- };
-
- doSortableColumnHeaders = function() {
- return (xRowAxis && xRowAxis.dims === 1);
- };
-
- getColAxisHtmlArray = function() {
- var a = [],
- getEmptyHtmlArray;
-
- getEmptyHtmlArray = function() {
- return (xColAxis && xRowAxis) ? getTdHtml({
- cls: 'pivot-dim-empty cursor-default',
- colSpan: xRowAxis.dims,
- rowSpan: xColAxis.dims,
- htmlValue: ' '
- }) : '';
- };
-
- if (!(xColAxis && Ext.isObject(xColAxis))) {
- return a;
- }
-
- // for each col dimension
- for (var i = 0, dimHtml; i < xColAxis.dims; i++) {
- dimHtml = [];
-
- if (i === 0) {
- dimHtml.push(getEmptyHtmlArray());
- }
-
- for (var j = 0, obj, spanCount = 0, condoId, totalId; j < xColAxis.size; j++) {
- spanCount++;
- condoId = null;
- totalId = null;
-
- obj = xColAxis.objects.all[i][j];
- obj.type = 'dimension';
- obj.cls = 'pivot-dim';
- obj.noBreak = false;
- obj.hidden = !(obj.rowSpan || obj.colSpan);
- obj.htmlValue = service.layout.getItemName(xLayout, xResponse, obj.id, true);
-
- // sortable column headers. last dim only.
- if (i === xColAxis.dims - 1 && doSortableColumnHeaders()) {
- //condoId = xColAxis.ids[j].split('-').join('');
- condoId = xColAxis.ids[j];
- }
-
- dimHtml.push(getTdHtml(obj, condoId));
-
- if (i === 0 && spanCount === xColAxis.span[i] && doSubTotals(xColAxis) ) {
- dimHtml.push(getTdHtml({
- type: 'dimensionSubtotal',
- cls: 'pivot-dim-subtotal cursor-default',
- rowSpan: xColAxis.dims,
- htmlValue: ' '
- }));
-
- spanCount = 0;
- }
-
- if (i === 0 && (j === xColAxis.size - 1) && doTotals()) {
- totalId = doSortableColumnHeaders() ? 'total_' : null;
-
- dimHtml.push(getTdHtml({
- uuid: Ext.data.IdGenerator.get('uuid').generate(),
- type: 'dimensionTotal',
- cls: 'pivot-dim-total',
- rowSpan: xColAxis.dims,
- htmlValue: 'Total'
- }, totalId));
- }
- }
-
- a.push(dimHtml);
- }
-
- return a;
- };
-
- getRowHtmlArray = function() {
- var a = [],
- axisAllObjects = [],
- xValueObjects,
- totalValueObjects = [],
- mergedObjects = [],
- valueItemsCopy,
- colAxisSize = xColAxis ? xColAxis.size : 1,
- rowAxisSize = xRowAxis ? xRowAxis.size : 1,
- recursiveReduce;
-
- recursiveReduce = function(obj) {
- if (!obj.children) {
- obj.collapsed = true;
-
- if (obj.parent) {
- obj.parent.oldestSibling.children--;
- }
- }
-
- if (obj.parent) {
- recursiveReduce(obj.parent.oldestSibling);
- }
- };
-
- // dimension
- if (xRowAxis) {
- var aLineBreak = new Array(xRowAxis.dims);
-
- for (var i = 0, row; i < xRowAxis.size; i++) {
- row = [];
-
- for (var j = 0, obj, newObj; j < xRowAxis.dims; j++) {
- obj = xRowAxis.objects.all[j][i];
- obj.type = 'dimension';
- obj.cls = 'pivot-dim ' + (service.layout.isHierarchy(xLayout, xResponse, obj.id) ? ' align-left' : '');
- obj.noBreak = true;
- obj.hidden = !(obj.rowSpan || obj.colSpan);
- obj.htmlValue = service.layout.getItemName(xLayout, xResponse, obj.id, true);
-
- row.push(obj);
-
- // allow line break for this dim?
- if (obj.htmlValue.length > 50) {
- aLineBreak[j] = true;
- }
- }
-
- axisAllObjects.push(row);
- }
-
- // add nowrap line break cls
- for (var i = 0, dim; i < aLineBreak.length; i++) {
- dim = aLineBreak[i];
-
- if (!dim) {
- for (var j = 0, obj; j < xRowAxis.size; j++) {
- obj = axisAllObjects[j][i];
-
- obj.cls += ' td-nobreak';
- obj.noBreak = true;
- }
- }
- }
- }
- //axisAllObjects = [ [ dim, dim ]
- // [ dim, dim ]
- // [ dim, dim ]
- // [ dim, dim ] ];
-
- // value
- for (var i = 0, valueItemsRow, valueObjectsRow, idValueMap = Ext.clone(xResponse.idValueMap); i < rowAxisSize; i++) {
- valueItemsRow = [];
- valueObjectsRow = [];
-
- for (var j = 0, id, value, htmlValue, empty, uuid, uuids; j < colAxisSize; j++) {
- empty = false;
- uuids = [];
-
- // meta data uid
- //id = (xColAxis ? support.prototype.str.replaceAll(xColAxis.ids[j], '-', '') : '') + (xRowAxis ? support.prototype.str.replaceAll(xRowAxis.ids[i], '-', '') : '');
- id = (xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '');
-
- // value html element id
- uuid = Ext.data.IdGenerator.get('uuid').generate();
-
- // get uuids array from colaxis/rowaxis leaf
- if (xColAxis) {
- uuids = uuids.concat(xColAxis.objects.all[xColAxis.dims - 1][j].uuids);
- }
- if (xRowAxis) {
- uuids = uuids.concat(xRowAxis.objects.all[xRowAxis.dims - 1][i].uuids);
- }
-
- if (idValueMap[id]) {
- value = parseFloat(idValueMap[id]);
- htmlValue = value.toString();
- }
- else {
- value = 0;
- htmlValue = ' ';
- empty = true;
- }
-
- valueItemsRow.push(value);
- valueObjectsRow.push({
- uuid: uuid,
- type: 'value',
- cls: 'pivot-value' + (empty ? ' cursor-default' : ''),
- value: value,
- htmlValue: htmlValue,
- empty: empty,
- uuids: uuids
- });
-
- // map element id to dim element ids
- uuidDimUuidsMap[uuid] = uuids;
- }
-
- valueItems.push(valueItemsRow);
- valueObjects.push(valueObjectsRow);
- }
-
- // totals
- if (xColAxis && doTotals()) {
- for (var i = 0, empty = [], total = 0; i < valueObjects.length; i++) {
- for (j = 0, obj; j < valueObjects[i].length; j++) {
- obj = valueObjects[i][j];
-
- empty.push(obj.empty);
- total += obj.value;
- }
-
- // row totals
- totalValueObjects.push({
- type: 'valueTotal',
- cls: 'pivot-value-total',
- value: total,
- htmlValue: Ext.Array.contains(empty, false) ? getRoundedHtmlValue(total) : '',
- empty: !Ext.Array.contains(empty, false)
- });
-
- // add row totals to idValueMap to make sorting on totals possible
- if (doSortableColumnHeaders()) {
- var totalId = 'total_' + xRowAxis.ids[i],
- isEmpty = !Ext.Array.contains(empty, false);
-
- xResponse.idValueMap[totalId] = isEmpty ? null : total;
- }
-
- empty = [];
- total = 0;
- }
- }
-
- // hide empty rows (dims/values/totals)
- if (xColAxis && xRowAxis) {
- if (xLayout.hideEmptyRows) {
- for (var i = 0, valueRow, isValueRowEmpty, dimLeaf; i < valueObjects.length; i++) {
- valueRow = valueObjects[i];
- isValueRowEmpty = !Ext.Array.contains(Ext.Array.pluck(valueRow, 'empty'), false);
-
- // if value row is empty
- if (isValueRowEmpty) {
-
- // Hide values by adding collapsed = true to all items
- for (var j = 0; j < valueRow.length; j++) {
- valueRow[j].collapsed = true;
- }
-
- // Hide totals by adding collapsed = true to all items
- if (doTotals()) {
- totalValueObjects[i].collapsed = true;
- }
-
- // Hide/reduce parent dim span
- dimLeaf = axisAllObjects[i][xRowAxis.dims-1];
- recursiveReduce(dimLeaf);
- }
- }
- }
- }
-
- xValueObjects = Ext.clone(valueObjects);
-
- // col subtotals
- if (doSubTotals(xColAxis)) {
- var tmpValueObjects = [];
-
- for (var i = 0, row, rowSubTotal, colCount; i < xValueObjects.length; i++) {
- row = [];
- rowSubTotal = 0;
- colCount = 0;
-
- for (var j = 0, item, collapsed = [], empty = []; j < xValueObjects[i].length; j++) {
- item = xValueObjects[i][j];
- rowSubTotal += item.value;
- empty.push(!!item.empty);
- collapsed.push(!!item.collapsed);
- colCount++;
-
- row.push(item);
-
- if (colCount === colUniqueFactor) {
- var isEmpty = !Ext.Array.contains(empty, false);
- row.push({
- type: 'valueSubtotal',
- cls: 'pivot-value-subtotal' + (isEmpty ? ' cursor-default' : ''),
- value: rowSubTotal,
- htmlValue: isEmpty ? ' ' : getRoundedHtmlValue(rowSubTotal),
- empty: isEmpty,
- collapsed: !Ext.Array.contains(collapsed, false)
- });
-
- colCount = 0;
- rowSubTotal = 0;
- empty = [];
- collapsed = [];
- }
- }
-
- tmpValueObjects.push(row);
- }
-
- xValueObjects = tmpValueObjects;
- }
-
- // row subtotals
- if (doSubTotals(xRowAxis)) {
- var tmpAxisAllObjects = [],
- tmpValueObjects = [],
- tmpTotalValueObjects = [],
- getAxisSubTotalRow;
-
- getAxisSubTotalRow = function(collapsed) {
- var row = [];
-
- for (var i = 0, obj; i < xRowAxis.dims; i++) {
- obj = {};
- obj.type = 'dimensionSubtotal';
- obj.cls = 'pivot-dim-subtotal cursor-default';
- obj.collapsed = Ext.Array.contains(collapsed, true);
-
- if (i === 0) {
- obj.htmlValue = ' ';
- obj.colSpan = xRowAxis.dims;
- }
- else {
- obj.hidden = true;
- }
-
- row.push(obj);
- }
-
- return row;
- };
-
- // tmpAxisAllObjects
- for (var i = 0, row, collapsed = []; i < axisAllObjects.length; i++) {
- tmpAxisAllObjects.push(axisAllObjects[i]);
- collapsed.push(!!axisAllObjects[i][0].collapsed);
-
- // Insert subtotal after last objects
- if (!Ext.isArray(axisAllObjects[i+1]) || !!axisAllObjects[i+1][0].root) {
- tmpAxisAllObjects.push(getAxisSubTotalRow(collapsed));
-
- collapsed = [];
- }
- }
-
- // tmpValueObjects
- for (var i = 0; i < tmpAxisAllObjects.length; i++) {
- tmpValueObjects.push([]);
- }
-
- for (var i = 0; i < xValueObjects[0].length; i++) {
- for (var j = 0, rowCount = 0, tmpCount = 0, subTotal = 0, empty = [], collapsed, item; j < xValueObjects.length; j++) {
- item = xValueObjects[j][i];
- tmpValueObjects[tmpCount++].push(item);
- subTotal += item.value;
- empty.push(!!item.empty);
- rowCount++;
-
- if (axisAllObjects[j][0].root) {
- collapsed = !!axisAllObjects[j][0].collapsed;
- }
-
- if (!Ext.isArray(axisAllObjects[j+1]) || axisAllObjects[j+1][0].root) {
- var isEmpty = !Ext.Array.contains(empty, false);
-
- tmpValueObjects[tmpCount++].push({
- type: item.type === 'value' ? 'valueSubtotal' : 'valueSubtotalTotal',
- value: subTotal,
- htmlValue: isEmpty ? ' ' : getRoundedHtmlValue(subTotal),
- collapsed: collapsed,
- cls: (item.type === 'value' ? 'pivot-value-subtotal' : 'pivot-value-subtotal-total') + (isEmpty ? ' cursor-default' : '')
- });
- rowCount = 0;
- subTotal = 0;
- empty = [];
- }
- }
- }
-
- // tmpTotalValueObjects
- for (var i = 0, obj, collapsed = [], empty = [], subTotal = 0, count = 0; i < totalValueObjects.length; i++) {
- obj = totalValueObjects[i];
- tmpTotalValueObjects.push(obj);
-
- collapsed.push(!!obj.collapsed);
- empty.push(!!obj.empty);
- subTotal += obj.value;
- count++;
-
- if (count === xRowAxis.span[0]) {
- var isEmpty = !Ext.Array.contains(empty, false);
-
- tmpTotalValueObjects.push({
- type: 'valueTotalSubgrandtotal',
- cls: 'pivot-value-total-subgrandtotal' + (isEmpty ? ' cursor-default' : ''),
- value: subTotal,
- htmlValue: isEmpty ? ' ' : getRoundedHtmlValue(subTotal),
- empty: isEmpty,
- collapsed: !Ext.Array.contains(collapsed, false)
- });
-
- collapsed = [];
- empty = [];
- subTotal = 0;
- count = 0;
- }
- }
-
- axisAllObjects = tmpAxisAllObjects;
- xValueObjects = tmpValueObjects;
- totalValueObjects = tmpTotalValueObjects;
- }
-
- // Merge dim, value, total
- for (var i = 0, row; i < xValueObjects.length; i++) {
- row = [];
-
- if (xRowAxis) {
- row = row.concat(axisAllObjects[i]);
- }
-
- row = row.concat(xValueObjects[i]);
-
- if (xColAxis) {
- row = row.concat(totalValueObjects[i]);
- }
-
- mergedObjects.push(row);
- }
-
- // Create html items
- for (var i = 0, row; i < mergedObjects.length; i++) {
- row = [];
-
- for (var j = 0; j < mergedObjects[i].length; j++) {
- row.push(getTdHtml(mergedObjects[i][j]));
- }
-
- a.push(row);
- }
-
- return a;
- };
-
- getColTotalHtmlArray = function() {
- var a = [];
-
- if (xRowAxis && doTotals()) {
- var xTotalColObjects;
-
- // Total col items
- for (var i = 0, total = 0, empty = []; i < valueObjects[0].length; i++) {
- for (var j = 0, obj; j < valueObjects.length; j++) {
- obj = valueObjects[j][i];
-
- total += obj.value;
- empty.push(!!obj.empty);
- }
-
- // col total
- totalColObjects.push({
- type: 'valueTotal',
- value: total,
- htmlValue: Ext.Array.contains(empty, false) ? getRoundedHtmlValue(total) : '',
- empty: !Ext.Array.contains(empty, false),
- cls: 'pivot-value-total'
- });
-
- total = 0;
- empty = [];
- }
-
- xTotalColObjects = Ext.clone(totalColObjects);
-
- if (xColAxis && doSubTotals(xColAxis)) {
- var tmp = [];
-
- for (var i = 0, item, subTotal = 0, empty = [], colCount = 0; i < xTotalColObjects.length; i++) {
- item = xTotalColObjects[i];
- tmp.push(item);
- subTotal += item.value;
- empty.push(!!item.empty);
- colCount++;
-
- if (colCount === colUniqueFactor) {
- tmp.push({
- type: 'valueTotalSubgrandtotal',
- value: subTotal,
- htmlValue: Ext.Array.contains(empty, false) ? getRoundedHtmlValue(subTotal) : '',
- empty: !Ext.Array.contains(empty, false),
- cls: 'pivot-value-total-subgrandtotal'
- });
-
- subTotal = 0;
- colCount = 0;
- }
- }
-
- xTotalColObjects = tmp;
- }
-
- // Total col html items
- for (var i = 0; i < xTotalColObjects.length; i++) {
- a.push(getTdHtml(xTotalColObjects[i]));
- }
- }
-
- return a;
- };
-
- getGrandTotalHtmlArray = function() {
- var total = 0,
- empty = [],
- a = [];
-
- if (doTotals()) {
- for (var i = 0, obj; i < totalColObjects.length; i++) {
- obj = totalColObjects[i];
-
- total += obj.value;
- empty.push(obj.empty);
- }
-
- if (xColAxis && xRowAxis) {
- a.push(getTdHtml({
- type: 'valueGrandTotal',
- cls: 'pivot-value-grandtotal',
- value: total,
- htmlValue: Ext.Array.contains(empty, false) ? getRoundedHtmlValue(total) : '',
- empty: !Ext.Array.contains(empty, false)
- }));
- }
- }
-
- return a;
- };
-
- getTotalHtmlArray = function() {
- var dimTotalArray,
- colTotal = getColTotalHtmlArray(),
- grandTotal = getGrandTotalHtmlArray(),
- row,
- a = [];
-
- if (doTotals()) {
- if (xRowAxis) {
- dimTotalArray = [getTdHtml({
- type: 'dimensionSubtotal',
- cls: 'pivot-dim-total',
- colSpan: xRowAxis.dims,
- htmlValue: 'Total'
- })];
- }
-
- row = [].concat(dimTotalArray || [], Ext.clone(colTotal) || [], Ext.clone(grandTotal) || []);
-
- a.push(row);
- }
-
- return a;
- };
-
- getHtml = function() {
- var s = '<table id="' + xLayout.tableUuid + '" class="pivot">';
-
- for (var i = 0; i < htmlArray.length; i++) {
- s += '<tr>' + htmlArray[i].join('') + '</tr>';
- }
-
- return s += '</table>';
- };
-
- // get html
- return function() {
- var rows = xResponse.rows;
- htmlArray = Ext.Array.clean([].concat(getColAxisHtmlArray() || [], getRowHtmlArray() || [], getTotalHtmlArray() || []));
-
- return {
- html: getHtml(htmlArray),
- uuidDimUuidsMap: uuidDimUuidsMap,
- xColAxis: xColAxis,
- xRowAxis: xRowAxis,
- tdCount: tdCount
- };
- }();
- };
-
- // query
- web.report.query = {};
-
- web.report.query.sort = function(layout, xResponse) {
- var id = layout.sorting.id,
- direction = layout.sorting ? layout.sorting.direction : 'DESC',
- index = xResponse.nameHeaderMap[id].index,
- rows = xResponse.rows;
-
- support.prototype.array.sort(rows, direction, index);
-
- return xResponse;
- };
-
- web.report.query.format = function(str) {
- var n = parseFloat(str);
-
- if (!Ext.isNumber(n)) {
- return str;
- }
-
- if (new Date(str).toString() === 'Invalid Date') {
- return n;
- }
-
- return str;
- };
-
- web.report.query.getHtml = function(layout, xResponse) {
- var dimensionHeaders = xResponse.dimensionHeaders,
- rows = xResponse.rows,
- tableCls = 'pivot',
- html = '';
-
- xResponse.sortableIdObjects = [];
-
- tableCls += layout.displayDensity ? ' ' + layout.displayDensity : '';
- tableCls += layout.fontSize ? ' ' + layout.fontSize : '';
-
- html += '<table class="' + tableCls + '"><tr>';
-
- // get header indexes
- for (var i = 0, header, uuid; i < dimensionHeaders.length; i++) {
- header = dimensionHeaders[i];
- uuid = Ext.data.IdGenerator.get('uuid').generate();
-
- html += '<td id="' + uuid + '" class="pivot-dim td-sortable">' + header.column + '</td>';
-
- xResponse.sortableIdObjects.push({
- id: header.name,
- uuid: uuid
- });
- }
-
- html += '</tr>';
-
- // rows
- for (var i = 0, row; i < rows.length; i++) {
- row = rows[i];
- html += '<tr>';
-
- for (var j = 0, str, header, name; j < dimensionHeaders.length; j++) {
- header = dimensionHeaders[j];
- str = row[header.index];
- name = web.report.query.format(str);
-
- //if (header.name === 'ouname' && layout.showHierarchy) {
- //var a = Ext.Array.clean(name.split('/'));
- //name = '';
-
- //for (var k = 0, isLast; k < a.length; k++) {
- //isLast = !!(i === a.length - 1);
-
- //name += (!isLast ? '<span class="text-weak">' : '') + a[i] + (!isLast ? '</span>' : '') + (!isLast ? ' / ' : '');
- //}
- //}
-
- html += '<td class="pivot-value align-left">' + name + '</td>';
- }
-
- html += '</tr>';
- }
-
- html += '</table>';
-
- return {
- html: html
- };
- };
+ web.report.aggregate.createChart = function(layout, xLayout, xResponse, centerRegion) {
+ var columnIds = xLayout.columns[0].ids,
+ replacedColumnIds = support.prototype.str.replaceAll(Ext.clone(columnIds), '.', ''),
+ rowIds = xLayout.rows[0].ids,
+ replacedRowIds = support.prototype.str.replaceAll(Ext.clone(rowIds), '.', ''),
+ filterIds = function() {
+ var ids = [];
+
+ if (xLayout.filters) {
+ for (var i = 0; i < xLayout.filters.length; i++) {
+ ids = ids.concat(xLayout.filters[i].ids || []);
+ }
+ }
+
+ return ids;
+ }(),
+ replacedFilterIds = support.prototype.str.replaceAll(Ext.clone(filterIds), '.', ''),
+
+ replacedIdMap = function() {
+ var map = {},
+ names = xResponse.metaData.names,
+ ids = Ext.clean([].concat(columnIds || [], rowIds || [], filterIds || [])),
+ replacedIds = Ext.clean([].concat(replacedColumnIds || [], replacedRowIds || [], replacedFilterIds || []));
+
+ for (var i = 0; i < replacedIds.length; i++) {
+ map[replacedIds[i]] = ids[i];
+ }
+
+ return map;
+ }(),
+
+ getSyncronizedXLayout,
+ getExtendedResponse,
+ validateUrl,
+
+ getDefaultStore,
+ getDefaultNumericAxis,
+ getDefaultCategoryAxis,
+ getDefaultSeriesTitle,
+ getDefaultSeries,
+ getDefaultTrendLines,
+ getDefaultTargetLine,
+ getDefaultBaseLine,
+ getDefaultTips,
+ setDefaultTheme,
+ getDefaultLegend,
+ getDefaultChartTitle,
+ getDefaultChartSizeHandler,
+ getDefaultChartTitlePositionHandler,
+ getDefaultChart,
+
+ generator = {};
+
+ getDefaultStore = function() {
+ var pe = conf.finals.dimension.period.dimensionName,
+ columnDimensionName = xLayout.columns[0].dimensionName,
+ rowDimensionName = xLayout.rows[0].dimensionName,
+
+ data = [],
+ trendLineFields = [],
+ targetLineFields = [],
+ baseLineFields = [],
+ store;
+
+ // data
+ for (var i = 0, obj, category, rowValues, isEmpty; i < rowIds.length; i++) {
+ obj = {};
+ category = rowIds[i];
+ rowValues = [];
+ isEmpty = false;
+
+ obj[conf.finals.data.domain] = xResponse.metaData.names[category];
+
+ for (var j = 0, colId, id, value; j < columnIds.length; j++) {
+ id = columnIds[j] + rowIds[i];
+ value = xResponse.idValueMap[id];
+ rowValues.push(value);
+
+ dataColId = replacedColumnIds[j];
+ obj[dataColId] = value ? parseFloat(value) : '0.0';
+ }
+
+ isEmpty = !(Ext.Array.clean(rowValues).length);
+
+ if (!(isEmpty && xLayout.hideEmptyRows)) {
+ data.push(obj);
+ }
+ }
+
+ // trend lines
+ if (xLayout.showTrendLine) {
+ for (var i = 0, regression, key; i < replacedColumnIds.length; i++) {
+ regression = new SimpleRegression();
+ key = conf.finals.data.trendLine + replacedColumnIds[i];
+
+ for (var j = 0; j < data.length; j++) {
+ regression.addData(j, data[j][replacedColumnIds[i]]);
+ }
+
+ for (var j = 0; j < data.length; j++) {
+ data[j][key] = parseFloat(regression.predict(j).toFixed(1));
+ }
+
+ trendLineFields.push(key);
+ xResponse.metaData.names[key] = EV.i18n.trend + ' (' + xResponse.metaData.names[columnIds[i]] + ')';
+ }
+ }
+
+ // target line
+ if (Ext.isNumber(xLayout.targetLineValue) || Ext.isNumber(parseFloat(xLayout.targetLineValue))) {
+ for (var i = 0; i < data.length; i++) {
+ data[i][conf.finals.data.targetLine] = parseFloat(xLayout.targetLineValue);
+ }
+
+ targetLineFields.push(conf.finals.data.targetLine);
+ }
+
+ // base line
+ if (Ext.isNumber(xLayout.baseLineValue) || Ext.isNumber(parseFloat(xLayout.baseLineValue))) {
+ for (var i = 0; i < data.length; i++) {
+ data[i][conf.finals.data.baseLine] = parseFloat(xLayout.baseLineValue);
+ }
+
+ baseLineFields.push(conf.finals.data.baseLine);
+ }
+
+ store = Ext.create('Ext.data.Store', {
+ fields: function() {
+ var fields = Ext.clone(replacedColumnIds);
+ fields.push(conf.finals.data.domain);
+ fields = fields.concat(trendLineFields, targetLineFields, baseLineFields);
+
+ return fields;
+ }(),
+ data: data
+ });
+
+ store.rangeFields = replacedColumnIds;
+ store.domainFields = [conf.finals.data.domain];
+ store.trendLineFields = trendLineFields;
+ store.targetLineFields = targetLineFields;
+ store.baseLineFields = baseLineFields;
+ store.numericFields = [].concat(store.rangeFields, store.trendLineFields, store.targetLineFields, store.baseLineFields);
+
+ store.getMaximum = function() {
+ var maximums = [];
+
+ for (var i = 0; i < store.numericFields.length; i++) {
+ maximums.push(store.max(store.numericFields[i]));
+ }
+
+ return Ext.Array.max(maximums);
+ };
+
+ store.getMinimum = function() {
+ var minimums = [];
+
+ for (var i = 0; i < store.numericFields.length; i++) {
+ minimums.push(store.max(store.numericFields[i]));
+ }
+
+ return Ext.Array.min(minimums);
+ };
+
+ store.getMaximumSum = function() {
+ var sums = [],
+ recordSum = 0;
+
+ store.each(function(record) {
+ recordSum = 0;
+
+ for (var i = 0; i < store.rangeFields.length; i++) {
+ recordSum += record.data[store.rangeFields[i]];
+ }
+
+ sums.push(recordSum);
+ });
+
+ return Ext.Array.max(sums);
+ };
+
+ store.hasDecimals = function() {
+ var records = store.getRange();
+
+ for (var i = 0; i < records.length; i++) {
+ for (var j = 0, value; j < store.rangeFields.length; j++) {
+ value = records[i].data[store.rangeFields[j]];
+
+ if (Ext.isNumber(value) && (value % 1)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ };
+
+ store.getNumberOfDecimals = function() {
+ var records = store.getRange(),
+ values = [];
+
+ for (var i = 0; i < records.length; i++) {
+ for (var j = 0, value; j < store.rangeFields.length; j++) {
+ value = records[i].data[store.rangeFields[j]];
+
+ if (Ext.isNumber(value) && (value % 1)) {
+ value = value.toString();
+
+ values.push(value.length - value.indexOf('.') - 1);
+ }
+ }
+ }
+
+ return Ext.Array.max(values);
+ };
+
+ if (NS.isDebug) {
+ console.log("data", data);
+ console.log("rangeFields", store.rangeFields);
+ console.log("domainFields", store.domainFields);
+ console.log("trendLineFields", store.trendLineFields);
+ console.log("targetLineFields", store.targetLineFields);
+ console.log("baseLineFields", store.baseLineFields);
+ }
+
+ return store;
+ };
+
+ getDefaultNumericAxis = function(store) {
+ var typeConf = conf.finals.chart,
+ minimum = store.getMinimum(),
+ maximum,
+ numberOfDecimals,
+ axis;
+
+ getRenderer = function(numberOfDecimals) {
+ var renderer = '0.';
+
+ for (var i = 0; i < numberOfDecimals; i++) {
+ renderer += '0';
+ }
+
+ return renderer;
+ };
+
+ // set maximum if stacked + extra line
+ if ((xLayout.type === typeConf.stackedcolumn || xLayout.type === typeConf.stackedbar) &&
+ (xLayout.showTrendLine || xLayout.targetLineValue || xLayout.baseLineValue)) {
+ var a = [store.getMaximum(), store.getMaximumSum()];
+ maximum = Math.ceil(Ext.Array.max(a) * 1.1);
+ maximum = Math.floor(maximum / 10) * 10;
+ }
+
+ // renderer
+ numberOfDecimals = store.getNumberOfDecimals();
+ renderer = !!numberOfDecimals && (store.getMaximum() < 20) ? getRenderer(numberOfDecimals) : '0,0';
+
+ axis = {
+ type: 'Numeric',
+ position: 'left',
+ fields: store.numericFields,
+ minimum: minimum < 0 ? minimum : 0,
+ label: {
+ renderer: Ext.util.Format.numberRenderer(renderer)
+ },
+ grid: {
+ odd: {
+ opacity: 1,
+ stroke: '#aaa',
+ 'stroke-width': 0.1
+ },
+ even: {
+ opacity: 1,
+ stroke: '#aaa',
+ 'stroke-width': 0.1
+ }
+ }
+ };
+
+ if (maximum) {
+ axis.maximum = maximum;
+ }
+
+ if (xLayout.rangeAxisMaxValue) {
+ axis.maximum = xLayout.rangeAxisMaxValue;
+ }
+
+ if (xLayout.rangeAxisMinValue) {
+ axis.minimum = xLayout.rangeAxisMinValue;
+ }
+
+ if (xLayout.rangeAxisSteps) {
+ axis.majorTickSteps = xLayout.rangeAxisSteps - 1;
+ }
+
+ if (xLayout.rangeAxisDecimals) {
+ axis.label.renderer = Ext.util.Format.numberRenderer(getRenderer(xLayout.rangeAxisDecimals));
+ }
+
+ if (xLayout.rangeAxisTitle) {
+ axis.title = xLayout.rangeAxisTitle;
+ }
+
+ return axis;
+ };
+
+ getDefaultCategoryAxis = function(store) {
+ var axis = {
+ type: 'Category',
+ position: 'bottom',
+ fields: store.domainFields,
+ label: {
+ rotate: {
+ degrees: 330
+ }
+ }
+ };
+
+ if (xLayout.domainAxisTitle) {
+ axis.title = xLayout.domainAxisTitle;
+ }
+
+ return axis;
+ };
+
+ getDefaultSeriesTitle = function(store) {
+ var a = [];
+
+ for (var i = 0, id, ids; i < store.rangeFields.length; i++) {
+ id = replacedIdMap[store.rangeFields[i]];
+ a.push(xResponse.metaData.names[id]);
+ }
+
+ return a;
+ };
+
+ getDefaultSeries = function(store) {
+ var main = {
+ type: 'column',
+ axis: 'left',
+ xField: store.domainFields,
+ yField: store.rangeFields,
+ style: {
+ opacity: 0.8,
+ lineWidth: 3
+ },
+ markerConfig: {
+ type: 'circle',
+ radius: 4
+ },
+ tips: getDefaultTips(),
+ title: getDefaultSeriesTitle(store)
+ };
+
+ if (xLayout.showValues) {
+ main.label = {
+ display: 'outside',
+ 'text-anchor': 'middle',
+ field: store.rangeFields,
+ font: conf.chart.style.fontFamily,
+ renderer: function(n) {
+ return n === '0.0' ? '-' : n;
+ }
+ };
+ }
+
+ return main;
+ };
+
+ getDefaultTrendLines = function(store) {
+ var a = [];
+
+ for (var i = 0; i < store.trendLineFields.length; i++) {
+ a.push({
+ type: 'line',
+ axis: 'left',
+ xField: store.domainFields,
+ yField: store.trendLineFields[i],
+ style: {
+ opacity: 0.8,
+ lineWidth: 3,
+ 'stroke-dasharray': 8
+ },
+ markerConfig: {
+ type: 'circle',
+ radius: 0
+ },
+ title: xResponse.metaData.names[store.trendLineFields[i]]
+ });
+ }
+
+ return a;
+ };
+
+ getDefaultTargetLine = function(store) {
+ return {
+ type: 'line',
+ axis: 'left',
+ xField: store.domainFields,
+ yField: store.targetLineFields,
+ style: {
+ opacity: 1,
+ lineWidth: 2,
+ 'stroke-width': 1,
+ stroke: '#041423'
+ },
+ showMarkers: false,
+ title: (Ext.isString(xLayout.targetLineTitle) ? xLayout.targetLineTitle : NS.i18n.target) + ' (' + xLayout.targetLineValue + ')'
+ };
+ };
+
+ getDefaultBaseLine = function(store) {
+ return {
+ type: 'line',
+ axis: 'left',
+ xField: store.domainFields,
+ yField: store.baseLineFields,
+ style: {
+ opacity: 1,
+ lineWidth: 2,
+ 'stroke-width': 1,
+ stroke: '#041423'
+ },
+ showMarkers: false,
+ title: (Ext.isString(xLayout.baseLineTitle) ? xLayout.baseLineTitle : NS.i18n.base) + ' (' + xLayout.baseLineValue + ')'
+ };
+ };
+
+ getDefaultTips = function() {
+ return {
+ trackMouse: true,
+ cls: 'dv-chart-tips',
+ renderer: function(si, item) {
+ var value = item.value[1] === '0.0' ? '-' : item.value[1];
+ this.update('<div style="text-align:center"><div style="font-size:17px; font-weight:bold">' + value + '</div><div style="font-size:10px">' + si.data[conf.finals.data.domain] + '</div></div>');
+ }
+ };
+ };
+
+ setDefaultTheme = function(store) {
+ var colors = conf.chart.theme.dv1.slice(0, store.rangeFields.length);
+
+ if (xLayout.targetLineValue || xLayout.baseLineValue) {
+ colors.push('#051a2e');
+ }
+
+ if (xLayout.targetLineValue) {
+ colors.push('#051a2e');
+ }
+
+ if (xLayout.baseLineValue) {
+ colors.push('#051a2e');
+ }
+
+ Ext.chart.theme.dv1 = Ext.extend(Ext.chart.theme.Base, {
+ constructor: function(config) {
+ Ext.chart.theme.Base.prototype.constructor.call(this, Ext.apply({
+ seriesThemes: colors,
+ colors: colors
+ }, config));
+ }
+ });
+ };
+
+ getDefaultLegend = function(store) {
+ var itemLength = 30,
+ charLength = 7,
+ numberOfItems,
+ numberOfChars = 0,
+ str = '',
+ width,
+ isVertical = false,
+ position = 'top',
+ padding = 0;
+
+ if (xLayout.type === conf.finals.chart.pie) {
+ numberOfItems = store.getCount();
+ store.each(function(r) {
+ str += r.data[store.domainFields[0]];
+ });
+ }
+ else {
+ numberOfItems = store.rangeFields.length;
+
+ for (var i = 0, name, ids; i < store.rangeFields.length; i++) {
+ if (store.rangeFields[i].indexOf('#') !== -1) {
+ ids = store.rangeFields[i].split('#');
+ name = xResponse.metaData.names[ids[0]] + ' ' + xResponse.metaData.names[ids[1]];
+ }
+ else {
+ name = xResponse.metaData.names[store.rangeFields[i]];
+ }
+
+ str += name;
+ }
+ }
+
+ numberOfChars = str.length;
+
+ width = (numberOfItems * itemLength) + (numberOfChars * charLength);
+
+ if (width > centerRegion.getWidth() - 50) {
+ isVertical = true;
+ position = 'right';
+ }
+
+ if (position === 'right') {
+ padding = 5;
+ }
+
+ return Ext.create('Ext.chart.Legend', {
+ position: position,
+ isVertical: isVertical,
+ labelFont: '13px ' + conf.chart.style.fontFamily,
+ boxStroke: '#ffffff',
+ boxStrokeWidth: 0,
+ padding: padding
+ });
+ };
+
+ getDefaultChartTitle = function(store) {
+ var a = [],
+ text = '',
+ fontSize,
+ names = xResponse.metaData.names,
+ operatorMap = {
+ 'EQ': '=',
+ 'GT': '>',
+ 'GE': '>=',
+ 'LT': '<',
+ 'LE': '<=',
+ 'NE': '!='
+ };
+
+ if (xLayout.title) {
+ text = xLayout.title;
+ }
+ else if (xLayout.type === conf.finals.chart.pie) {
+ var ids = Ext.Array.clean([].concat(columnIds || []));
+
+ if (Ext.isArray(ids) && ids.length) {
+ for (var i = 0; i < ids.length; i++) {
+ text += xResponse.metaData.names[ids[i]];
+ text += i < ids.length - 1 ? ', ' : '';
+ }
+ }
+ }
+ else {
+ var meta = ['pe', 'ou'];
+
+ for (var i = 0, dim; i < layout.filters.length; i++) {
+ dim = layout.filters[i];
+ text += (text.length ? ', ' : '');
+
+ if (Ext.Array.contains(meta, dim.dimension)) {
+ var ids = xResponse.metaData[dim.dimension],
+ tmpText = '';
+
+ for (var ii = 0; ii < ids.length; ii++) {
+ tmpText += (tmpText.length ? ', ' : '') + names[ids[ii]];
+ }
+
+ text += tmpText;
+ }
+ else {
+ if (dim.filter) {
+ var a = dim.filter.split(':');
+
+ if (a.length === 2) {
+ var operator = a[0],
+ valueArray = a[1].split(';'),
+ tmpText = '';
+
+ if (operator === 'IN') {
+ for (var ii = 0; ii < valueArray.length; ii++) {
+ tmpText += (tmpText.length ? ', ' : '') + valueArray[ii];
+ }
+
+ text += tmpText;
+ }
+ else {
+ text += names[dim.dimension] + ' ' + operatorMap[operator] + ' ' + a[1];
+ }
+ }
+ else {
+ var operators = [],
+ values = [],
+ tmpText = '';
+
+ for (var ii = 0; ii < a.length; ii++) {
+ if (ii % 2) {
+ values.push(a[ii]);
+ }
+ else {
+ operators.push(a[ii]);
+ }
+ }
+
+ for (var ii = 0; ii < operators.length; ii++) {
+ tmpText += (tmpText.length ? ', ' : '') + names[dim.dimension] + ' ' + (operatorMap[operators[ii]] || '') + ' ' + values[ii];
+ }
+
+ text += tmpText;
+ }
+ }
+ else {
+ text += names[dim.dimension];
+ }
+ }
+ }
+ }
+
+ fontSize = (centerRegion.getWidth() / text.length) < 11.6 ? 13 : 18;
+
+ return Ext.create('Ext.draw.Sprite', {
+ type: 'text',
+ text: text,
+ font: 'bold ' + fontSize + 'px ' + conf.chart.style.fontFamily,
+ fill: '#111',
+ height: 20,
+ y: 20
+ });
+
+
+ //var ids = filterIds,
+ //a = [],
+ //text = '',
+ //fontSize;
+
+ //if (xLayout.type === conf.finals.chart.pie) {
+ //ids = ids.concat(columnIds);
+ //}
+
+ //if (Ext.isArray(ids) && ids.length) {
+ //for (var i = 0; i < ids.length; i++) {
+ //text += xResponse.metaData.names[ids[i]];
+ //text += i < ids.length - 1 ? ', ' : '';
+ //}
+ //}
+
+ //if (xLayout.title) {
+ //text = xLayout.title;
+ //}
+
+ //fontSize = (centerRegion.getWidth() / text.length) < 11.6 ? 13 : 18;
+
+ //return Ext.create('Ext.draw.Sprite', {
+ //type: 'text',
+ //text: text,
+ //font: 'bold ' + fontSize + 'px ' + conf.chart.style.fontFamily,
+ //fill: '#111',
+ //height: 20,
+ //y: 20
+ //});
+ };
+
+ getDefaultChartSizeHandler = function() {
+ return function() {
+ this.animate = false;
+ this.setWidth(centerRegion.getWidth() - 15);
+ this.setHeight(centerRegion.getHeight() - 40);
+ this.animate = true;
+ };
+ };
+
+ getDefaultChartTitlePositionHandler = function() {
+ return function() {
+ if (this.items) {
+ var title = this.items[0],
+ legend = this.legend,
+ legendCenterX,
+ titleX;
+
+ if (this.legend.position === 'top') {
+ legendCenterX = legend.x + (legend.width / 2);
+ titleX = legendCenterX - (title.el.getWidth() / 2);
+ }
+ else {
+ var legendWidth = legend ? legend.width : 0;
+ titleX = (this.width / 2) - (title.el.getWidth() / 2);
+ }
+
+ title.setAttributes({
+ x: titleX
+ }, true);
+ }
+ };
+ };
+
+ getDefaultChart = function(store, axes, series, theme) {
+ var chart,
+ config = {
+ //renderTo: init.el,
+ store: store,
+ axes: axes,
+ series: series,
+ animate: true,
+ shadow: false,
+ insetPadding: 35,
+ width: centerRegion.getWidth() - 15,
+ height: centerRegion.getHeight() - 40,
+ theme: theme || 'dv1'
+ };
+
+ // Legend
+ if (!xLayout.hideLegend) {
+ config.legend = getDefaultLegend(store);
+
+ if (config.legend.position === 'right') {
+ config.insetPadding = 40;
+ }
+ }
+
+ // Title
+ if (!xLayout.hideTitle) {
+ config.items = [getDefaultChartTitle(store)];
+ }
+ else {
+ config.insetPadding = 10;
+ }
+
+ chart = Ext.create('Ext.chart.Chart', config);
+
+ chart.setChartSize = getDefaultChartSizeHandler();
+ chart.setTitlePosition = getDefaultChartTitlePositionHandler();
+
+ chart.onViewportResize = function() {
+ chart.setChartSize();
+ chart.redraw();
+ chart.setTitlePosition();
+ };
+
+ chart.on('afterrender', function() {
+ chart.setTitlePosition();
+ });
+
+ return chart;
+ };
+
+ generator.column = function() {
+ var store = getDefaultStore(),
+ numericAxis = getDefaultNumericAxis(store),
+ categoryAxis = getDefaultCategoryAxis(store),
+ axes = [numericAxis, categoryAxis],
+ series = [getDefaultSeries(store)];
+
+ // Options
+ if (xLayout.showTrendLine) {
+ series = getDefaultTrendLines(store).concat(series);
+ }
+
+ if (xLayout.targetLineValue) {
+ series.push(getDefaultTargetLine(store));
+ }
+
+ if (xLayout.baseLineValue) {
+ series.push(getDefaultBaseLine(store));
+ }
+
+ // Theme
+ setDefaultTheme(store);
+
+ return getDefaultChart(store, axes, series);
+ };
+
+ generator.stackedcolumn = function() {
+ var chart = this.column();
+
+ for (var i = 0, item; i < chart.series.items.length; i++) {
+ item = chart.series.items[i];
+
+ if (item.type === conf.finals.chart.column) {
+ item.stacked = true;
+ }
+ }
+
+ return chart;
+ };
+
+ generator.bar = function() {
+ var store = getDefaultStore(),
+ numericAxis = getDefaultNumericAxis(store),
+ categoryAxis = getDefaultCategoryAxis(store),
+ axes,
+ series = getDefaultSeries(store),
+ trendLines,
+ targetLine,
+ baseLine,
+ chart;
+
+ // Axes
+ numericAxis.position = 'bottom';
+ categoryAxis.position = 'left';
+ categoryAxis.label.rotate.degrees = 360;
+ axes = [numericAxis, categoryAxis];
+
+ // Series
+ series.type = 'bar';
+ series.axis = 'bottom';
+
+ // Options
+ if (xLayout.showValues) {
+ series.label = {
+ display: 'outside',
+ 'text-anchor': 'middle',
+ field: store.rangeFields
+ };
+ }
+
+ series = [series];
+
+ if (xLayout.showTrendLine) {
+ trendLines = getDefaultTrendLines(store);
+
+ for (var i = 0; i < trendLines.length; i++) {
+ trendLines[i].axis = 'bottom';
+ trendLines[i].xField = store.trendLineFields[i];
+ trendLines[i].yField = store.domainFields;
+ }
+
+ series = trendLines.concat(series);
+ }
+
+ if (xLayout.targetLineValue) {
+ targetLine = getDefaultTargetLine(store);
+ targetLine.axis = 'bottom';
+ targetLine.xField = store.targetLineFields;
+ targetLine.yField = store.domainFields;
+
+ series.push(targetLine);
+ }
+
+ if (xLayout.baseLineValue) {
+ baseLine = getDefaultBaseLine(store);
+ baseLine.axis = 'bottom';
+ baseLine.xField = store.baseLineFields;
+ baseLine.yField = store.domainFields;
+
+ series.push(baseLine);
+ }
+
+ // Theme
+ setDefaultTheme(store);
+
+ return getDefaultChart(store, axes, series);
+ };
+
+ generator.stackedbar = function() {
+ var chart = this.bar();
+
+ for (var i = 0, item; i < chart.series.items.length; i++) {
+ item = chart.series.items[i];
+
+ if (item.type === conf.finals.chart.bar) {
+ item.stacked = true;
+ }
+ }
+
+ return chart;
+ };
+
+ generator.line = function() {
+ var store = getDefaultStore(),
+ numericAxis = getDefaultNumericAxis(store),
+ categoryAxis = getDefaultCategoryAxis(store),
+ axes = [numericAxis, categoryAxis],
+ series = [],
+ colors = conf.chart.theme.dv1.slice(0, store.rangeFields.length),
+ seriesTitles = getDefaultSeriesTitle(store);
+
+ // Series
+ for (var i = 0, line; i < store.rangeFields.length; i++) {
+ line = {
+ type: 'line',
+ axis: 'left',
+ xField: store.domainFields,
+ yField: store.rangeFields[i],
+ style: {
+ opacity: 0.8,
+ lineWidth: 3
+ },
+ markerConfig: {
+ type: 'circle',
+ radius: 4
+ },
+ tips: getDefaultTips(),
+ title: seriesTitles[i]
+ };
+
+ //if (xLayout.showValues) {
+ //line.label = {
+ //display: 'over',
+ //field: store.rangeFields[i]
+ //};
+ //}
+
+ series.push(line);
+ }
+
+ // Options, theme colors
+ if (xLayout.showTrendLine) {
+ series = getDefaultTrendLines(store).concat(series);
+
+ colors = colors.concat(colors);
+ }
+
+ if (xLayout.targetLineValue) {
+ series.push(getDefaultTargetLine(store));
+
+ colors.push('#051a2e');
+ }
+
+ if (xLayout.baseLineValue) {
+ series.push(getDefaultBaseLine(store));
+
+ colors.push('#051a2e');
+ }
+
+ // Theme
+ Ext.chart.theme.dv1 = Ext.extend(Ext.chart.theme.Base, {
+ constructor: function(config) {
+ Ext.chart.theme.Base.prototype.constructor.call(this, Ext.apply({
+ seriesThemes: colors,
+ colors: colors
+ }, config));
+ }
+ });
+
+ return getDefaultChart(store, axes, series);
+ };
+
+ generator.area = function() {
+ var store = getDefaultStore(),
+ numericAxis = getDefaultNumericAxis(store),
+ categoryAxis = getDefaultCategoryAxis(store),
+ axes = [numericAxis, categoryAxis],
+ series = getDefaultSeries(store);
+
+ series.type = 'area';
+ series.style.opacity = 0.7;
+ series.style.lineWidth = 0;
+ delete series.label;
+ delete series.tips;
+ series = [series];
+
+ // Options
+ if (xLayout.showTrendLine) {
+ series = getDefaultTrendLines(store).concat(series);
+ }
+
+ if (xLayout.targetLineValue) {
+ series.push(getDefaultTargetLine(store));
+ }
+
+ if (xLayout.baseLineValue) {
+ series.push(getDefaultBaseLine(store));
+ }
+
+ // Theme
+ setDefaultTheme(store);
+
+ return getDefaultChart(store, axes, series);
+ };
+
+ generator.pie = function() {
+ var store = getDefaultStore(),
+ series,
+ colors,
+ chart,
+ label = {
+ field: conf.finals.data.domain
+ };
+
+ // Label
+ if (xLayout.showValues) {
+ label.display = 'middle';
+ label.contrast = true;
+ label.font = '14px ' + conf.chart.style.fontFamily;
+ label.renderer = function(value) {
+ var record = store.getAt(store.findExact(conf.finals.data.domain, value));
+ return record.data[store.rangeFields[0]];
+ };
+ }
+
+ // Series
+ series = [{
+ type: 'pie',
+ field: store.rangeFields[0],
+ donut: 7,
+ showInLegend: true,
+ highlight: {
+ segment: {
+ margin: 5
+ }
+ },
+ label: label,
+ style: {
+ opacity: 0.8,
+ stroke: '#555'
+ },
+ tips: {
+ trackMouse: true,
+ cls: 'dv-chart-tips',
+ renderer: function(item) {
+ this.update('<div style="text-align:center"><div style="font-size:17px; font-weight:bold">' + item.data[store.rangeFields[0]] + '</div><div style="font-size:10px">' + item.data[conf.finals.data.domain] + '</div></div>');
+ }
+ }
+ }];
+
+ // Theme
+ colors = conf.chart.theme.dv1.slice(0, xResponse.nameHeaderMap[xLayout.rowDimensionNames[0]].ids.length);
+
+ Ext.chart.theme.dv1 = Ext.extend(Ext.chart.theme.Base, {
+ constructor: function(config) {
+ Ext.chart.theme.Base.prototype.constructor.call(this, Ext.apply({
+ seriesThemes: colors,
+ colors: colors
+ }, config));
+ }
+ });
+
+ // Chart
+ chart = getDefaultChart(store, null, series);
+ //chart.legend.position = 'right';
+ //chart.legend.isVertical = true;
+ chart.insetPadding = 40;
+ chart.shadow = true;
+
+ return chart;
+ };
+
+ generator.radar = function() {
+ var store = getDefaultStore(),
+ axes = [],
+ series = [],
+ seriesTitles = getDefaultSeriesTitle(store),
+ chart;
+
+ // Axes
+ axes.push({
+ type: 'Radial',
+ position: 'radial',
+ label: {
+ display: true
+ }
+ });
+
+ // Series
+ for (var i = 0, obj; i < store.rangeFields.length; i++) {
+ obj = {
+ showInLegend: true,
+ type: 'radar',
+ xField: store.domainFields,
+ yField: store.rangeFields[i],
+ style: {
+ opacity: 0.5
+ },
+ tips: getDefaultTips(),
+ title: seriesTitles[i]
+ };
+
+ if (xLayout.showValues) {
+ obj.label = {
+ display: 'over',
+ field: store.rangeFields[i]
+ };
+ }
+
+ series.push(obj);
+ }
+
+ chart = getDefaultChart(store, axes, series, 'Category2');
+
+ chart.insetPadding = 40;
+ chart.height = centerRegion.getHeight() - 80;
+
+ chart.setChartSize = function() {
+ this.animate = false;
+ this.setWidth(centerRegion.getWidth());
+ this.setHeight(centerRegion.getHeight() - 80);
+ this.animate = true;
+ };
+
+ return chart;
+ };
+
+ // initialize
+ return generator[xLayout.type]();
+ };
}());
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js 2014-04-21 16:49:18 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js 2014-06-03 09:42:46 +0000
@@ -858,209 +858,225 @@
};
service.layout.getExtendedLayout = function(layout) {
- var layout = Ext.clone(layout),
- xLayout = {
- columns: [],
- rows: [],
- filters: [],
-
- columnObjectNames: [],
- columnDimensionNames: [],
- columnItems: [],
- columnIds: [],
- rowObjectNames: [],
- rowDimensionNames: [],
- rowItems: [],
- rowIds: [],
-
- // Axis
- axisDimensions: [],
- axisObjectNames: [],
- axisDimensionNames: [],
-
- // For param string
- sortedAxisDimensionNames: [],
-
- // Filter
- filterDimensions: [],
- filterObjectNames: [],
- filterDimensionNames: [],
- filterItems: [],
- filterIds: [],
-
- // For param string
- sortedFilterDimensions: [],
-
- // All
- dimensions: [],
- objectNames: [],
- dimensionNames: [],
-
- // Object name maps
- objectNameDimensionsMap: {},
- objectNameItemsMap: {},
- objectNameIdsMap: {},
-
- // Dimension name maps
- dimensionNameDimensionsMap: {},
- dimensionNameItemsMap: {},
- dimensionNameIdsMap: {},
-
- // For param string
- dimensionNameSortedIdsMap: {}
- };
-
- Ext.applyIf(xLayout, layout);
-
- // Columns, rows, filters
- if (layout.columns) {
- for (var i = 0, dim, items, xDim; i < layout.columns.length; i++) {
- dim = layout.columns[i];
- items = dim.items;
- xDim = {};
-
- xDim.dimension = dim.dimension;
- xDim.objectName = dim.dimension;
- xDim.dimensionName = dimConf.objectNameMap[dim.dimension].dimensionName;
-
- if (items) {
- xDim.items = items;
- xDim.ids = [];
-
- for (var j = 0; j < items.length; j++) {
- xDim.ids.push(items[j].id);
- }
- }
-
- xLayout.columns.push(xDim);
-
- xLayout.columnObjectNames.push(xDim.objectName);
- xLayout.columnDimensionNames.push(xDim.dimensionName);
- xLayout.columnItems = xLayout.columnItems.concat(xDim.items);
- xLayout.columnIds = xLayout.columnIds.concat(xDim.ids);
-
- xLayout.axisDimensions.push(xDim);
- xLayout.axisObjectNames.push(xDim.objectName);
- xLayout.axisDimensionNames.push(dimConf.objectNameMap[xDim.objectName].dimensionName);
-
- xLayout.objectNameDimensionsMap[xDim.objectName] = xDim;
- xLayout.objectNameItemsMap[xDim.objectName] = xDim.items;
- xLayout.objectNameIdsMap[xDim.objectName] = xDim.ids;
- }
- }
-
- if (layout.rows) {
- for (var i = 0, dim, items, xDim; i < layout.rows.length; i++) {
- dim = layout.rows[i];
- items = dim.items;
- xDim = {};
-
- xDim.dimension = dim.dimension;
- xDim.objectName = dim.dimension;
- xDim.dimensionName = dimConf.objectNameMap[dim.dimension].dimensionName;
-
- if (items) {
- xDim.items = items;
- xDim.ids = [];
-
- for (var j = 0; j < items.length; j++) {
- xDim.ids.push(items[j].id);
- }
- }
-
- xLayout.rows.push(xDim);
-
- xLayout.rowObjectNames.push(xDim.objectName);
- xLayout.rowDimensionNames.push(xDim.dimensionName);
- xLayout.rowItems = xLayout.rowItems.concat(xDim.items);
- xLayout.rowIds = xLayout.rowIds.concat(xDim.ids);
-
- xLayout.axisDimensions.push(xDim);
- xLayout.axisObjectNames.push(xDim.objectName);
- xLayout.axisDimensionNames.push(dimConf.objectNameMap[xDim.objectName].dimensionName);
-
- xLayout.objectNameDimensionsMap[xDim.objectName] = xDim;
- xLayout.objectNameItemsMap[xDim.objectName] = xDim.items;
- xLayout.objectNameIdsMap[xDim.objectName] = xDim.ids;
- }
- }
-
- if (layout.filters) {
- for (var i = 0, dim, items, xDim; i < layout.filters.length; i++) {
- dim = layout.filters[i];
- items = dim.items;
- xDim = {};
-
- xDim.dimension = dim.dimension;
- xDim.objectName = dim.dimension;
- xDim.dimensionName = dimConf.objectNameMap[dim.dimension].dimensionName;
-
- if (items) {
- xDim.items = items;
- xDim.ids = [];
-
- for (var j = 0; j < items.length; j++) {
- xDim.ids.push(items[j].id);
- }
- }
-
- xLayout.filters.push(xDim);
-
- xLayout.filterDimensions.push(xDim);
- xLayout.filterObjectNames.push(xDim.objectName);
- xLayout.filterDimensionNames.push(dimConf.objectNameMap[xDim.objectName].dimensionName);
- xLayout.filterItems = xLayout.filterItems.concat(xDim.items);
- xLayout.filterIds = xLayout.filterIds.concat(xDim.ids);
-
- xLayout.objectNameDimensionsMap[xDim.objectName] = xDim;
- xLayout.objectNameItemsMap[xDim.objectName] = xDim.items;
- xLayout.objectNameIdsMap[xDim.objectName] = xDim.ids;
- }
- }
-
- // Unique dimension names
- xLayout.axisDimensionNames = Ext.Array.unique(xLayout.axisDimensionNames);
- xLayout.filterDimensionNames = Ext.Array.unique(xLayout.filterDimensionNames);
-
- xLayout.columnDimensionNames = Ext.Array.unique(xLayout.columnDimensionNames);
- xLayout.rowDimensionNames = Ext.Array.unique(xLayout.rowDimensionNames);
- xLayout.filterDimensionNames = Ext.Array.unique(xLayout.filterDimensionNames);
-
- // For param string
- xLayout.sortedAxisDimensionNames = Ext.clone(xLayout.axisDimensionNames).sort();
- xLayout.sortedFilterDimensions = service.layout.sortDimensionArray(Ext.clone(xLayout.filterDimensions));
-
- // All
- xLayout.dimensions = [].concat(xLayout.axisDimensions, xLayout.filterDimensions);
- xLayout.objectNames = [].concat(xLayout.axisObjectNames, xLayout.filterObjectNames);
- xLayout.dimensionNames = [].concat(xLayout.axisDimensionNames, xLayout.filterDimensionNames);
-
- // Dimension name maps
- for (var i = 0, dimName; i < xLayout.dimensionNames.length; i++) {
- dimName = xLayout.dimensionNames[i];
-
- xLayout.dimensionNameDimensionsMap[dimName] = [];
- xLayout.dimensionNameItemsMap[dimName] = [];
- xLayout.dimensionNameIdsMap[dimName] = [];
- }
-
- for (var i = 0, xDim; i < xLayout.dimensions.length; i++) {
- xDim = xLayout.dimensions[i];
-
- xLayout.dimensionNameDimensionsMap[xDim.dimensionName].push(xDim);
- xLayout.dimensionNameItemsMap[xDim.dimensionName] = xLayout.dimensionNameItemsMap[xDim.dimensionName].concat(xDim.items);
- xLayout.dimensionNameIdsMap[xDim.dimensionName] = xLayout.dimensionNameIdsMap[xDim.dimensionName].concat(xDim.ids);
- }
-
- // For param string
- for (var key in xLayout.dimensionNameIdsMap) {
- if (xLayout.dimensionNameIdsMap.hasOwnProperty(key)) {
- xLayout.dimensionNameSortedIdsMap[key] = Ext.clone(xLayout.dimensionNameIdsMap[key]).sort();
- }
- }
-
- return xLayout;
- };
+ var layout = Ext.clone(layout),
+ xLayout;
+
+ xLayout = {
+ columns: [],
+ rows: [],
+ filters: [],
+
+ columnObjectNames: [],
+ columnDimensionNames: [],
+ rowObjectNames: [],
+ rowDimensionNames: [],
+
+ // axis
+ axisDimensions: [],
+ axisObjectNames: [],
+ axisDimensionNames: [],
+
+ // for param string
+ sortedAxisDimensionNames: [],
+
+ // Filter
+ filterDimensions: [],
+ filterObjectNames: [],
+ filterDimensionNames: [],
+
+ // for param string
+ sortedFilterDimensions: [],
+
+ // all
+ dimensions: [],
+ objectNames: [],
+ dimensionNames: [],
+
+ // oject name maps
+ objectNameDimensionsMap: {},
+ objectNameItemsMap: {},
+ objectNameIdsMap: {},
+
+ // dimension name maps
+ dimensionNameDimensionsMap: {},
+ dimensionNameItemsMap: {},
+ dimensionNameIdsMap: {},
+
+ // for param string
+ dimensionNameSortedIdsMap: {}
+
+ // sort table by column
+ //sortableIdObjects: []
+ };
+
+ Ext.applyIf(xLayout, layout);
+
+ // columns, rows, filters
+ if (layout.columns) {
+ //layout.columns = support.prototype.array.uniqueByProperty(layout.columns, 'dimension');
+
+ for (var i = 0, dim, items, xDim; i < layout.columns.length; i++) {
+ dim = layout.columns[i];
+ items = dim.items;
+ xDim = {};
+
+ xDim.dimension = dim.dimension;
+ xDim.objectName = dim.dimension;
+ xDim.dimensionName = dimConf.objectNameMap.hasOwnProperty(dim.dimension) ? dimConf.objectNameMap[dim.dimension].dimensionName || dim.dimension : dim.dimension;
+
+ xDim.items = [];
+ xDim.ids = [];
+
+ if (items) {
+ xDim.items = items;
+
+ for (var j = 0; j < items.length; j++) {
+ xDim.ids.push(items[j].id);
+ }
+ }
+
+ xLayout.columns.push(xDim);
+
+ xLayout.columnObjectNames.push(xDim.objectName);
+ xLayout.columnDimensionNames.push(xDim.dimensionName);
+
+ xLayout.axisDimensions.push(xDim);
+ xLayout.axisObjectNames.push(xDim.objectName);
+ xLayout.axisDimensionNames.push(dimConf.objectNameMap.hasOwnProperty(xDim.objectName) ? dimConf.objectNameMap[xDim.objectName].dimensionName || xDim.objectName : xDim.objectName);
+
+ xLayout.objectNameDimensionsMap[xDim.objectName] = xDim;
+ xLayout.objectNameItemsMap[xDim.objectName] = xDim.items;
+ xLayout.objectNameIdsMap[xDim.objectName] = xDim.ids;
+ }
+ }
+
+ if (layout.rows) {
+ //layout.rows = support.prototype.array.uniqueByProperty(layout.rows, 'dimension');
+
+ for (var i = 0, dim, items, xDim; i < layout.rows.length; i++) {
+ dim = Ext.clone(layout.rows[i]);
+ items = dim.items;
+ xDim = {};
+
+ xDim.dimension = dim.dimension;
+ xDim.objectName = dim.dimension;
+ xDim.dimensionName = dimConf.objectNameMap.hasOwnProperty(dim.dimension) ? dimConf.objectNameMap[dim.dimension].dimensionName || dim.dimension : dim.dimension;
+
+ xDim.items = [];
+ xDim.ids = [];
+
+ if (items) {
+ xDim.items = items;
+
+ for (var j = 0; j < items.length; j++) {
+ xDim.ids.push(items[j].id);
+ }
+ }
+
+ xLayout.rows.push(xDim);
+
+ xLayout.rowObjectNames.push(xDim.objectName);
+ xLayout.rowDimensionNames.push(xDim.dimensionName);
+
+ xLayout.axisDimensions.push(xDim);
+ xLayout.axisObjectNames.push(xDim.objectName);
+ xLayout.axisDimensionNames.push(dimConf.objectNameMap.hasOwnProperty(xDim.objectName) ? dimConf.objectNameMap[xDim.objectName].dimensionName || xDim.objectName : xDim.objectName);
+
+ xLayout.objectNameDimensionsMap[xDim.objectName] = xDim;
+ xLayout.objectNameItemsMap[xDim.objectName] = xDim.items;
+ xLayout.objectNameIdsMap[xDim.objectName] = xDim.ids;
+ }
+ }
+
+ if (layout.filters) {
+ //layout.filters = support.prototype.array.uniqueByProperty(layout.filters, 'dimension');
+
+ for (var i = 0, dim, items, xDim; i < layout.filters.length; i++) {
+ dim = layout.filters[i];
+ items = dim.items;
+ xDim = {};
+
+ xDim.dimension = dim.dimension;
+ xDim.objectName = dim.dimension;
+ xDim.dimensionName = dimConf.objectNameMap.hasOwnProperty(dim.dimension) ? dimConf.objectNameMap[dim.dimension].dimensionName || dim.dimension : dim.dimension;
+
+ xDim.items = [];
+ xDim.ids = [];
+
+ if (items) {
+ xDim.items = items;
+
+ for (var j = 0; j < items.length; j++) {
+ xDim.ids.push(items[j].id);
+ }
+ }
+
+ xLayout.filters.push(xDim);
+
+ xLayout.filterDimensions.push(xDim);
+ xLayout.filterObjectNames.push(xDim.objectName);
+ xLayout.filterDimensionNames.push(dimConf.objectNameMap.hasOwnProperty(xDim.objectName) ? dimConf.objectNameMap[xDim.objectName].dimensionName || xDim.objectName : xDim.objectName);
+
+ xLayout.objectNameDimensionsMap[xDim.objectName] = xDim;
+ xLayout.objectNameItemsMap[xDim.objectName] = xDim.items;
+ xLayout.objectNameIdsMap[xDim.objectName] = xDim.ids;
+ }
+ }
+
+ // legend set
+ xLayout.legendSet = layout.legendSet ? init.idLegendSetMap[layout.legendSet.id] : null;
+
+ if (layout.legendSet && layout.legendSet.mapLegends) {
+ xLayout.legendSet = init.idLegendSetMap[layout.legendSet.id];
+ support.prototype.array.sort(xLayout.legendSet.mapLegends, 'ASC', 'startValue');
+ }
+
+ // unique dimension names
+ xLayout.axisDimensionNames = Ext.Array.unique(xLayout.axisDimensionNames);
+ xLayout.filterDimensionNames = Ext.Array.unique(xLayout.filterDimensionNames);
+
+ xLayout.columnDimensionNames = Ext.Array.unique(xLayout.columnDimensionNames);
+ xLayout.rowDimensionNames = Ext.Array.unique(xLayout.rowDimensionNames);
+ xLayout.filterDimensionNames = Ext.Array.unique(xLayout.filterDimensionNames);
+
+ // for param string
+ xLayout.sortedAxisDimensionNames = Ext.clone(xLayout.axisDimensionNames).sort();
+ xLayout.sortedFilterDimensions = service.layout.sortDimensionArray(Ext.clone(xLayout.filterDimensions));
+
+ // all
+ xLayout.dimensions = [].concat(xLayout.axisDimensions, xLayout.filterDimensions);
+ xLayout.objectNames = [].concat(xLayout.axisObjectNames, xLayout.filterObjectNames);
+ xLayout.dimensionNames = [].concat(xLayout.axisDimensionNames, xLayout.filterDimensionNames);
+
+ // dimension name maps
+ for (var i = 0, dimName; i < xLayout.dimensionNames.length; i++) {
+ dimName = xLayout.dimensionNames[i];
+
+ xLayout.dimensionNameDimensionsMap[dimName] = [];
+ xLayout.dimensionNameItemsMap[dimName] = [];
+ xLayout.dimensionNameIdsMap[dimName] = [];
+ }
+
+ for (var i = 0, xDim; i < xLayout.dimensions.length; i++) {
+ xDim = xLayout.dimensions[i];
+
+ xLayout.dimensionNameDimensionsMap[xDim.dimensionName].push(xDim);
+ xLayout.dimensionNameItemsMap[xDim.dimensionName] = xLayout.dimensionNameItemsMap[xDim.dimensionName].concat(xDim.items);
+ xLayout.dimensionNameIdsMap[xDim.dimensionName] = xLayout.dimensionNameIdsMap[xDim.dimensionName].concat(xDim.ids);
+ }
+
+ // for param string
+ for (var key in xLayout.dimensionNameIdsMap) {
+ if (xLayout.dimensionNameIdsMap.hasOwnProperty(key)) {
+ xLayout.dimensionNameSortedIdsMap[key] = Ext.clone(xLayout.dimensionNameIdsMap[key]).sort();
+ }
+ }
+
+ // Uuid
+ xLayout.tableUuid = init.el + '_' + Ext.data.IdGenerator.get('uuid').generate();
+
+ return xLayout;
+ };
service.layout.getSyncronizedXLayout = function(xLayout, response) {
var dimensions = Ext.Array.clean([].concat(xLayout.columns || [], xLayout.rows || [], xLayout.filters || [])),
@@ -1676,6 +1692,20 @@
var xResponse = ns.app.xResponse,
xLayout = ns.app.xLayout,
+ columnIds = xLayout.columns[0].ids,
+ rowIds = xLayout.rows[0].ids,
+ filterIds = function() {
+ var ids = [];
+
+ if (xLayout.filters) {
+ for (var i = 0; i < xLayout.filters.length; i++) {
+ ids = ids.concat(xLayout.filters[i].ids || []);
+ }
+ }
+
+ return ids;
+ }(),
+
getSyncronizedXLayout,
getExtendedResponse,
validateUrl,
@@ -1704,8 +1734,8 @@
rowDimensionName = xLayout.rows[0].dimensionName,
data = [],
- columnIds = xLayout.columnIds,
- rowIds = xLayout.rowIds,
+ //columnIds = xLayout.columnIds,
+ //rowIds = xLayout.rowIds,
trendLineFields = [],
targetLineFields = [],
baseLineFields = [],
@@ -2168,13 +2198,13 @@
};
getDefaultChartTitle = function(store) {
- var ids = xLayout.filterIds,
+ var ids = filterIds,
a = [],
text = '',
fontSize;
if (xLayout.type === conf.finals.chart.pie) {
- ids = ids.concat(xLayout.columnIds);
+ ids = ids.concat(columnIds);
}
if (Ext.isArray(ids) && ids.length) {
