=== 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-09-11 21:01:00 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2015-10-15 11:18:43 +0000 @@ -28,7 +28,7 @@ DHIS.getEventChart({ url: url, el: 'report1', - id: 'W2ECFMopmyp' + id: 'lUhwbwHKnSe' }); //DHIS.getEventChart({ === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-10-12 11:12:49 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-10-15 11:18:43 +0000 @@ -4756,27 +4756,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 } ] @@ -4796,27 +4796,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 } @@ -4837,17 +4837,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 } ] @@ -4867,17 +4867,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 } ] @@ -4897,17 +4897,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 } ] @@ -4928,17 +4928,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 } ] @@ -4958,17 +4958,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-visualizer/scripts/core.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-10-03 12:51:50 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-10-15 11:18:43 +0000 @@ -715,7 +715,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-visualizer/scripts/eventchart.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-10-12 11:52:06 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-10-15 11:18:43 +0000 @@ -772,7 +772,33 @@ {id: 'FinancialJuly', name: EV.i18n.financial_july}, {id: 'FinancialApril', name: EV.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 @@ -991,7 +1017,7 @@ // sortOrder: number - // outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_INSTANCE', 'ENROLLMENT' + // outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_IEVTANCE', 'ENROLLMENT' // rangeAxisMaxValue: number === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-10-12 11:52:06 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-10-15 11:18:43 +0000 @@ -772,7 +772,33 @@ {id: 'FinancialJuly', name: EV.i18n.financial_july}, {id: 'FinancialApril', name: EV.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 @@ -991,7 +1017,7 @@ // sortOrder: number - // outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_INSTANCE', 'ENROLLMENT' + // outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_IEVTANCE', 'ENROLLMENT' // rangeAxisMaxValue: number === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-10-12 11:52:06 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-10-15 11:18:43 +0000 @@ -772,7 +772,33 @@ {id: 'FinancialJuly', name: EV.i18n.financial_july}, {id: 'FinancialApril', name: EV.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 @@ -991,7 +1017,7 @@ // sortOrder: number - // outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_INSTANCE', 'ENROLLMENT' + // outputType: string ('EVENT') - 'EVENT', 'TRACKED_ENTITY_IEVTANCE', 'ENROLLMENT' // rangeAxisMaxValue: number