Added has_charts to OPTIONS header for when you only have dynamic cha…

…rts for a report. Made it so if you define a chart header for a dataset, it will use that dataset's properties without having to specify it.
hellifiknow · Nov 12, 2013 · ec297a6 · ec297a6
1 parent e61ed71
commit ec297a6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/classes/headers/FormattingHeader.php b/classes/headers/FormattingHeader.php
@@ -34,20 +34,12 @@ class FormattingHeader extends HeaderBase {
 		'dataset'=>array(
 			'required'=>true,
 			'default'=>true
-		),
-		'has_charts'=>array(
-			'type'=>'boolean'
 		)
 	);
 
 	public static function init($params, &$report) {
 		if(!isset($report->options['Formatting'])) $report->options['Formatting'] = array();
 		$report->options['Formatting'][] = $params;
-
-		if(isset($params['has_charts']) && $params['has_charts']) {
-			$report->options['has_charts'] = true;
-			if(!isset($report->options['Charts'])) $report->options['Charts'] = array();
-		}
 	}
 
 	public static function parseShortcut($value) {

diff --git a/classes/headers/OptionsHeader.php b/classes/headers/OptionsHeader.php
@@ -69,6 +69,9 @@ class OptionsHeader extends HeaderBase {
 		'default_dataset'=>array(
 			'type'=>'number',
 			'default'=>0
+		),
+		'has_charts'=>array(
+			'type'=>'boolean'
 		)
 	);
 
@@ -78,6 +81,10 @@ public static function init($params, &$report) {
 			$params['cache'] = $params['ttl'];
 			unset($params['ttl']);
 		}
+
+		if(isset($params['has_charts']) && $params['has_charts']) {
+			if(!isset($report->options['Charts'])) $report->options['Charts'] = array();
+		}
 
 		// Some parameters were moved to a 'FORMATTING' header
 		// We need to catch those and add the header to the report

diff --git a/lib/PhpReports/Report.php b/lib/PhpReports/Report.php
@@ -220,9 +220,10 @@ protected function parseHeaders() {
 		if(!isset($this->options['Name'])) $this->options['Name'] = $this->report;
 	}
 
-	public function parseHeader($name,$value) {
+	public function parseHeader($name,$value,$dataset=null) {
 		$classname = $name.'Header';
 		if(class_exists($classname)) {
+			if($dataset !== null && isset($classname::$validation) && isset($classname::$validation['dataset'])) $value['dataset'] = $dataset;
 			$classname::parse($name,$value,$this);
 			if(!in_array($name,$this->headers)) $this->headers[] = $name;
 		}
@@ -421,7 +422,7 @@ protected function parseDynamicHeaders() {
 			if(isset($dataset['headers'])) {
 				foreach($dataset['headers'] as $j=>$header) {
 					if(isset($header['header']) && isset($header['value'])) {
-						$this->parseHeader($header['header'],$header['value']);
+						$this->parseHeader($header['header'],$header['value'],$i);
 					}
 				}
 			}