# HG changeset patch # User Michiel Broek # Date 1434314925 -7200 # Node ID 20999ef6d487354a7be835ff21749b3d9c97d821 # Parent f6850e0b5d35d0466a4d849196646e57966b983b Fixed php scripts for jqwidgets version 3.8.0 diff -r f6850e0b5d35 -r 20999ef6d487 www-thermferm/archives.php --- a/www-thermferm/archives.php Sun Jun 14 20:39:36 2015 +0200 +++ b/www-thermferm/archives.php Sun Jun 14 22:48:45 2015 +0200 @@ -108,7 +108,7 @@ $outstr .= ' {'.PHP_EOL; $outstr .= ' datatype: "json",'.PHP_EOL; $outstr .= ' datafields: ['.PHP_EOL; - $outstr .= ' { name: "Date", type: "date", format: "yyyy-MM-ddTHH:mm" },'.PHP_EOL; + $outstr .= ' { name: "Date", type: "date", format: "yyyy-MM-dd HH:mm" },'.PHP_EOL; $outstr .= ' { name: "Mode" },'.PHP_EOL; $outstr .= ' { name: "Air", type: "float" },'.PHP_EOL; $outstr .= ' { name: "Beer", type: "float" },'.PHP_EOL; @@ -137,9 +137,10 @@ $outstr .= ' padding: { left: 5, top: 5, right: 5, bottom: 5 },'.PHP_EOL; $outstr .= ' titlePadding: { left: 0, top: 0, right: 0, bottom: 10 },'.PHP_EOL; $outstr .= ' source: dataAdapter,'.PHP_EOL; - $outstr .= ' categoryAxis:'.PHP_EOL; + $outstr .= ' xAxis:'.PHP_EOL; $outstr .= ' {'.PHP_EOL; $outstr .= ' dataField: \'Date\','.PHP_EOL; + $outstr .= ' type: \'date\','.PHP_EOL; $outstr .= ' textRotationAngle: 45,'.PHP_EOL; $outstr .= ' showGridLines: false'.PHP_EOL; $outstr .= ' },'.PHP_EOL; diff -r f6850e0b5d35 -r 20999ef6d487 www-thermferm/liveview.php --- a/www-thermferm/liveview.php Sun Jun 14 20:39:36 2015 +0200 +++ b/www-thermferm/liveview.php Sun Jun 14 22:48:45 2015 +0200 @@ -110,7 +110,7 @@ $outstr .= ' {'.PHP_EOL; $outstr .= ' datatype: "json",'.PHP_EOL; $outstr .= ' datafields: ['.PHP_EOL; - $outstr .= ' { name: "Date", type: "date", format: "yyyy-MM-ddTHH:mm" },'.PHP_EOL; + $outstr .= ' { name: "Date", type: "date", format: "yyyy-MM-dd HH:mm" },'.PHP_EOL; $outstr .= ' { name: "Mode" },'.PHP_EOL; $outstr .= ' { name: "Air", type: "float" },'.PHP_EOL; $outstr .= ' { name: "Beer", type: "float" },'.PHP_EOL; @@ -139,9 +139,10 @@ $outstr .= ' padding: { left: 5, top: 5, right: 5, bottom: 5 },'.PHP_EOL; $outstr .= ' titlePadding: { left: 0, top: 0, right: 0, bottom: 10 },'.PHP_EOL; $outstr .= ' source: dataAdapter'.$unr.','.PHP_EOL; - $outstr .= ' categoryAxis:'.PHP_EOL; + $outstr .= ' xAxis:'.PHP_EOL; $outstr .= ' {'.PHP_EOL; $outstr .= ' dataField: \'Date\','.PHP_EOL; + $outstr .= ' type: \'date\','.PHP_EOL; $outstr .= ' textRotationAngle: 45,'.PHP_EOL; $outstr .= ' showGridLines: false'.PHP_EOL; $outstr .= ' },'.PHP_EOL;