diff --git a/core/Archive.php b/core/Archive.php
index d711624cdebf97ff9bd4332dd4f805ed4240a7d1..ed88f6adcd032364c8ef7582bd2935d78e34d87e 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -969,13 +969,6 @@ class Piwik_Archive
) {
$report = 'VisitsSummary_CoreMetrics';
}
- // VisitFrequency metrics don't follow the same naming convention (HACK)
- else if(strpos($report, '_returning') > 0
- // ignore Goal_visitor_returning_1_1_nb_conversions
- && strpos($report, 'Goal_') === false
- ) {
- $report = 'VisitFrequency_Metrics';
- }
// Goal_* metrics are processed by the Goals plugin (HACK)
else if(strpos($report, 'Goal_') === 0) {
$report = 'Goals_Metrics';
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index 18942f70c12e360ddf06bd69d48a5b0cb7a65d93..4f517ba1bdde103a942ee67a0e65962716995050 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -50,6 +50,15 @@ class Piwik_DataTable_Filter_ReplaceColumnNames extends Piwik_DataTable_Filter
* @param Piwik_DataTable $table
*/
public function filter($table)
+ {
+ if($table instanceof Piwik_DataTable_Simple) {
+ $this->filterSimple($table);
+ } else {
+ $this->filterTable($table);
+ }
+ }
+
+ protected function filterTable($table)
{
foreach ($table->getRows() as $key => $row) {
$oldColumns = $row->getColumns();
@@ -59,6 +68,30 @@ class Piwik_DataTable_Filter_ReplaceColumnNames extends Piwik_DataTable_Filter
}
}
+ protected function filterSimple(Piwik_DataTable_Simple $table)
+ {
+ foreach ($table->getRows() as $row) {
+ $columns = array_keys( $row->getColumns() );
+ foreach($columns as $column) {
+ $newName = $this->getRenamedColumn($column);
+ if($newName) {
+ $row->renameColumn($column, $newName);
+ }
+ }
+ }
+ }
+
+ protected function getRenamedColumn($column)
+ {
+ $newName = false;
+ if (isset($this->mappingToApply[$column])
+ && $this->mappingToApply[$column] != $column
+ ) {
+ $newName = $this->mappingToApply[$column];
+ }
+ return $newName;
+ }
+
/**
* Checks the given columns and renames them if required
*
@@ -69,36 +102,46 @@ class Piwik_DataTable_Filter_ReplaceColumnNames extends Piwik_DataTable_Filter
{
$newColumns = array();
foreach ($columns as $columnName => $columnValue) {
- if (isset($this->mappingToApply[$columnName])) {
- $columnName = $this->mappingToApply[$columnName];
-
- if ($columnName == 'goals') {
- $newSubColumns = array();
- foreach ($columnValue as $idGoal => $goalValues) {
- $mapping = Piwik_Archive::$mappingFromIdToNameGoal;
- if ($idGoal == Piwik_Tracker_GoalManager::IDGOAL_CART) {
- $idGoal = Piwik_Archive::LABEL_ECOMMERCE_CART;
- } elseif ($idGoal == Piwik_Tracker_GoalManager::IDGOAL_ORDER) {
- $idGoal = Piwik_Archive::LABEL_ECOMMERCE_ORDER;
- }
- foreach ($goalValues as $id => $goalValue) {
- $subColumnName = $mapping[$id];
- $newSubColumns['idgoal=' . $idGoal][$subColumnName] = $goalValue;
- }
- }
- $columnValue = $newSubColumns;
+ $renamedColumn = $this->getRenamedColumn($columnName);
+ if ($renamedColumn) {
+ if ($renamedColumn == 'goals') {
+ $columnValue = $this->flattenGoalColumns($columnValue);
}
// If we happen to rename a column to a name that already exists,
// sum both values in the column. This should really not happen, but
// we introduced in 1.1 a new dataTable indexing scheme for Actions table, and
// could end up with both strings and their int indexes counterpart in a monthly/yearly dataTable
// built from DataTable with both formats
- if (isset($newColumns[$columnName])) {
- $columnValue += $newColumns[$columnName];
+ if (isset($newColumns[$renamedColumn])) {
+ $columnValue += $newColumns[$renamedColumn];
}
+
+ $columnName = $renamedColumn;
}
$newColumns[$columnName] = $columnValue;
}
return $newColumns;
}
+
+ /**
+ * @param $columnValue
+ * @return array
+ */
+ protected function flattenGoalColumns($columnValue)
+ {
+ $newSubColumns = array();
+ foreach ($columnValue as $idGoal => $goalValues) {
+ $mapping = Piwik_Archive::$mappingFromIdToNameGoal;
+ if ($idGoal == Piwik_Tracker_GoalManager::IDGOAL_CART) {
+ $idGoal = Piwik_Archive::LABEL_ECOMMERCE_CART;
+ } elseif ($idGoal == Piwik_Tracker_GoalManager::IDGOAL_ORDER) {
+ $idGoal = Piwik_Archive::LABEL_ECOMMERCE_ORDER;
+ }
+ foreach ($goalValues as $id => $goalValue) {
+ $subColumnName = $mapping[$id];
+ $newSubColumns['idgoal=' . $idGoal][$subColumnName] = $goalValue;
+ }
+ }
+ return $newSubColumns;
+ }
}
diff --git a/core/Segment.php b/core/Segment.php
index af57fe59a9a3f9dff0fef282b0955672f632f840..ce37845e88a9578f96b5aa8d1c4fdf7f6cd93ff2 100644
--- a/core/Segment.php
+++ b/core/Segment.php
@@ -80,7 +80,6 @@ class Piwik_Segment
}
protected $availableSegments = array();
- protected $segmentsHumanReadable = '';
protected function getCleanedExpression($expression)
{
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index d712b678311558eb409efa41b46fd52cfb0d92bd..986489f8eb219ee2936766e1c079ab3017022641 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -15,8 +15,10 @@
*/
class Piwik_VisitFrequency_API
{
- static private $instance = null;
+ const RETURNING_VISITOR_SEGMENT = "visitorType==returning";
+ const COLUMN_SUFFIX = "_returning";
+ static private $instance = null;
static public function getInstance()
{
if (self::$instance == null) {
@@ -27,113 +29,48 @@ class Piwik_VisitFrequency_API
public function get($idSite, $period, $date, $segment = false, $columns = false)
{
- Piwik::checkUserHasViewAccess($idSite);
- $archive = Piwik_Archive::build($idSite, $period, $date, $segment);
-
- // array values are comma separated
- $columns = Piwik::getArrayFromApiParameter($columns);
- $tempColumns = array();
-
- $bounceRateReturningRequested = $averageVisitDurationReturningRequested = $actionsPerVisitReturningRequested = false;
- if (!empty($columns)) {
- // make sure base metrics are there for processed metrics
- if (false !== ($bounceRateReturningRequested = array_search('bounce_rate_returning', $columns))) {
- if (!in_array('nb_visits_returning', $columns)) $tempColumns[] = 'nb_visits_returning';
- if (!in_array('bounce_count_returning', $columns)) $tempColumns[] = 'bounce_count_returning';
- unset($columns[$bounceRateReturningRequested]);
- }
- if (false !== ($actionsPerVisitReturningRequested = array_search('nb_actions_per_visit_returning', $columns))) {
- if (!in_array('nb_actions_returning', $columns)) $tempColumns[] = 'nb_actions_returning';
- if (!in_array('nb_visits_returning', $columns)) $tempColumns[] = 'nb_visits_returning';
- unset($columns[$actionsPerVisitReturningRequested]);
- }
- if (false !== ($averageVisitDurationReturningRequested = array_search('avg_time_on_site_returning', $columns))) {
- if (!in_array('sum_visit_length_returning', $columns)) $tempColumns[] = 'sum_visit_length_returning';
- if (!in_array('nb_visits_returning', $columns)) $tempColumns[] = 'nb_visits_returning';
- unset($columns[$averageVisitDurationReturningRequested]);
- }
-
- $tempColumns = array_unique($tempColumns);
- $columns = array_merge($columns, $tempColumns);
- } else {
- $bounceRateReturningRequested = $averageVisitDurationReturningRequested = $actionsPerVisitReturningRequested = true;
- $columns = array(
- 'nb_visits_returning',
- 'nb_actions_returning',
- 'max_actions_returning',
- 'sum_visit_length_returning',
- 'bounce_count_returning',
- 'nb_visits_converted_returning',
- );
-
- if ($period == 'day') {
- $columns = array_merge(array('nb_uniq_visitors_returning'), $columns);
- }
- }
- $dataTable = $archive->getDataTableFromNumeric($columns);
-
- // Process ratio metrics
- if ($bounceRateReturningRequested !== false) {
- $dataTable->filter('ColumnCallbackAddColumnPercentage', array('bounce_rate_returning', 'bounce_count_returning', 'nb_visits_returning', 0));
- }
- if ($actionsPerVisitReturningRequested !== false) {
- $dataTable->filter('ColumnCallbackAddColumnQuotient', array('nb_actions_per_visit_returning', 'nb_actions_returning', 'nb_visits_returning', 1));
- }
- if ($averageVisitDurationReturningRequested !== false) {
- $dataTable->filter('ColumnCallbackAddColumnQuotient', array('avg_time_on_site_returning', 'sum_visit_length_returning', 'nb_visits_returning', 0));
- }
-
- // remove temporary metrics that were used to compute processed metrics
- $dataTable->deleteColumns($tempColumns);
-
- return $dataTable;
+ $segment = $this->appendReturningVisitorSegment($segment);
+
+ $this->unprefixColumns($columns);
+ $params = array(
+ 'idSite' => $idSite,
+ 'period' => $period,
+ 'date' => $date,
+ 'segment' => $segment,
+ 'columns' => implode(',', $columns),
+ 'format' => 'original',
+ 'serialize' => 0 // tests set this to 1
+ );
+ $table = Piwik_API_Request::processRequest('VisitsSummary.get', $params);
+ $this->prefixColumns($table, $period);
+ return $table;
}
- protected function getNumeric($idSite, $period, $date, $toFetch)
+ protected function appendReturningVisitorSegment($segment)
{
- Piwik::checkUserHasViewAccess($idSite);
- $archive = Piwik_Archive::build($idSite, $period, $date);
- $dataTable = $archive->getNumeric($toFetch);
- return $dataTable;
- }
-
- /**
- * @ignore
- */
- public function getVisitsReturning($idSite, $period, $date)
- {
- return $this->getNumeric($idSite, $period, $date, 'nb_visits_returning');
- }
-
- /**
- * @ignore
- */
- public function getActionsReturning($idSite, $period, $date)
- {
- return $this->getNumeric($idSite, $period, $date, 'nb_actions_returning');
- }
-
- /**
- * @ignore
- */
- public function getSumVisitsLengthReturning($idSite, $period, $date)
- {
- return $this->getNumeric($idSite, $period, $date, 'sum_visit_length_returning');
+ if (empty($segment)) {
+ $segment = '';
+ } else {
+ $segment .= Piwik_SegmentExpression::AND_DELIMITER;
+ }
+ $segment .= self::RETURNING_VISITOR_SEGMENT;
+ return $segment;
}
- /**
- * @ignore
- */
- public function getBounceCountReturning($idSite, $period, $date)
+ protected function unprefixColumns(&$columns)
{
- return $this->getNumeric($idSite, $period, $date, 'bounce_count_returning');
+ $columns = Piwik::getArrayFromApiParameter($columns);
+ foreach ($columns as &$column) {
+ $column = str_replace(self::COLUMN_SUFFIX, "", $column);
+ }
}
- /**
- * @ignore
- */
- public function getConvertedVisitsReturning($idSite, $period, $date)
+ protected function prefixColumns($table, $period)
{
- return $this->getNumeric($idSite, $period, $date, 'nb_visits_converted_returning');
+ $rename = array();
+ foreach (Piwik_VisitsSummary_API::getInstance()->getColumns($period) as $oldColumn) {
+ $rename[$oldColumn] = $oldColumn . self::COLUMN_SUFFIX;
+ }
+ $table->filter('ReplaceColumnNames', array($rename));
}
}
diff --git a/plugins/VisitFrequency/Archiver.php b/plugins/VisitFrequency/Archiver.php
deleted file mode 100644
index 2ebb4dc5c4f99998385735c1cd821732b6fc454f..0000000000000000000000000000000000000000
--- a/plugins/VisitFrequency/Archiver.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- * @category Piwik_Plugins
- * @package Piwik_UserSettings
- */
-
-class Piwik_VisitFrequency_Archiver extends Piwik_PluginsArchiver
-{
- // OMG THIS IS SO WRONG!
- // use segment instead
- public function archiveDay()
- {
- $select = "count(distinct log_visit.idvisitor) as nb_uniq_visitors_returning,
- count(*) as nb_visits_returning,
- sum(log_visit.visit_total_actions) as nb_actions_returning,
- max(log_visit.visit_total_actions) as max_actions_returning,
- sum(log_visit.visit_total_time) as sum_visit_length_returning,
- sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as bounce_count_returning,
- sum(case log_visit.visit_goal_converted when 1 then 1 else 0 end) as nb_visits_converted_returning";
-
- $from = "log_visit";
-
- $where = "log_visit.visit_last_action_time >= ?
- AND log_visit.visit_last_action_time <= ?
- AND log_visit.idsite = ?
- AND log_visit.visitor_returning >= 1";
-
- $bind = array($this->getProcessor()->getStartDatetimeUTC(),
- $this->getProcessor()->getEndDatetimeUTC(), $this->getProcessor()->idsite);
-
- $query = $this->getProcessor()->getSegment()->getSelectQuery($select, $from, $where, $bind);
-
- $row = $this->getProcessor()->db->fetchRow($query['sql'], $query['bind']);
-
- if ($row === false || $row === null) {
- $row['nb_visits_returning'] = 0;
- $row['nb_actions_returning'] = 0;
- $row['max_actions_returning'] = 0;
- $row['sum_visit_length_returning'] = 0;
- $row['bounce_count_returning'] = 0;
- $row['nb_visits_converted_returning'] = 0;
- }
-
- foreach ($row as $name => $value) {
- $this->getProcessor()->insertNumericRecord($name, $value);
- }
- }
-
- public function archivePeriod()
- {
- $numericToSum = array(
- 'nb_visits_returning',
- 'nb_actions_returning',
- 'sum_visit_length_returning',
- 'bounce_count_returning',
- 'nb_visits_converted_returning',
- );
- $this->getProcessor()->archiveNumericValuesSum($numericToSum);
- $this->getProcessor()->archiveNumericValuesMax('max_actions_returning');
- }
-}
\ No newline at end of file
diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php
index d2df343de0afdc8595a99239d9d6418691baada5..717e3f8eae4f2405ed81ddb1563034d9565f5421 100644
--- a/plugins/VisitFrequency/VisitFrequency.php
+++ b/plugins/VisitFrequency/VisitFrequency.php
@@ -29,8 +29,6 @@ class Piwik_VisitFrequency extends Piwik_Plugin
function getListHooksRegistered()
{
$hooks = array(
- 'ArchiveProcessing_Day.compute' => 'archiveDay',
- 'ArchiveProcessing_Period.compute' => 'archivePeriod',
'WidgetsList.add' => 'addWidgets',
'Menu.add' => 'addMenu',
'API.getReportMetadata' => 'getReportMetadata',
@@ -77,26 +75,5 @@ class Piwik_VisitFrequency extends Piwik_Plugin
{
Piwik_AddMenu('General_Visitors', 'VisitFrequency_SubmenuFrequency', array('module' => 'VisitFrequency', 'action' => 'index'));
}
-
- function archiveDay($notification)
- {
- $archiveProcessing = $notification->getNotificationObject();
-
- $archiving = new Piwik_VisitFrequency_Archiver($archiveProcessing);
- if($archiving->shouldArchive()) {
- $archiving->archiveDay();
- }
- }
-
- function archivePeriod($notification)
- {
- $archiveProcessing = $notification->getNotificationObject();
-
- $archiving = new Piwik_VisitFrequency_Archiver($archiveProcessing);
- if($archiving->shouldArchive()) {
- $archiving->archivePeriod();
- }
- }
-
}
diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php
index 8008671d9b4cc7e389dc2020741028689e47fd5f..59e7e348c14785348de147743334ea072cd5eaf8 100644
--- a/plugins/VisitorInterest/Archiver.php
+++ b/plugins/VisitorInterest/Archiver.php
@@ -12,6 +12,10 @@
class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
{
// third element is unit (s for seconds, default is munutes)
+ const TIME_SPENT_RECORD_NAME = 'VisitorInterest_timeGap';
+ const PAGES_VIEWED_RECORD_NAME = 'VisitorInterest_pageGap';
+ const BY_VISIT_COUNT_RECORD_NAME = 'VisitorInterest_visitsByVisitCount';
+ const DAYS_SINCE_LAST_RECORD_NAME = 'VisitorInterest_daysSinceLastVisit';
protected static $timeGap = array(
array(0, 10, 's'),
array(11, 30, 's'),
@@ -24,7 +28,6 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
array(15, 30),
array(30)
);
-
protected static $pageGap = array(
array(1, 1),
array(2, 2),
@@ -37,7 +40,6 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
array(15, 20),
array(20)
);
-
/**
* The set of ranges used when calculating the 'visitors who visited at least N times' report.
*/
@@ -57,7 +59,6 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
array(101, 200),
array(200)
);
-
/**
* The set of ranges used when calculating the 'days since last visit' report.
*/
@@ -80,7 +81,7 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
public function archiveDay()
{
-// these prefixes are prepended to the 'SELECT as' parts of each SELECT expression. detecting
+ // these prefixes are prepended to the 'SELECT as' parts of each SELECT expression. detecting
// these prefixes allows us to get all the data in one query.
$timeGapPrefix = 'tg';
$pageGapPrefix = 'pg';
@@ -113,34 +114,19 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
// select data for every report
$row = $this->getProcessor()->queryVisitsSimple(implode(',', $selects));
- // archive visits by total time report
- $recordName = 'VisitorInterest_timeGap';
- $this->archiveRangeStats($recordName, $row, Piwik_Archive::INDEX_NB_VISITS, $timeGapPrefix);
-
- // archive visits by total actions report
- $recordName = 'VisitorInterest_pageGap';
- $this->archiveRangeStats($recordName, $row, Piwik_Archive::INDEX_NB_VISITS, $pageGapPrefix);
-
- // archive visits by visit number report
- $recordName = 'VisitorInterest_visitsByVisitCount';
- $this->archiveRangeStats($recordName, $row, Piwik_Archive::INDEX_NB_VISITS, $visitsByVisitNumPrefix);
-
- // archive days since last visit report
- $recordName = 'VisitorInterest_daysSinceLastVisit';
- $this->archiveRangeStats($recordName, $row, Piwik_Archive::INDEX_NB_VISITS, $daysSinceLastVisitPrefix);
- }
-
- public function archivePeriod()
- {
- $dataTableToSum = array(
- 'VisitorInterest_timeGap',
- 'VisitorInterest_pageGap',
- 'VisitorInterest_visitsByVisitCount',
- 'VisitorInterest_daysSinceLastVisit'
+ $prefixes = array(
+ self::TIME_SPENT_RECORD_NAME => $timeGapPrefix,
+ self::PAGES_VIEWED_RECORD_NAME => $pageGapPrefix,
+ self::BY_VISIT_COUNT_RECORD_NAME => $visitsByVisitNumPrefix,
+ self::DAYS_SINCE_LAST_RECORD_NAME => $daysSinceLastVisitPrefix,
);
- $this->getProcessor()->archiveDataTable($dataTableToSum);
- }
+ foreach($prefixes as $recordName => $selectAsPrefix) {
+ $processor = $this->getProcessor();
+ $dataTable = $processor->getSimpleDataTableFromRow($row, Piwik_Archive::INDEX_NB_VISITS, $selectAsPrefix);
+ $processor->insertBlobRecord($recordName, $dataTable->getSerialized());
+ }
+ }
/**
* Transforms and returns the set of ranges used to calculate the 'visits by total time'
@@ -162,21 +148,14 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver
return $secondsGap;
}
- /**
- * Creates and archives a DataTable from some (or all) elements of a supplied database
- * row.
- *
- * @param string $recordName The record name to use when inserting the new archive.
- * @param array $row The database row to use.
- * @param string $selectAsPrefix The string to look for as the prefix of SELECT as
- * expressions. Elements in $row that have a SELECT as
- * with this string as a prefix are used in creating
- * the DataTable.'
- */
- protected function archiveRangeStats($recordName, $row, $index, $selectAsPrefix)
+ public function archivePeriod()
{
- $dataTable = $this->getProcessor()->getSimpleDataTableFromRow($row, $index, $selectAsPrefix);
-
- $this->getProcessor()->insertBlobRecord($recordName, $dataTable->getSerialized());
+ $dataTableToSum = array(
+ self::TIME_SPENT_RECORD_NAME,
+ self::PAGES_VIEWED_RECORD_NAME,
+ self::BY_VISIT_COUNT_RECORD_NAME,
+ self::DAYS_SINCE_LAST_RECORD_NAME
+ );
+ $this->getProcessor()->archiveDataTable($dataTableToSum);
}
}
\ No newline at end of file
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 9221d941bdd0e6deeb03f5239e258ffc666caa33..3205edaf61ad88dc0be56d2d8e98787c1808c2dd 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -62,19 +62,7 @@ class Piwik_VisitsSummary_API
$columns = array_merge($columns, $tempColumns);
} else {
$bounceRateRequested = $actionsPerVisitRequested = $averageVisitDurationRequested = true;
- $columns = array(
- 'nb_visits',
- 'nb_actions',
- 'nb_visits_converted',
- 'bounce_count',
- 'sum_visit_length',
- 'max_actions'
- );
- if (Piwik::isUniqueVisitorsEnabled($period)) {
- $columns = array_merge(array('nb_uniq_visitors'), $columns);
- }
- // Force reindex from 0 to N otherwise the SQL bind will fail
- $columns = array_values($columns);
+ $columns = $this->getCoreColumns($period);
}
$dataTable = $archive->getDataTableFromNumeric($columns);
@@ -96,6 +84,33 @@ class Piwik_VisitsSummary_API
return $dataTable;
}
+ /**
+ * @ignore
+ */
+ public function getColumns($period)
+ {
+ $columns = $this->getCoreColumns($period);
+ $columns = array_merge($columns, array('bounce_rate', 'nb_actions_per_visit', 'avg_time_on_site'));
+ return $columns;
+ }
+
+ protected function getCoreColumns($period)
+ {
+ $columns = array(
+ 'nb_visits',
+ 'nb_actions',
+ 'nb_visits_converted',
+ 'bounce_count',
+ 'sum_visit_length',
+ 'max_actions'
+ );
+ if (Piwik::isUniqueVisitorsEnabled($period)) {
+ $columns = array_merge(array('nb_uniq_visitors'), $columns);
+ }
+ $columns = array_values($columns);
+ return $columns;
+ }
+
protected function getNumeric($idSite, $period, $date, $segment, $toFetch)
{
Piwik::checkUserHasViewAccess($idSite);
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 73d27dd2b7ec9a23cfe7ffd9ddede1d380c3d972..febd0b7d2f7593689f811236371361aacba3aa08 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -2,10 +2,10 @@
<result>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
- <nb_pageviews>25</nb_pageviews>
- <revenue>120</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
+ <nb_pageviews>25</nb_pageviews>
+ <revenue>120</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
index 136fde341587857eb49cc3a4c1c4b1e4d46a9944..eb4e37fdf7072fe332af6b247514a276d3b240e8 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <max_actions_returning>1</max_actions_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
- <bounce_count_returning>1</bounce_count_returning>
<nb_visits_converted_returning>1</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
index 73ac235db9b5f7fdc1c9282bd4385b29887f22df..b76e6ee906d6a7f0583a9c66071181d078d66faf 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
@@ -2,10 +2,10 @@
<result>
<nb_visits>2</nb_visits>
<nb_actions>8</nb_actions>
- <nb_pageviews>4</nb_pageviews>
- <revenue>43</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
+ <nb_pageviews>4</nb_pageviews>
+ <revenue>43</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
index cbc90ba42f38b18121a0c9b69f08a36bace29278..eb4e37fdf7072fe332af6b247514a276d3b240e8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml
@@ -3,10 +3,10 @@
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <max_actions_returning>1</max_actions_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
- <bounce_count_returning>1</bounce_count_returning>
<nb_visits_converted_returning>1</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
index aff956dc4c4e0aa8cbc781a66879eace13ec4964..47e5c412527561c20448a4dc33ac2ccdec3b3f95 100755
Binary files a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv and b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
index cbc90ba42f38b18121a0c9b69f08a36bace29278..eb4e37fdf7072fe332af6b247514a276d3b240e8 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml
@@ -3,10 +3,10 @@
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>1</nb_actions_returning>
- <max_actions_returning>1</max_actions_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
- <bounce_count_returning>1</bounce_count_returning>
<nb_visits_converted_returning>1</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index a5a307b7063ea9ad24160ccc2d95730bfc9ae82f..014e3278853835d670dbb926ac970d1c8cd08a73 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
@@ -7,10 +7,10 @@
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index fe8d7166c8fecace3ac95bda03421cf27d149859..bbeba2449644c0e12eca37ab54cf3baf1fcadb59 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
@@ -2,12 +2,13 @@
<results>
<result idSite="1">
<result date="2010-01">
+ <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index a34b5c88f0ced307792534b1300002d0e7474048..513327a3b59cfcb33e753660e425117a060f8079 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
@@ -3,12 +3,13 @@
<result idSite="1">
<result date="From 2009-12-28 to 2010-01-03" />
<result date="From 2010-01-04 to 2010-01-10">
+ <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
index 85c2b048ab78b9407a50043745156ff2147dccfe..c8eb30c98b76fa497df34cf4b16c58d2a927f306 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
@@ -4,10 +4,10 @@
<result date="2010">
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
index 99df3c9513a3f3749e6b861ffa5c43d6d66f1aca..d74c730160d79150f6c9869fcbaf9c55dd0bdfe7 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
@@ -6,10 +6,10 @@
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
index 9ffb889bca0de2b8062a62579d035b02198fa129..233cc7df79c11fa8314c58c01d0cafbc4b276463 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2010-01">
+ <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
index a4059459f221274d20af27fd3ec32735b54048d2..0b401287ad88d849d7edcdc50f9f7346aaed07fd 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
@@ -2,12 +2,13 @@
<results>
<result date="From 2009-12-28 to 2010-01-03" />
<result date="From 2010-01-04 to 2010-01-10">
+ <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
index 4e65e0053ad1bacfc0b75dcd50f39990a627052e..756c586942e85dbd669902c24fb59d0e8cc771fb 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
@@ -3,10 +3,10 @@
<result date="2010">
<nb_visits_returning>1</nb_visits_returning>
<nb_actions_returning>5</nb_actions_returning>
- <max_actions_returning>5</max_actions_returning>
- <sum_visit_length_returning>901</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <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>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
index d1dedfec4d66628c003ca9aff9be03ba86841825..63e040aca09169ab275634265fd406a287271a2d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
@@ -3601,7 +3601,7 @@ width="700"/>
<tbody>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Returning Visits
+Unique returning visitors
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1
@@ -3609,42 +3609,42 @@ Returning Visits
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Actions by Returning Visits
+Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-5
+1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Bounce Rate for Returning Visits
+Actions by Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-0%
+5
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Actions per Returning Visit
+Bounce Rate for Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-5
+0%
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Duration of a Returning Visit (in sec)
+Avg. Actions per Returning Visit
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-00:15:01
+5
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Unique returning visitors
+Avg. Duration of a Returning Visit (in sec)
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-0
+00:15:01
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
index 206709a758b01f12c183e53eafb2aa94f1100147..1abca8b9f385998d34b26251a3b57dda1543b6ea 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
@@ -3426,7 +3426,7 @@ Returning Visits
<tbody>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Returning Visits
+Unique returning visitors
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1
@@ -3434,42 +3434,42 @@ Returning Visits
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Actions by Returning Visits
+Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-5
+1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Bounce Rate for Returning Visits
+Actions by Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-0%
+5
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Actions per Returning Visit
+Bounce Rate for Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-5
+0%
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Duration of a Returning Visit (in sec)
+Avg. Actions per Returning Visit
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-00:15:01
+5
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Unique returning visitors
+Avg. Duration of a Returning Visit (in sec)
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-0
+00:15:01
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf
index 3f5f68cde79bdbb400594b79397a82e8705a0913..3cc8a3fbd057b1d37249e64afc7be04387f0c925 100644
Binary files a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf and b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf differ
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
index 4225995fd09f2f7a7f4518fc8ad4767c3b8b30cf..3ea13e548d50bd71558e0aec72b1ab681489ab52 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
@@ -5572,7 +5572,7 @@ Returning Visits
</h2>
<img
alt=""
-src="data:image/png;base64,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"
+src="data:image/png;base64,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"
height="200"
width="700"/>
<br/>
@@ -5589,50 +5589,50 @@ width="700"/>
<tbody>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Returning Visits
+Unique returning visitors
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-4
+1
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Actions by Returning Visits
+Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-12
+1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Bounce Rate for Returning Visits
+Actions by Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-25%
+6
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Actions per Returning Visit
+Bounce Rate for Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-3
+0%
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Duration of a Returning Visit (in sec)
+Avg. Actions per Returning Visit
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-00:25:32
+6
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Unique returning visitors
+Avg. Duration of a Returning Visit (in sec)
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-0
+01:06:01
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
index 18e6a6f01abb2cf0fc616fef6c18096a276a663f..c4e10f7ff62f10a9332565041e92f35f0fca56fa 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
@@ -5323,50 +5323,50 @@ Returning Visits
<tbody>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Returning Visits
+Unique returning visitors
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-4
+1
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Actions by Returning Visits
+Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-12
+1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Bounce Rate for Returning Visits
+Actions by Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-25%
+6
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Actions per Returning Visit
+Bounce Rate for Returning Visits
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-3
+0%
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Avg. Duration of a Returning Visit (in sec)
+Avg. Actions per Returning Visit
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-00:25:32
+6
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-Unique returning visitors
+Avg. Duration of a Returning Visit (in sec)
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-0
+01:06:01
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf
index c5c73346eba589b3687ea6ef48eece9b88182ffa..ba1c591b34319ddf4acf76d02c886b90f77c9ccf 100644
Binary files a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf and b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf differ
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
index 12db7d46da53342db17bea6d0b5a8d8b40dcf67c..2c523aeb3e01364ef215e4cb85d5830492765eb1 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
@@ -2,10 +2,10 @@
<result>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
- <nb_pageviews>0</nb_pageviews>
- <revenue>0</revenue>
<visits_evolution>0%</visits_evolution>
<actions_evolution>0%</actions_evolution>
<pageviews_evolution>0%</pageviews_evolution>
<revenue_evolution>0%</revenue_evolution>
+ <nb_pageviews>0</nb_pageviews>
+ <revenue>0</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml
index ef7aae369a25d1b777374ee832a025794ca44c79..5e489a599dc39f2276c33178a77cf9d670a3c7f8 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_noVisit__VisitFrequency.get_day.xml
@@ -3,10 +3,10 @@
<nb_uniq_visitors_returning>0</nb_uniq_visitors_returning>
<nb_visits_returning>0</nb_visits_returning>
<nb_actions_returning>0</nb_actions_returning>
- <max_actions_returning>0</max_actions_returning>
- <sum_visit_length_returning>0</sum_visit_length_returning>
- <bounce_count_returning>0</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <bounce_count_returning>0</bounce_count_returning>
+ <sum_visit_length_returning>0</sum_visit_length_returning>
+ <max_actions_returning>0</max_actions_returning>
<bounce_rate_returning>0%</bounce_rate_returning>
<nb_actions_per_visit_returning>0</nb_actions_per_visit_returning>
<avg_time_on_site_returning>0</avg_time_on_site_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
index 043b3f3150cf047910c30fcdca6f05475684381b..d7c74b8645c90b44cf03608b6a6bb53618d4706f 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitFrequency.get_range.xml
@@ -2,10 +2,10 @@
<result>
<nb_visits_returning>6</nb_visits_returning>
<nb_actions_returning>9</nb_actions_returning>
- <max_actions_returning>2</max_actions_returning>
- <sum_visit_length_returning>1083</sum_visit_length_returning>
- <bounce_count_returning>3</bounce_count_returning>
<nb_visits_converted_returning>0</nb_visits_converted_returning>
+ <bounce_count_returning>3</bounce_count_returning>
+ <sum_visit_length_returning>1083</sum_visit_length_returning>
+ <max_actions_returning>2</max_actions_returning>
<bounce_rate_returning>50%</bounce_rate_returning>
<nb_actions_per_visit_returning>1.5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>181</avg_time_on_site_returning>