c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

fix datetime parsing in JavaScript

Browse Source
This commit is contained in:
Lee Lawlor 2015-07-09 16:09:14 -04:00
parent 19ae3343cb
commit 5512d2b0e0
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/charts/multiple_series.html.erb
View File

@ -119,10 +119,8 @@
// converts date format from JSON // converts date format from JSON
function getChartDate(d) { function getChartDate(d) {
// get the data using javascript's date object (year, month, day, hour, minute, second)
// months in javascript start at 0, so remember to subtract 1 when specifying the month
// offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct // offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct
return Date.UTC(d.substring(0,4), d.substring(5,7)-1, d.substring(8,10), d.substring(11,13), d.substring(14,16), d.substring(17,19)) - (my_offset * 60000); return Date.parse(d) - (my_offset * 60000);
} }
</script> </script>

4
app/views/charts/show.html.erb
View File

@ -14,10 +14,8 @@
// converts date format from JSON // converts date format from JSON
function getChartDate(d) { function getChartDate(d) {
// get the data using javascript's date object (year, month, day, hour, minute, second)
// months in javascript start at 0, so remember to subtract 1 when specifying the month
// offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct // offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct
return Date.UTC(d.substring(0,4), d.substring(5,7)-1, d.substring(8,10), d.substring(11,13), d.substring(14,16), d.substring(17,19)) - (myOffset * 60000); return Date.parse(d) - (myOffset * 60000);
} }
$(document).on('page:load ready', function() { $(document).on('page:load ready', function() {

4
app/views/pages/export.html.erb
View File

@ -9,10 +9,8 @@
// converts date format from JSON // converts date format from JSON
function getChartDate(d) { function getChartDate(d) {
// get the data using javascript's date object (year, month, day, hour, minute, second)
// months in javascript start at 0, so remember to subtract 1 when specifying the month
// offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct // offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct
return Date.UTC(d.substring(0,4), d.substring(5,7)-1, d.substring(8,10), d.substring(11,13), d.substring(14,16), d.substring(17,19)) - (myOffset * 60000); return Date.parse(d) - (myOffset * 60000);
} }
$(document).on('page:load ready', function() { $(document).on('page:load ready', function() {

4
app/views/plugins/templates/chart.js
View File

@ -112,10 +112,8 @@
// converts date format from JSON // converts date format from JSON
function getChartDate(d) { function getChartDate(d) {
// get the data using javascript's date object (year, month, day, hour, minute, second)
// months in javascript start at 0, so remember to subtract 1 when specifying the month
// offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct // offset in minutes is converted to milliseconds and subtracted so that chart's x-axis is correct
return Date.UTC(d.substring(0,4), d.substring(5,7)-1, d.substring(8,10), d.substring(11,13), d.substring(14,16), d.substring(17,19)) - (my_offset * 60000); return Date.parse(d) - (my_offset * 60000);
} }
</script> </script>