diff options
author | mattpiwik <matthieu.aubry@gmail.com> | 2011-10-27 07:42:04 +0400 |
---|---|---|
committer | mattpiwik <matthieu.aubry@gmail.com> | 2011-10-27 07:42:04 +0400 |
commit | d93063bd7322597b80d73b06b835aa466f74da18 (patch) | |
tree | ef1a0ecbc29d8c793a784d6abb14ec8a9c905f32 /core/ReportRenderer.php | |
parent | a04d8c8d6ae0c8cca7e678eb9a332c14e085b6df (diff) |
Fixes #584, #536, #2031 - Kuddos to Benaka akka capedfuzz for this great patch!!! I did a few minor modifications in wording and metadata output
* Add Report "Visits by visit number" under Visitors > Engagement
* Add Report for all Goals (including ecommerce): "Visit until Conversion": number of visits until the conversion occured
* Add Report for all Goals (including ecommerce): "Days until Conversion": days since the first visit
Notes
* These new reports are also in the Metadata API so should be displayed in Piwik Mobile, and can be exported in the Scheduled reports.
* filter_only_idgoal now renamed as idGoal for consistency
* refactored the "Beautify labels" for ranges in generic filters
* refactored archiving code to process multiple reports in one generic SQL query
git-svn-id: http://dev.piwik.org/svn/trunk@5378 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/ReportRenderer.php')
-rw-r--r-- | core/ReportRenderer.php | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php index c04c6bad0d..a407f5f00d 100644 --- a/core/ReportRenderer.php +++ b/core/ReportRenderer.php @@ -140,16 +140,21 @@ abstract class Piwik_ReportRenderer */ protected static function processTableFormat($reportMetadata, $report, $reportColumns) { + $finalReport = $report; if(!isset($reportMetadata['dimension'])) { +// var_dump($report); $simpleReportMetrics = $report->getFirstRow(); - $report = new Piwik_DataTable_Simple(); - foreach($simpleReportMetrics->getColumns() as $metricId => $metric) + if($simpleReportMetrics) { - $newRow = new Piwik_DataTable_Row(); - $report->addRow($newRow); - $newRow->addColumn("label",$reportColumns[$metricId]); - $newRow->addColumn("value",$metric); + $finalReport = new Piwik_DataTable_Simple(); + foreach($simpleReportMetrics->getColumns() as $metricId => $metric) + { + $newRow = new Piwik_DataTable_Row(); + $newRow->addColumn("label", $reportColumns[$metricId]); + $newRow->addColumn("value", $metric); + $finalReport->addRow($newRow); + } } $reportColumns = array('label' => Piwik_Translate('General_Name'), @@ -157,7 +162,7 @@ abstract class Piwik_ReportRenderer } return array( - $report, + $finalReport, $reportColumns ); } |