From 0f842f375a373c9b0c440ae4dc26a095a46eaf7d Mon Sep 17 00:00:00 2001 From: Jakob Hirsch Date: Fri, 25 Mar 2011 07:54:54 +0800 Subject: [PATCH 1/2] removed custom timeformat --- htdocs/frontend/javascripts/options.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/htdocs/frontend/javascripts/options.js b/htdocs/frontend/javascripts/options.js index 40c59d7..4f4140a 100644 --- a/htdocs/frontend/javascripts/options.js +++ b/htdocs/frontend/javascripts/options.js @@ -55,12 +55,7 @@ vz.options.plot = { mode: 'time', max: new Date().getTime(), // timeinterval to request min: new Date().getTime() - vz.options.defaultInterval, - timeformat: '%d. %b %h:%M', monthNames: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'], - tickFormatter: function(val, axis) { - var date = new Date(val + vz.options.timezoneOffset); /* add timezone offset */ - return $.plot.formatDate(date, this.timeformat, this.monthNames); - } }, yaxis: { min: 0, From b849ae009ffdbd205097177c7f4f7412f2c3390b Mon Sep 17 00:00:00 2001 From: Jakob Hirsch Date: Thu, 7 Apr 2011 09:01:54 +0800 Subject: [PATCH 2/2] added option to flot to recalculate timestamps in local time. use this options in vz options. --- htdocs/frontend/javascripts/flot/jquery.flot.js | 2 ++ htdocs/frontend/javascripts/options.js | 1 + 2 files changed, 3 insertions(+) diff --git a/htdocs/frontend/javascripts/flot/jquery.flot.js b/htdocs/frontend/javascripts/flot/jquery.flot.js index aabc544..52e6407 100644 --- a/htdocs/frontend/javascripts/flot/jquery.flot.js +++ b/htdocs/frontend/javascripts/flot/jquery.flot.js @@ -1238,6 +1238,8 @@ }; formatter = function (v, axis) { + if (opts.useLocalTime) + v -= new Date(v).getTimezoneOffset()*60000; var d = new Date(v); // first check global format diff --git a/htdocs/frontend/javascripts/options.js b/htdocs/frontend/javascripts/options.js index 4f4140a..ce1ecbf 100644 --- a/htdocs/frontend/javascripts/options.js +++ b/htdocs/frontend/javascripts/options.js @@ -53,6 +53,7 @@ vz.options.plot = { legend: { show: false }, xaxis: { mode: 'time', + useLocalTime: true, max: new Date().getTime(), // timeinterval to request min: new Date().getTime() - vz.options.defaultInterval, monthNames: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],