diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 3514f5a755a4b89322b68e988c92f8b83637c1dd..b2e8bd9aea9ab02c1c38ca98dabc86a54dce9da8 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -226,15 +226,10 @@ class ResponseBuilder
$showColumns = Common::getRequestVar('columns', '', 'string', $this->request); // TODO: note backwards compatibility
}
- if ($hideColumns !== '' || $showColumns !== '') {
- $datatable->filter('ColumnDelete', array($hideColumns, $showColumns));
- }
-
- // TODO: comment
- if (empty($showColumns)
- && !empty($report)
+ if (!empty($hideColumns)
+ || !empty($showColumns)
) {
- $datatable->filter('RemoveTemporaryMetrics', array($report));
+ $datatable->filter('ColumnDelete', array($hideColumns, $showColumns));
}
// apply label filter: only return rows matching the label parameter (more than one if more than one label)
diff --git a/core/DataTable/Filter/ComputeProcessedMetrics.php b/core/DataTable/Filter/ComputeProcessedMetrics.php
index 3a7850321c6eaa95f7bbddbd937d742b52d5b250..d4632123689bc658e4ec80fb34f888766d6376af 100644
--- a/core/DataTable/Filter/ComputeProcessedMetrics.php
+++ b/core/DataTable/Filter/ComputeProcessedMetrics.php
@@ -55,7 +55,10 @@ class ComputeProcessedMetrics extends BaseFilter
/** @var ProcessedMetric $processedMetric */ // TODO: should remove this and if below eventually.
foreach ($processedMetrics as $processedMetric) {
if ($processedMetric instanceof ProcessedMetric) {
- $row->addColumn($processedMetric->getName(), $processedMetric->compute($row));
+ $processedMetricName = $processedMetric->getName();
+ if ($row->getColumn($processedMetricName) === false) {
+ $row->addColumn($processedMetricName, $processedMetric->compute($row));
+ }
}
}
}
diff --git a/core/DataTable/Filter/RemoveTemporaryMetrics.php b/core/DataTable/Filter/RemoveTemporaryMetrics.php
deleted file mode 100644
index fee01099bb27d657f9d4831820c5e67d44759d53..0000000000000000000000000000000000000000
--- a/core/DataTable/Filter/RemoveTemporaryMetrics.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- */
-namespace Piwik\DataTable\Filter;
-
-use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
-use Piwik\Plugin\Metric;
-use Piwik\Plugin\Report;
-
-/**
- * TODO
- */
-class RemoveTemporaryMetrics extends BaseFilter
-{
- /**
- * TODO
- */
- private $report;
-
- /**
- * Constructor.
- *TODO modify
- * @param DataTable $table The table that will be filtered.
- */
- public function __construct($table, Report $report)
- {
- parent::__construct($table);
-
- $this->report = $report;
- }
-
- /**
- * Executes the filter. See {@link RemoveTemporaryMetrics}.
- *
- * @param DataTable $table
- */
- public function filter($table)
- {
- $temporaryMetrics = $this->report->temporaryMetrics;
- if (empty($temporaryMetrics)) {
- return;
- }
-
- foreach ($table->getRows() as $row) {
- foreach ($temporaryMetrics as $temporaryMetric) {
- if (!($temporaryMetric instanceof Metric)) {
- continue;
- }
-
- $row->deleteColumn($temporaryMetric->getName());
- }
- }
- }
-}
\ No newline at end of file
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 071a70a96bb955e37e6da14b59cb3036a453a47c..a24780077dae5f26a27afad2f809e5591e1716b9 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -73,7 +73,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
* @return bool
*/
function Piwik_ShouldPrintBackTraceWithMessage()
- {return true;
+ {
$bool = (defined('PIWIK_PRINT_ERROR_BACKTRACE') && PIWIK_PRINT_ERROR_BACKTRACE)
|| !empty($GLOBALS['PIWIK_TRACKER_DEBUG']);
return $bool;
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 16700d160b5ff69c05f11dec21526524b67a87cb..405d5d7b3a53f2f89308ba579397d2bb3cf5432a 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -383,7 +383,7 @@ class API extends \Piwik\Plugin\API
&& $reportMeta['module'] != 'API'
&& !empty($reportMeta['metrics'])
) {
- $plugin = $reportMeta['module'];echo $plugin . "." . $reportMeta['action']."\n";
+ $plugin = $reportMeta['module'];
foreach ($reportMeta['metrics'] as $column => $columnTranslation) {
// a metric from this report has been requested
if (isset($columnsMap[$column])
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 418ef4a30a1e8da055ab4b49e78414ee0ba76fc7..9be937dd6ee82f7b5475946ce9a91d8d9f2f3194 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -513,7 +513,7 @@ class ProcessedReport
}
}
}
-
+echo print_r($columns, true);
// Display the global Goal metrics
if (isset($reportMetadata['metricsGoal'])) {
$metricsGoalDisplay = array('revenue');
diff --git a/plugins/API/Reports/Get.php b/plugins/API/Reports/Get.php
index 43e913f92094d08a947ee28c541869625eb6406e..f8e7e5280cd9b64b07da4ad781647044d5f827c2 100644
--- a/plugins/API/Reports/Get.php
+++ b/plugins/API/Reports/Get.php
@@ -26,10 +26,9 @@ class Get extends Report
$this->reportsToMerge = $this->getReportsToMerge();
- // TODO
- //$this->category = 'VisitsSummary_VisitsSummary';
+ $this->category = 'API';
$this->name = 'All Metrics'; // TODO: translate
- //$this->documentation = ''; // TODO
+ $this->documentation = ''; // TODO
$this->processedMetrics = array();
foreach ($this->reportsToMerge as $report) {
diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php
index 5db2ebebf6924338dcde483c0fc0141ec12efec9..f1cf21293c755332c4b5a0ff9807d3afd9cc8c30 100644
--- a/plugins/VisitFrequency/Reports/Get.php
+++ b/plugins/VisitFrequency/Reports/Get.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\VisitFrequency\Reports;
use Piwik\Piwik;
+use Piwik\Plugins\VisitFrequency\Metrics\BounceRateReturning;
class Get extends \Piwik\Plugin\Report
{
@@ -18,11 +19,13 @@ class Get extends \Piwik\Plugin\Report
$this->category = 'General_Visitors';
$this->name = Piwik::translate('VisitFrequency_ColumnReturningVisits');
$this->documentation = ''; // TODO
+ $this->processedMetrics = array(
+ new BounceRateReturning()
+ );
$this->metrics = array(
'nb_visits_returning',
'nb_actions_returning',
'avg_time_on_site_returning',
- 'bounce_rate_returning',
'nb_actions_per_visit_returning',
'nb_uniq_visitors_returning',
'sum_visit_length_returning',
@@ -31,7 +34,6 @@ class Get extends \Piwik\Plugin\Report
'sum_visit_length_returning',
'max_actions_returning'
);
- $this->processedMetrics = false;
$this->order = 40;
}
}
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index 47a64bc77890c6dd7c1c1251a71d07867e83116a..93d67eabf36d00ec69a4e08250c0e92dd25559d7 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -9,7 +9,6 @@
namespace Piwik\Plugins\VisitsSummary\Reports;
use Piwik\Piwik;
-use Piwik\Plugins\CoreHome\Metrics\BounceCount;
use Piwik\Plugins\CoreHome\Metrics\BounceRate;
class Get extends \Piwik\Plugin\Report
@@ -23,9 +22,6 @@ class Get extends \Piwik\Plugin\Report
$this->processedMetrics = array(
new BounceRate()
);
- $this->temporaryMetrics = array(
- new BounceCount()
- );
$this->metrics = array(
'nb_uniq_visitors',
'nb_visits',
diff --git a/tests/PHPUnit/Framework/TestRequest/Response.php b/tests/PHPUnit/Framework/TestRequest/Response.php
index 0d73a3f0f42808bd0e5cbaa736515d8c44a7d85d..087a18de1bb5c0c920564967a26d6c08c9596908 100644
--- a/tests/PHPUnit/Framework/TestRequest/Response.php
+++ b/tests/PHPUnit/Framework/TestRequest/Response.php
@@ -77,7 +77,7 @@ class Response
}
// check content size to get quick feedback and avoid lengthy diff
- $checkSizeFirst = array('pdf', 'csv');
+ $checkSizeFirst = array('pdf', 'csv', 'html');
if(!empty($expected->requestUrl['reportFormat'])
&& in_array($expected->requestUrl['reportFormat'], $checkSizeFirst)) {
Asserts::assertEquals(strlen($expectedText), strlen($actualText), $message);
diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
index 644979c27254fc731136bb3942857afc974f7d40..0d6930fba11400010ffcc1ad9125eade5c661b36 100755
--- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
@@ -77,18 +77,17 @@ class OneVisitorTwoVisitsTest extends SystemTestCase
);
foreach ($bulkUrls as &$url) {
$url = urlencode($url);
- }return array(
- array('API.get', array('idSite' => $idSite,
- 'date' => '2009-10-01',
- 'format' => 'csv',
- 'periods' => array('month'),
- 'setDateLastN' => true,
- 'otherRequestParameters' => $enExtraParam,
- 'language' => 'en',
- 'testSuffix' => '_csv'))
- );
+ }
+ return array(
+ array('VisitFrequency.get', array('idSite' => $idSite,
+ 'date' => $dateTime,
+ 'otherRequestParameters' => array(
+ 'hideColumns' => 'nb_users',
+ )
+ ))
+ );
return array(
- array('all', array('idSite' => $idSite,
+ array('VisitFrequency.get', array('idSite' => $idSite,
'date' => $dateTime,
'otherRequestParameters' => array(
'hideColumns' => 'nb_users',
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index c9fd4f04c50fbef6f2e352f39301a1561ab6f3de..0baa4a287e2d94985be9d2d09220785c52510afc 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -62,7 +62,17 @@ class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase
$singlePeriodApi = array('VisitsSummary.get', 'Goals.get');
$periods = array('day', 'week', 'month', 'year');
-
+return array(
+ array(
+ 'API.getProcessedReport', array('idSite' => $idSite1,
+ 'date' => $dateTime,
+ 'periods' => array('day'),
+ 'setDateLastN' => true,
+ 'apiModule' => 'VisitsSummary',
+ 'apiAction' => 'get',
+ 'testSuffix' => '_' . 'VisitsSummary.get' . '_firstSite_lastN')
+ )
+);
$result = array(
// Request data for the last 6 periods and idSite=all
array($apiToCall, array('idSite' => 'all',
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
index eb4e37fdf7072fe332af6b247514a276d3b240e8..c65c3ddf75b7e6e0930dcb2ceff3c154cd85e8ca 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
@@ -7,7 +7,7 @@
<bounce_count_returning>1</bounce_count_returning>
<sum_visit_length_returning>0</sum_visit_length_returning>
<max_actions_returning>1</max_actions_returning>
- <bounce_rate_returning>100%</bounce_rate_returning>
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
<avg_time_on_site_returning>0</avg_time_on_site_returning>
+ <bounce_rate_returning>100%</bounce_rate_returning>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
index 86a07c0d50dfa8c22b2b6cccec391ab39a636d7a..f0bfc6620564ba6b6dc79484984202b13cf49964 100644
Binary files a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
index 296741c7a0a5633b8c0897b9efd4b5cef3502fae..56f6a84ee5c2aea9573be3ad6754e7dc7060125d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_day.xml
@@ -9,9 +9,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>0</avg_time_on_site>
+ <bounce_rate>100%</bounce_rate>
</result>
<result idSite="2" />
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
index 9aa711753b3c57057f1a762cff36b69bb20638a6..a3916d0861e8ed5632d8277c723a47e9bd714f43 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -9,9 +9,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
<avg_time_on_site>757</avg_time_on_site>
+ <bounce_rate>10%</bounce_rate>
</result>
<result idSite="2">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -22,8 +22,8 @@
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
<avg_time_on_site>1</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index 1132f1191d5f38ed94e9c63e0d652cca80c10ca7..2160d449a7ba5a2b45c31c1634e60ee21fa6cc82 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
@@ -12,9 +12,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-06">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -25,9 +25,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-07">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -38,9 +38,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-08">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -51,9 +51,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-09">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -64,9 +64,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
</result>
<result idSite="2">
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index f6da2a541daf81dc742e9c5422cc0dd8d29463bb..bfad12c494977fb9f8a0b25c27cadadee79957fa 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
@@ -10,9 +10,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index d64e929e8a591ce595196b7ff7e9fecca3b4cd31..60aa74b8fafd37185b4d2ec493c7feb6eb2451fd 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
@@ -11,9 +11,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>5406</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="From 2010-01-11 to 2010-01-17">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -24,9 +24,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>1802</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="From 2010-01-18 to 2010-01-24" />
<result date="From 2010-01-25 to 2010-01-31" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
index dd6204a199f34db3a79c3f322fe5e825b22e77f7..2ce3bd4dac8f90f84466ae1af4c3574ed61b8d79 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
@@ -8,9 +8,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2011" />
<result date="2012" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
index c0f0001ebfde98f34cf516c708894e68089417ce..8f92b68e56dc28c14358be73d0793f6c7eeca22b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
@@ -10,9 +10,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>0</avg_time_on_site>
+ <bounce_rate>100%</bounce_rate>
</result>
<result date="2010-01-04">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -23,9 +23,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>361</sum_visit_length>
<max_actions>2</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
<avg_time_on_site>361</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-05">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -36,9 +36,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-06">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -49,9 +49,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-07">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -62,9 +62,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-08">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -75,9 +75,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-09">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -88,9 +88,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
</result>
<result idSite="2">
@@ -104,9 +104,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
<avg_time_on_site>1</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-05" />
<result date="2010-01-06" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
index f760097ff054a8e829d94d9ecf4fb82c1699e526..0546a0636eaa2a9fbeb1c293761fd20ae5c5d8f7 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
@@ -11,9 +11,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-06">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -24,9 +24,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-07">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -37,9 +37,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-08">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -50,9 +50,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-01-09">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -63,8 +63,8 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>901</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
index ddce4b63c94f3e432404f0658085fbd8dcac5e13..f9b578782e114e2523ed0ec44b3fbdaf8bd0d653 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
@@ -9,9 +9,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
index d44fe0f18409b272b0ef901d6bf3c6c65020a886..6a88dc55a0bf0b47b315e0271ed59e642081269b 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
@@ -10,9 +10,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>5406</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="From 2010-01-11 to 2010-01-17">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
@@ -23,9 +23,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>1802</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="From 2010-01-18 to 2010-01-24" />
<result date="From 2010-01-25 to 2010-01-31" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
index a7e7659d804e40dcdfd2fb3084b03e77a9f22dac..8cc27fb8c97f7ed5d34bd3fd2f851d7a5a9ba3ef 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
@@ -7,9 +7,9 @@
<bounce_count_returning>0</bounce_count_returning>
<sum_visit_length_returning>7208</sum_visit_length_returning>
<max_actions_returning>5</max_actions_returning>
- <bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>901</avg_time_on_site_returning>
+ <bounce_rate_returning>0%</bounce_rate_returning>
</result>
<result date="2011" />
<result date="2012" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
index 057ccb1b63b9f53d5e49e3cea9edfd4db1056df4..aa2c71605944de7f7dcf191cc2e9cb6a78c49eac 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
@@ -9,9 +9,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>0</avg_time_on_site>
+ <bounce_rate>100%</bounce_rate>
</result>
<result date="2010-01-04">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -22,9 +22,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>361</sum_visit_length>
<max_actions>2</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
<avg_time_on_site>361</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-05">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -35,9 +35,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-06">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -48,9 +48,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-07">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -61,9 +61,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-08">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -74,9 +74,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-01-09">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -87,8 +87,8 @@
<bounce_count>0</bounce_count>
<sum_visit_length>901</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
</results>
\ No newline at end of file