=== 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 @@
- Event reports
+ DHIS2 Event Visualizer
@@ -11,11 +11,17 @@
+
+
+
=== 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: '' + NS.i18n.update + '',
- 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: '' + NS.i18n.update + '',
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 += '';
- html += '
' + NS.i18n.example1 + '
';
- html += '
- ' + NS.i18n.example2 + '
';
- html += '
- ' + NS.i18n.example3 + '
';
- html += '
- ' + NS.i18n.example4 + '
';
- html += '
' + NS.i18n.example5 + '
';
- html += '
- ' + NS.i18n.example6 + '
';
- html += '
- ' + NS.i18n.example7 + '
';
- html += '
- ' + NS.i18n.example8 + '
';
- html += '
' + htmlValue + '';
- html += '';
- html += ' ';
- html += ' | ';
-
- //cls = 'legend';
- //cls += config.hidden ? ' td-hidden' : '';
- //cls += config.collapsed ? ' td-collapsed' : '';
-
- //html += '';
- //html += '';
- //html += ' ' : '';
- //html += htmlValue + ' ';
- //html += ' ';
- //html += ' | ';
- }
- else {
- html += 'style="padding:' + displayDensity + '; font-size:' + fontSize + ';"' + '>' + htmlValue + '';
- }
-
- 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 = '';
-
- for (var i = 0; i < htmlArray.length; i++) {
- s += '' + htmlArray[i].join('') + '
';
- }
-
- return s += '
';
- };
-
- // 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 += '';
-
- // get header indexes
- for (var i = 0, header, uuid; i < dimensionHeaders.length; i++) {
- header = dimensionHeaders[i];
- uuid = Ext.data.IdGenerator.get('uuid').generate();
-
- html += '| ' + header.column + ' | ';
-
- xResponse.sortableIdObjects.push({
- id: header.name,
- uuid: uuid
- });
- }
-
- html += '
';
-
- // rows
- for (var i = 0, row; i < rows.length; i++) {
- row = rows[i];
- html += '';
-
- 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 ? '' : '') + a[i] + (!isLast ? '' : '') + (!isLast ? ' / ' : '');
- //}
- //}
-
- html += '| ' + name + ' | ';
- }
-
- html += '
';
- }
-
- html += '
';
-
- 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('' + value + '
' + si.data[conf.finals.data.domain] + '
' + item.data[store.rangeFields[0]] + '
' + item.data[conf.finals.data.domain] + '