# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1437506457 -7200
# Node ID 5db8186fe803e9ea10981914d4d3b9a6a529a633
# Parent  ad6edfde6189fde31842a62dd79ec466d16789a6
Fixed date display formatting on the web pages. Tooltips display date and time, the normal X-axis only the date.

diff -r ad6edfde6189 -r 5db8186fe803 www-thermferm/archives.php
--- a/www-thermferm/archives.php	Sat Jun 27 17:28:16 2015 +0200
+++ b/www-thermferm/archives.php	Tue Jul 21 21:20:57 2015 +0200
@@ -142,6 +142,15 @@
     $outstr .= '           {'.PHP_EOL;
     $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 .= '             },'.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 .= ' + \' \' + (h < 10 ? \'0\' + h : h) + \':\' + (m < 10 ? \'0\' + m : m);'.PHP_EOL;
+    $outstr .= '             },'.PHP_EOL;
     $outstr .= '             textRotationAngle: 45,'.PHP_EOL;
     $outstr .= '             showGridLines: false'.PHP_EOL;
     $outstr .= '           },'.PHP_EOL;
diff -r ad6edfde6189 -r 5db8186fe803 www-thermferm/liveview.php
--- a/www-thermferm/liveview.php	Sat Jun 27 17:28:16 2015 +0200
+++ b/www-thermferm/liveview.php	Tue Jul 21 21:20:57 2015 +0200
@@ -143,6 +143,15 @@
 	$outstr .= '           {'.PHP_EOL;
 	$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 .= '             },'.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 .= ' + \' \' + (h < 10 ? \'0\' + h : h) + \':\' + (m < 10 ? \'0\' + m : m);'.PHP_EOL;
+	$outstr .= '             },'.PHP_EOL;
 	$outstr .= '             textRotationAngle: 45,'.PHP_EOL;
 	$outstr .= '             showGridLines: false'.PHP_EOL;
 	$outstr .= '           },'.PHP_EOL;