diff options
author | JulienMoumne <julien@piwik.org> | 2012-09-05 01:44:26 +0400 |
---|---|---|
committer | JulienMoumne <julien@piwik.org> | 2012-09-05 01:44:26 +0400 |
commit | 7c4c6dde27bac0b452f0f7720c2235dace6f7031 (patch) | |
tree | cdfa8a52fa16c5f83c9e22091d754b5f35baa3a7 /core/ReportRenderer.php | |
parent | 61cf7ee40cbe4aa68f4268738d5d7a5e4b0426fb (diff) |
refs #3013
* plot multiple metrics using $columns (renamed from $column)
* plot row evolutions using optional $labels, will plot top 5 labels when omitted
* imageGraphEvolutionUrl added to report metadata (only for reports without constant row count and Referers.getRefererType)
* $showMetricTitle renamed to $showLegend
refs #3014
* new report parameter 'Show Historical Graphs for the top 5 values'
* better looking evolution graph on landcape pages
refs #3158
* $label is now optional, will return top N=filter_limit row evolutions sorted with filter_sort_column when omitted
* support for $idGoal
* integration tests updated
constantRowsCount set on
* Goals_getDaysToConversion
* Goals_getVisitsUntilConversion
* Referers_getRefererType
merges
* r6874
IDEA
* in Piwik UI, add a link 'display top 10 row evolutions' using API.getRowEvolution &label=false&filter_sort_column=xyz&filter_limit=10
TODO
* fix scheduled report integration tests
* review @reviews
git-svn-id: http://dev.piwik.org/svn/trunk@6918 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/ReportRenderer.php')
-rw-r--r-- | core/ReportRenderer.php | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index a4072255aa..192a7c8a6d 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -35,8 +35,6 @@ abstract class Piwik_ReportRenderer self::HTML_FORMAT, ); - protected $renderImageInline = false; - /** * Return the ReportRenderer associated to the renderer type $rendererType * @@ -66,18 +64,6 @@ abstract class Piwik_ReportRenderer } /** - * Currently only used for HTML reports. - * When sent by mail, images are attached to the mail: renderImageInline = false - * When downloaded, images are included base64 encoded in the report body: renderImageInline = true - * - * @param boolean $renderImageInline - */ - public function setRenderImageInline($renderImageInline) - { - $this->renderImageInline = $renderImageInline; - } - - /** * Initialize locale settings. * If not called, locale settings defaults to 'en' * @@ -234,7 +220,14 @@ abstract class Piwik_ReportRenderer ); } - public static function getStaticGraph($imageGraphUrl, $width, $height) { + public static function getStaticGraph($reportMetadata, $width, $height, $evolution) { + + $imageGraphUrl = $reportMetadata['imageGraphUrl']; + + if($evolution && !empty($reportMetadata['imageGraphEvolutionUrl'])) + { + $imageGraphUrl = $reportMetadata['imageGraphEvolutionUrl']; + } $request = new Piwik_API_Request( $imageGraphUrl . |