Mercurial > mbsePi-apps / changeset
changeset
Fixed month display in live view and archive view. Bumped to version 0.3.7.
Sun, 02 Aug 2015 14:17:10 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Sun, 02 Aug 2015 14:17:10 +0200
- changeset 385
- 260e92f0f998
- parent 384
- 5db8186fe803
- child 386
- a6322c956773
Fixed month display in live view and archive view. Bumped to version 0.3.7.
| configure | file | annotate | diff | comparison | revisions | |
| configure.ac | file | annotate | diff | comparison | revisions | |
| www-thermferm/archives.php | file | annotate | diff | comparison | revisions | |
| www-thermferm/liveview.php | file | annotate | diff | comparison | revisions |
--- a/configure Tue Jul 21 21:20:57 2015 +0200 +++ b/configure Sun Aug 02 14:17:10 2015 +0200 @@ -2034,7 +2034,7 @@ PACKAGE="mbsePi-apps" -VERSION="0.3.6" +VERSION="0.3.7" COPYRIGHT="Copyright (C) 2014-2015 Michiel Broek, All Rights Reserved" CYEARS="2014-2015"
--- a/configure.ac Tue Jul 21 21:20:57 2015 +0200 +++ b/configure.ac Sun Aug 02 14:17:10 2015 +0200 @@ -8,7 +8,7 @@ dnl General settings dnl After changeing the version number, run autoconf! PACKAGE="mbsePi-apps" -VERSION="0.3.6" +VERSION="0.3.7" COPYRIGHT="Copyright (C) 2014-2015 Michiel Broek, All Rights Reserved" CYEARS="2014-2015" AC_SUBST(PACKAGE)
--- a/www-thermferm/archives.php Tue Jul 21 21:20:57 2015 +0200 +++ b/www-thermferm/archives.php Sun Aug 02 14:17:10 2015 +0200 @@ -143,12 +143,12 @@ $outstr .= ' dataField: \'Date\','.PHP_EOL; $outstr .= ' type: \'date\','.PHP_EOL; $outstr .= ' formatFunction: function (value) {'.PHP_EOL; - $outstr .= ' return value.getDate() + \'-\' + value.getMonth() + \'-\' + value.getFullYear()'.PHP_EOL; + $outstr .= ' return value.getDate() + \'-\' + (value.getMonth() + 1) + \'-\' + value.getFullYear()'.PHP_EOL; $outstr .= ' },'.PHP_EOL; $outstr .= ' toolTipFormatFunction: function (value) {'.PHP_EOL; $outstr .= ' var h = value.getHours();'.PHP_EOL; $outstr .= ' var m = value.getMinutes();'.PHP_EOL; - $outstr .= ' return value.getDate() + \'-\' + value.getMonth() + \'-\' + value.getFullYear()'; + $outstr .= ' return value.getDate() + \'-\' + (value.getMonth() + 1) + \'-\' + value.getFullYear()'; $outstr .= ' + \' \' + (h < 10 ? \'0\' + h : h) + \':\' + (m < 10 ? \'0\' + m : m);'.PHP_EOL; $outstr .= ' },'.PHP_EOL; $outstr .= ' textRotationAngle: 45,'.PHP_EOL;
--- a/www-thermferm/liveview.php Tue Jul 21 21:20:57 2015 +0200 +++ b/www-thermferm/liveview.php Sun Aug 02 14:17:10 2015 +0200 @@ -144,12 +144,12 @@ $outstr .= ' dataField: \'Date\','.PHP_EOL; $outstr .= ' type: \'date\','.PHP_EOL; $outstr .= ' formatFunction: function (value) {'.PHP_EOL; - $outstr .= ' return value.getDate() + \'-\' + value.getMonth() + \'-\' + value.getFullYear()'.PHP_EOL; + $outstr .= ' return value.getDate() + \'-\' + (value.getMonth() + 1) + \'-\' + value.getFullYear()'.PHP_EOL; $outstr .= ' },'.PHP_EOL; $outstr .= ' toolTipFormatFunction: function (value) {'.PHP_EOL; $outstr .= ' var h = value.getHours();'.PHP_EOL; $outstr .= ' var m = value.getMinutes();'.PHP_EOL; - $outstr .= ' return value.getDate() + \'-\' + value.getMonth() + \'-\' + value.getFullYear()'; + $outstr .= ' return value.getDate() + \'-\' + (value.getMonth() + 1) + \'-\' + value.getFullYear()'; $outstr .= ' + \' \' + (h < 10 ? \'0\' + h : h) + \':\' + (m < 10 ? \'0\' + m : m);'.PHP_EOL; $outstr .= ' },'.PHP_EOL; $outstr .= ' textRotationAngle: 45,'.PHP_EOL;
