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:
Diffstat (limited to 'plugins/ScheduledReports/javascripts/pdf.js')
-rw-r--r--plugins/ScheduledReports/javascripts/pdf.js15
1 files changed, 13 insertions, 2 deletions
diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js
index 2b86809517..5ddff3654f 100644
--- a/plugins/ScheduledReports/javascripts/pdf.js
+++ b/plugins/ScheduledReports/javascripts/pdf.js
@@ -9,6 +9,10 @@ var getReportParametersFunctions = Object();
var updateReportParametersFunctions = Object();
var resetReportParametersFunctions = Object();
+function adjustHourToTimezone(hour, difference) {
+ return (24 + parseInt(hour) + difference) % 24;
+}
+
function formSetEditReport(idReport) {
var report = {
'type': ReportPlugin.defaultReportType,
@@ -29,11 +33,16 @@ function formSetEditReport(idReport) {
toggleReportType(report.type);
+ var hour = adjustHourToTimezone(report.hour, timeZoneDifference);
+
$('#report_description').html(report.description);
$('#report_segment').find('option[value=' + report.idsegment + ']').prop('selected', 'selected');
$('#report_type').find('option[value=' + report.type + ']').prop('selected', 'selected');
$('#report_period').find('option[value=' + report.period + ']').prop('selected', 'selected');
- $('#report_hour').val(report.hour);
+ $('#report_hour').val(hour).bind('change', function() {
+ $('#hour_utc').text(adjustHourToTimezone($(this).val(), -timeZoneDifference));
+ });
+ $('#hour_utc').text(report.hour);
$('[name=report_format].' + report.type + ' option[value=' + report.format + ']').prop('selected', 'selected');
$('select[name=report_type]').change( toggleDisplayOptionsByFormat );
@@ -122,10 +131,12 @@ function initManagePdf() {
apiParameters.parameters = getReportParametersFunctions[apiParameters.reportType]();
+ var hour = adjustHourToTimezone($('#report_hour').val(), -timeZoneDifference);
+
var ajaxHandler = new ajaxHelper();
ajaxHandler.addParams(apiParameters, 'POST');
ajaxHandler.addParams({period: $('#report_period').find('option:selected').val()}, 'GET');
- ajaxHandler.addParams({hour: $('#report_hour').val()}, 'GET');
+ ajaxHandler.addParams({hour: hour}, 'GET');
ajaxHandler.redirectOnSuccess();
ajaxHandler.setLoadingElement();
if (idReport) {