dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39675
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20096: PT DV ER option fix.
------------------------------------------------------------
revno: 20096
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-09-11 20:29:34 +0200
message:
PT DV ER option fix.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.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-apps/src/main/webapp/dhis-web-event-reports/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/plugin.html 2015-05-11 18:25:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/plugin.html 2015-09-11 18:29:34 +0000
@@ -21,20 +21,9 @@
DHIS.getEventReport({
url: url,
el: 'table1',
- uid: 'h76yaqLWw5t'
+ uid: 'Eb7MEQK3AVq',
+ completedOnly: true
});
-
- //DHIS.getTable({
- //url: url,
- //el: 'table2',
- //columns: [
- //{dimension: 'pe', items: [{id: 'LAST_3_MONTHS'}]}
- //],
- //rows: [
- //{dimension: 'ou', items: [{id: 'LEVEL-4'}, {id:'C9uduqDZr9d'}]}
- //],
- //hideEmptyRows: true
- //});
});
</script>
</head>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-09-10 23:33:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-09-11 18:29:34 +0000
@@ -5064,27 +5064,27 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_WEEK') - 1],
+ relativePeriodId: 'THIS_WEEK',
boxLabel: NS.i18n.this_week
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_WEEK') - 1],
+ relativePeriodId: 'LAST_WEEK',
boxLabel: NS.i18n.last_week
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_4_WEEKS') - 1],
+ relativePeriodId: 'LAST_4_WEEKS',
boxLabel: NS.i18n.last_4_weeks
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_12_WEEKS') - 1],
+ relativePeriodId: 'LAST_12_WEEKS',
boxLabel: NS.i18n.last_12_weeks
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_52_WEEKS') - 1],
+ relativePeriodId: 'LAST_52_WEEKS',
boxLabel: NS.i18n.last_52_weeks
}
]
@@ -5104,27 +5104,27 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_MONTH') - 1],
+ relativePeriodId: 'THIS_MONTH',
boxLabel: NS.i18n.this_month
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_MONTH') - 1],
+ relativePeriodId: 'LAST_MONTH',
boxLabel: NS.i18n.last_month
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_3_MONTHS') - 1],
+ relativePeriodId: 'LAST_3_MONTHS',
boxLabel: NS.i18n.last_3_months
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_6_MONTHS') - 1],
+ relativePeriodId: 'LAST_6_MONTHS',
boxLabel: NS.i18n.last_6_months
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_12_MONTHS') - 1],
+ relativePeriodId: 'LAST_12_MONTHS',
boxLabel: NS.i18n.last_12_months,
checked: true
}
@@ -5145,17 +5145,17 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_BIMONTH') - 1],
+ relativePeriodId: 'THIS_BIMONTH',
boxLabel: NS.i18n.this_bimonth
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_BIMONTH') - 1],
+ relativePeriodId: 'LAST_BIMONTH',
boxLabel: NS.i18n.last_bimonth
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_6_BIMONTHS') - 1],
+ relativePeriodId: 'LAST_6_BIMONTHS',
boxLabel: NS.i18n.last_6_bimonths
}
]
@@ -5175,17 +5175,17 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_QUARTER') - 1],
+ relativePeriodId: 'THIS_QUARTER',
boxLabel: NS.i18n.this_quarter
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_QUARTER') - 1],
+ relativePeriodId: 'LAST_QUARTER',
boxLabel: NS.i18n.last_quarter
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_4_QUARTERS') - 1],
+ relativePeriodId: 'LAST_4_QUARTERS',
boxLabel: NS.i18n.last_4_quarters
}
]
@@ -5205,17 +5205,17 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_SIX_MONTH') - 1],
+ relativePeriodId: 'THIS_SIX_MONTH',
boxLabel: NS.i18n.this_sixmonth
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_SIX_MONTH') - 1],
+ relativePeriodId: 'LAST_SIX_MONTH',
boxLabel: NS.i18n.last_sixmonth
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_2_SIXMONTHS') - 1],
+ relativePeriodId: 'LAST_2_SIXMONTHS',
boxLabel: NS.i18n.last_2_sixmonths
}
]
@@ -5236,17 +5236,17 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_FINANCIAL_YEAR') - 1],
+ relativePeriodId: 'THIS_FINANCIAL_YEAR',
boxLabel: NS.i18n.this_financial_year
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_FINANCIAL_YEAR') - 1],
+ relativePeriodId: 'LAST_FINANCIAL_YEAR',
boxLabel: NS.i18n.last_financial_year
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_5_FINANCIAL_YEARS') - 1],
+ relativePeriodId: 'LAST_5_FINANCIAL_YEARS',
boxLabel: NS.i18n.last_5_financial_years
}
]
@@ -5266,17 +5266,17 @@
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('THIS_YEAR') - 1],
+ relativePeriodId: 'THIS_YEAR',
boxLabel: NS.i18n.this_year
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_YEAR') - 1],
+ relativePeriodId: 'LAST_YEAR',
boxLabel: NS.i18n.last_year
},
{
xtype: 'checkbox',
- relativePeriodId: rp[rp.push('LAST_5_YEARS') - 1],
+ relativePeriodId: 'LAST_5_YEARS',
boxLabel: NS.i18n.last_5_years
}
]
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-09-10 23:33:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-09-11 18:29:34 +0000
@@ -136,7 +136,33 @@
{id: 'FinancialJuly', name: NS.i18n.financial_july},
{id: 'FinancialApril', name: NS.i18n.financial_april}
],
- relativePeriods: []
+ relativePeriods: [
+ 'THIS_WEEK',
+ 'LAST_WEEK',
+ 'LAST_4_WEEKS',
+ 'LAST_12_WEEKS',
+ 'LAST_52_WEEKS',
+ 'THIS_MONTH',
+ 'LAST_MONTH',
+ 'LAST_3_MONTHS',
+ 'LAST_6_MONTHS',
+ 'LAST_12_MONTHS',
+ 'THIS_BIMONTH',
+ 'LAST_BIMONTH',
+ 'LAST_6_BIMONTHS',
+ 'THIS_QUARTER',
+ 'LAST_QUARTER',
+ 'LAST_4_QUARTERS',
+ 'THIS_SIX_MONTH',
+ 'LAST_SIX_MONTH',
+ 'LAST_2_SIXMONTHS',
+ 'THIS_FINANCIAL_YEAR',
+ 'LAST_FINANCIAL_YEAR',
+ 'LAST_5_FINANCIAL_YEARS',
+ 'THIS_YEAR',
+ 'LAST_YEAR',
+ 'LAST_5_YEARS'
+ ]
};
// aggregation type
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-09-02 18:25:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-09-11 18:29:34 +0000
@@ -167,7 +167,33 @@
{id: 'FinancialJuly', name: ER.i18n.financial_july},
{id: 'FinancialApril', name: ER.i18n.financial_april}
],
- relativePeriods: []
+ relativePeriods: [
+ 'THIS_WEEK',
+ 'LAST_WEEK',
+ 'LAST_4_WEEKS',
+ 'LAST_12_WEEKS',
+ 'LAST_52_WEEKS',
+ 'THIS_MONTH',
+ 'LAST_MONTH',
+ 'LAST_3_MONTHS',
+ 'LAST_6_MONTHS',
+ 'LAST_12_MONTHS',
+ 'THIS_BIMONTH',
+ 'LAST_BIMONTH',
+ 'LAST_6_BIMONTHS',
+ 'THIS_QUARTER',
+ 'LAST_QUARTER',
+ 'LAST_4_QUARTERS',
+ 'THIS_SIX_MONTH',
+ 'LAST_SIX_MONTH',
+ 'LAST_2_SIXMONTHS',
+ 'THIS_FINANCIAL_YEAR',
+ 'LAST_FINANCIAL_YEAR',
+ 'LAST_5_FINANCIAL_YEARS',
+ 'THIS_YEAR',
+ 'LAST_YEAR',
+ 'LAST_5_YEARS'
+ ]
};
// aggregation type
@@ -183,6 +209,14 @@
],
idNameMap: {}
};
+
+ conf.valueType = {
+ numericTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE'],
+ textTypes: ['TEXT','LONG_TEXT','LETTER','PHONE_NUMBER','EMAIL'],
+ booleanTypes: ['BOOLEAN','TRUE_ONLY'],
+ dateTypes: ['DATE','DATETIME'],
+ aggregateTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE','BOOLEAN','TRUE_ONLY']
+ };
for (var i = 0, obj; i < conf.aggregationType.data.length; i++) {
obj = conf.aggregationType.data[i];
@@ -373,6 +407,10 @@
// hideEmptyRows: boolean (false)
+ // hideNaData: boolean (false)
+
+ // completedOnly: boolean (false)
+
// collapseDataDimensions: boolean (false)
// outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_IERTANCE', 'ENROLLMENT'
@@ -558,8 +596,9 @@
layout.hideEmptyRows = Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : false;
layout.hideNaData = Ext.isBoolean(config.hideNaData) ? config.hideNaData : false;
layout.collapseDataDimensions = Ext.isBoolean(config.collapseDataDimensions) ? config.collapseDataDimensions : false;
-
layout.outputType = Ext.isString(config.outputType) && !Ext.isEmpty(config.outputType) ? config.outputType : 'EVENT';
+ layout.completedOnly = Ext.isBoolean(config.completedOnly) ? config.completedOnly : false;
+
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';
@@ -2516,6 +2555,11 @@
paramString += '&outputType=' + view.outputType;
}
+ // completed only
+ if (view.completedOnly) {
+ paramString += '&completedOnly=true';
+ }
+
// sorting
if (view.dataType === 'individual_cases' && view.sorting) {
if (view.sorting.id && view.sorting.direction) {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2015-05-13 16:59:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2015-09-11 18:29:34 +0000
@@ -28,8 +28,8 @@
DHIS.getEventChart({
url: url,
el: 'report1',
- id: 'HyITmkk7kEh',
- columns: []
+ id: 'W2ECFMopmyp',
+ completedOnly: true
});
//DHIS.getEventChart({
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-09-02 18:25:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-09-11 18:29:34 +0000
@@ -734,6 +734,14 @@
idNameMap: {}
};
+ conf.valueType = {
+ numericTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE'],
+ textTypes: ['TEXT','LONG_TEXT','LETTER','PHONE_NUMBER','EMAIL'],
+ booleanTypes: ['BOOLEAN','TRUE_ONLY'],
+ dateTypes: ['DATE','DATETIME'],
+ aggregateTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE','BOOLEAN','TRUE_ONLY']
+ }
+
for (var i = 0, obj; i < conf.aggregationType.data.length; i++) {
obj = conf.aggregationType.data[i];
conf.aggregationType.idNameMap[obj.id] = obj.text;
@@ -948,6 +956,8 @@
// hideNaData: boolean (false)
+ // completedOnly: boolean (false)
+
// aggregationType: string ('default') - 'default', 'count', 'sum'
// showHierarchy: boolean (false)
@@ -1150,9 +1160,10 @@
// properties
layout.showValues = Ext.isBoolean(config.showData) ? config.showData : (Ext.isBoolean(config.showValues) ? config.showValues : true);
+ layout.showTrendLine = Ext.isBoolean(config.regression) ? config.regression : (Ext.isBoolean(config.showTrendLine) ? config.showTrendLine : false);
layout.hideEmptyRows = Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : (Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : true);
layout.hideNaData = Ext.isBoolean(config.hideNaData) ? config.hideNaData : false;
- layout.showTrendLine = Ext.isBoolean(config.regression) ? config.regression : (Ext.isBoolean(config.showTrendLine) ? config.showTrendLine : false);
+ layout.completedOnly = Ext.isBoolean(config.completedOnly) ? config.completedOnly : 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);
@@ -3105,6 +3116,11 @@
paramString += '&outputType=' + layout.outputType;
}
+ // completed only
+ if (layout.completedOnly) {
+ paramString += '&completedOnly=true';
+ }
+
// display property
paramString += '&displayProperty=' + init.userAccount.settings.keyAnalysisDisplayProperty.toUpperCase();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2015-09-09 23:19:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html 2015-09-11 18:29:34 +0000
@@ -38,10 +38,10 @@
{dimension: 'pe', items: [{id: 'LAST_12_MONTHS'}]}
],
rows: [
- {dimension: 'ou', items: [{id: 'USER_ORGUNIT_CHILDREN'}]}
+ {dimension: 'ou', items: [{id: 'LEVEL-3'}, {id: 'fdc6uOvgoji'}]}
],
- hideEmptyRows: true,
- userOrgUnit: ['fdc6uOvgoji', 'e1eIKM1GIF3']
+ hideEmptyRows: true
+ //userOrgUnit: ['fdc6uOvgoji', 'e1eIKM1GIF3']
});
});
</script>
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js 2015-09-09 23:19:52 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js 2015-09-11 18:29:34 +0000
@@ -390,6 +390,8 @@
// showHierarchy: boolean (false)
+ // completedOnly: boolean (false)
+
// displayDensity: string ('normal') - 'compact', 'normal', 'comfortable'
// fontSize: string ('normal') - 'small', 'normal', 'large'
@@ -568,6 +570,8 @@
layout.showHierarchy = Ext.isBoolean(config.showHierarchy) ? config.showHierarchy : false;
+ layout.completedOnly = Ext.isBoolean(config.completedOnly) ? config.completedOnly : 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';
@@ -1725,6 +1729,10 @@
delete layout.showHierarchy;
}
+ if (!layout.completedOnly) {
+ delete layout.completedOnly;
+ }
+
if (layout.displayDensity === 'normal') {
delete layout.displayDensity;
}
@@ -2033,7 +2041,6 @@
type = (obj.status || 'INFO').toLowerCase();
config.title = obj.status;
- config.cls = 'ns-window-title-messagebox';
config.iconCls = 'ns-window-title-messagebox ' + type;
// html
@@ -2116,6 +2123,10 @@
paramString += '&hierarchyMeta=true';
}
+ if (xLayout.completedOnly) {
+ paramString += '&completedOnly=true';
+ }
+
// aggregation type
if (Ext.Array.contains(aggTypes, xLayout.aggregationType)) {
paramString += '&aggregationType=' + xLayout.aggregationType;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-09-07 12:21:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-09-11 18:29:34 +0000
@@ -933,6 +933,8 @@
// showTrendLine: boolean (false)
+ // completedOnly: boolean (false)
+
// targetLineValue: number
// targetLineTitle: string
@@ -1194,6 +1196,9 @@
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.completedOnly = Ext.isBoolean(config.completedOnly) ? config.completedOnly : 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);
@@ -1986,6 +1991,10 @@
delete layout.showTrendLine;
}
+ if (!layout.completedOnly) {
+ delete layout.completedOnly;
+ }
+
if (!layout.targetLineValue) {
delete layout.targetLineValue;
}
@@ -2434,6 +2443,10 @@
}
}
+ if (xLayout.completedOnly) {
+ paramString += '&completedOnly=true';
+ }
+
// aggregation type
if (Ext.Array.contains(aggTypes, xLayout.aggregationType)) {
paramString += '&aggregationType=' + xLayout.aggregationType;
