Merge pull request jdorn#105 from jdorn/dynamic_headers

Dynamic headers
hellifiknow · Nov 12, 2013 · 3988ef8 · 3988ef8
2 parents a956e30 + ec297a6
commit 3988ef8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
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;
 		}
@@ -412,6 +413,20 @@ protected function _runReport() {
 		}
 
 		$this->options['DataSets'] = $datasets;
+
+		$this->parseDynamicHeaders();
+	}
+
+	protected function parseDynamicHeaders() {
+		foreach($this->options['DataSets'] as $i=>&$dataset) {
+			if(isset($dataset['headers'])) {
+				foreach($dataset['headers'] as $j=>$header) {
+					if(isset($header['header']) && isset($header['value'])) {
+						$this->parseHeader($header['header'],$header['value'],$i);
+					}
+				}
+			}
+		}
 	}
 
 	protected function getTimeEstimate() {