Version 4.1.2

system/Helpers/Chart/Dynamic.php

@@ -96,7 +96,7 @@ class _Dynamic extends \IPS\Helpers\Chart
 	/**
 	 * @brief	Available Types
 	 */
-	public $availableTypes = array( 'LineChart', 'ColumnChart', 'BarChart', 'PieChart' );
+	public $availableTypes = array( 'LineChart', 'ColumnChart', 'BarChart', 'PieChart', 'Table' );
 	
 	/**
 	 * @brief	Available Filters
@@ -162,7 +162,7 @@ class _Dynamic extends \IPS\Helpers\Chart
 		$this->start		= $defaultTimes['start'];
 		$this->end			= $defaultTimes['end'];
 		$this->identifier	= \substr( md5( $table . $dateField ), 0, 6 ) . $identifier;
-		
+
 		if ( isset( \IPS\Request::i()->type[ $this->identifier ] ) and in_array( \IPS\Request::i()->type[ $this->identifier ], $this->availableTypes ) )
 		{
 			$this->type = \IPS\Request::i()->type[ $this->identifier ];
@@ -407,7 +407,7 @@ class _Dynamic extends \IPS\Helpers\Chart
 					$key = array_pop( $keys );
 					
 					$stmt = \IPS\Db::i()->select(
-						"{$key}, {$this->groupBy}",
+						"{$key}" . ( $this->groupBy ? ", {$this->groupBy}" : '' ),
 						$this->table,
 						$where,
 						"{$this->dateField} ASC",
@@ -556,7 +556,7 @@ class _Dynamic extends \IPS\Helpers\Chart
 					{
 						$this->options['domainAxis']['type'] = 'category';
 					}
-					
+
 					$output = $this->render( $this->type, $this->options, $this->format );
 				}
 			}