Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTassoman <tassoman@users.noreply.github.com>2020-06-03 22:52:35 +0300
committerGitHub <noreply@github.com>2020-06-03 22:52:35 +0300
commite0fb7b40b7ddf42da70e63224c43524380f57e48 (patch)
tree7cab6baa502118cd30af492acde2e2ac4d608bed
parentfb8a9d2d0f1ea2b07558f2a05cad29a35b3141cb (diff)
Fixes some comparison issues (#15583) (#16015)
* ensure new date objects are returned * return chosen period when comparing with previous year Co-authored-by: Stefan Giehl <stefan@matomo.org>
-rw-r--r--plugins/CoreHome/angularjs/common/services/periods.js2
-rw-r--r--plugins/CoreHome/angularjs/period-selector/period-selector.controller.js11
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);