diff options
| -rw-r--r-- | plugins/CoreHome/angularjs/common/services/periods.js | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/angularjs/period-selector/period-selector.controller.js | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/plugins/CoreHome/angularjs/common/services/periods.js b/plugins/CoreHome/angularjs/common/services/periods.js index 9e6ba80f03..95f6f0c3dd 100644 --- a/plugins/CoreHome/angularjs/common/services/periods.js +++ b/plugins/CoreHome/angularjs/common/services/periods.js @@ -63,7 +63,7 @@ }, getDateRange: function () { - return [this.dateInPeriod, this.dateInPeriod]; + return [new Date(this.dateInPeriod.getTime()), new Date(this.dateInPeriod.getTime())]; } }; diff --git a/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js b/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js index 58ed8295e3..83e100947e 100644 --- a/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js +++ b/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js @@ -257,9 +257,16 @@ currentDateRange[0].setFullYear(currentDateRange[0].getFullYear() - 1); currentDateRange[1].setFullYear(currentDateRange[1].getFullYear() - 1); + if (vm.selectedPeriod === 'range') { + return { + comparePeriods: ['range'], + compareDates: [piwikPeriods.format(currentDateRange[0]) + ',' + piwikPeriods.format(currentDateRange[1])], + }; + } + return { - comparePeriods: ['range'], - compareDates: [piwikPeriods.format(currentDateRange[0]) + ',' + piwikPeriods.format(currentDateRange[1])], + comparePeriods: [vm.selectedPeriod], + compareDates: [piwikPeriods.format(currentDateRange[0])], }; } else { console.warn("Unknown compare period type: " + vm.comparePeriodType); |