diff options
43 files changed, 1380 insertions, 24 deletions
diff --git a/core/API/DataTablePostProcessor.php b/core/API/DataTablePostProcessor.php index 61fba56573..601018b447 100644 --- a/core/API/DataTablePostProcessor.php +++ b/core/API/DataTablePostProcessor.php @@ -22,6 +22,7 @@ use Piwik\Plugin\ProcessedMetric; use Piwik\Plugin\Report; use Piwik\Plugin\ReportsProvider; use Piwik\Plugins\API\Filter\DataComparisonFilter; +use Piwik\Plugins\CoreHome\Columns\Metrics\EvolutionMetric; /** * Processes DataTables that should be served through Piwik's APIs. This processing handles @@ -453,6 +454,11 @@ class DataTablePostProcessor $computedValue = $processedMetric->compute($row); if ($computedValue !== false) { $row->addColumn($name, $computedValue); + + // Add a trend column for evolution metrics + if ($processedMetric instanceof EvolutionMetric) { + $row->addColumn($processedMetric->getTrendName(), $processedMetric->getTrendValue($computedValue)); + } } } } diff --git a/core/Archive.php b/core/Archive.php index 6ef1ccb09a..007ca09e53 100644 --- a/core/Archive.php +++ b/core/Archive.php @@ -342,7 +342,7 @@ class Archive implements ArchiveQuery */ public function getDataTableFromNumericAndMergeChildren($names) { - $data = $this->get($names, 'numeric'); + $data = $this->get($names, 'numeric'); $resultIndexes = $this->getResultIndices(); return $data->getMergedDataTable($resultIndexes); } @@ -539,7 +539,7 @@ class Archive implements ArchiveQuery $result->addMetadata($row['idsite'], $periodStr, DataTable::ARCHIVED_DATE_METADATA_NAME, $row['ts_archived']); } - $result->set($row['idsite'], $periodStr, $row['name'], $row['value']); + $result->set($row['idsite'], $periodStr, $row['name'], $row['value'], [DataTable::ARCHIVED_DATE_METADATA_NAME => $row['ts_archived']]); } return $result; diff --git a/core/Archive/DataCollection.php b/core/Archive/DataCollection.php index fa045b056c..8bb93be3ff 100644 --- a/core/Archive/DataCollection.php +++ b/core/Archive/DataCollection.php @@ -147,11 +147,17 @@ class DataCollection * @param string $period eg, '2012-01-01,2012-01-31' * @param string $name eg 'nb_visits' * @param string $value eg 5 + * @param array $meta Optional metadata to add to the row */ - public function set($idSite, $period, $name, $value) + public function set($idSite, $period, $name, $value, array $meta = null) { $row = & $this->get($idSite, $period); $row[$name] = $value; + if ($meta) { + foreach ($meta as $k => $v) { + $row[self::METADATA_CONTAINER_ROW_KEY][$k] = $v; + } + } } /** diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php index 1a373e1e2a..d2c2479448 100644 --- a/core/Archive/DataTableFactory.php +++ b/core/Archive/DataTableFactory.php @@ -575,15 +575,22 @@ class DataTableFactory $this->setPrettySegmentMetadata($table); foreach ($index as $idsite => $row) { + + $meta = array(); + if (isset($row[DataCollection::METADATA_CONTAINER_ROW_KEY])) { + $meta = $row[DataCollection::METADATA_CONTAINER_ROW_KEY]; + } + $meta['idsite'] = $idsite; + if (!empty($row)) { $table->addRow(new Row(array( Row::COLUMNS => $row, - Row::METADATA => array('idsite' => $idsite)) + Row::METADATA => $meta) )); } elseif ($isNumeric) { $table->addRow(new Row(array( Row::COLUMNS => $this->defaultRow, - Row::METADATA => array('idsite' => $idsite)) + Row::METADATA => $meta) )); } } diff --git a/core/DataTable.php b/core/DataTable.php index 6da6fadaa8..8b9291a78e 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -1002,6 +1002,31 @@ class DataTable implements DataTableInterface, \IteratorAggregate, \ArrayAccess } /** + * Delete row metadata by name in every row. + * + * @param $name + * @param bool $deleteRecursiveInSubtables + */ + public function deleteRowsMetadata($name, $deleteRecursiveInSubtables = false) + { + foreach ($this->rows as $row) { + $row->deleteMetadata($name); + + $subTable = $row->getSubtable(); + if ($subTable) { + $subTable->deleteRowsMetadata($name, $deleteRecursiveInSubtables); + } + } + if (!is_null($this->summaryRow)) { + $this->summaryRow->deleteMetadata($name); + } + if (!is_null($this->totalsRow)) { + $this->totalsRow->deleteMetadata($name); + } + + } + + /** * Returns the number of rows in the table including the summary row. * * @return int diff --git a/core/DataTable/DataTableInterface.php b/core/DataTable/DataTableInterface.php index 84440dfa24..7009be7285 100644 --- a/core/DataTable/DataTableInterface.php +++ b/core/DataTable/DataTableInterface.php @@ -27,4 +27,5 @@ interface DataTableInterface public function deleteColumn($name); public function getColumn($name); public function getColumns(); + public function deleteRowsMetadata($name, $deleteRecursiveInSubtables = false); } diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php index 9169a36128..8700d8822d 100644 --- a/core/DataTable/Map.php +++ b/core/DataTable/Map.php @@ -514,6 +514,19 @@ class Map implements DataTableInterface } /** + * Delete row metadata by name in every row. + * + * @param $name + * @param bool $deleteRecursiveInSubtables + */ + public function deleteRowsMetadata($name, $deleteRecursiveInSubtables = false) + { + foreach ($this->getDataTables() as $table) { + $table->deleteRowsMetadata($name, $deleteRecursiveInSubtables); + } + } + + /** * See {@link DataTable::getColumns()}. * * @return array diff --git a/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php b/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php index ab34138b8d..d400396a96 100644 --- a/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php +++ b/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php @@ -9,8 +9,12 @@ namespace Piwik\Plugins\CoreHome\Columns\Metrics; use Piwik\DataTable; +use Piwik\Archive\DataTableFactory; use Piwik\DataTable\Row; +use Piwik\Date; use Piwik\Metrics; +use Piwik\Plugins\SitesManager\API; +use Piwik\Site; use Piwik\Metrics\Formatter; use Piwik\Piwik; use Piwik\Plugin\Metric; @@ -37,6 +41,11 @@ class EvolutionMetric extends ProcessedMetric private $evolutionMetricName; /** + * @var string + */ + private $evolutionMetricTrendName; + + /** * @var int */ private $quotientPrecision; @@ -47,6 +56,11 @@ class EvolutionMetric extends ProcessedMetric private $pastData; /** + * @var DataTable + */ + private $currentData; + + /** * The list of labels leading to the current subtable being processed. Used to get the proper subtable in * $pastData. * @@ -62,17 +76,22 @@ class EvolutionMetric extends ProcessedMetric * @param string|false $evolutionMetricName The name of the evolution processed metric. Defaults to * $wrapped's name with `'_evolution'` appended. * @param int $quotientPrecision The percent's quotient precision. + * @param DataTable|null $currentData The current datatable, optional but required to calculate the proportionate + * evolution values */ - public function __construct($wrapped, DataTable $pastData = null, $evolutionMetricName = false, $quotientPrecision = 0) + public function __construct($wrapped, ?DataTable $pastData = null, $evolutionMetricName = false, $quotientPrecision = 0, + ?DataTable $currentData = null) { $this->wrapped = $wrapped; $this->pastData = $pastData; + $this->currentData = $currentData; if (empty($evolutionMetricName)) { $wrappedName = $this->getWrappedName(); $evolutionMetricName = $wrappedName . '_evolution'; } + $this->evolutionMetricTrendName = $evolutionMetricName . '_trend'; $this->evolutionMetricName = $evolutionMetricName; $this->quotientPrecision = $quotientPrecision; } @@ -82,6 +101,11 @@ class EvolutionMetric extends ProcessedMetric return $this->evolutionMetricName; } + public function getTrendName() + { + return $this->evolutionMetricTrendName; + } + public function getTranslatedName() { if ($this->wrapped instanceof Metric) { @@ -93,6 +117,16 @@ class EvolutionMetric extends ProcessedMetric return Piwik::translate('CoreHome_EvolutionMetricName', [$metricName]); } + public function getTrendValue($computedValue = 0) + { + $isLowerBetter = Metrics::isLowerValueBetter($this->wrapped); + if ($isLowerBetter) { + return ($computedValue < 0 ? 1 : ($computedValue > 0 ? -1 : 0)); + } + + return ($computedValue < 0 ? -1 : ($computedValue > 0 ? 1 : 0)); + } + public function compute(Row $row) { $columnName = $this->getWrappedName(); @@ -101,6 +135,16 @@ class EvolutionMetric extends ProcessedMetric $currentValue = $this->getMetric($row, $columnName); $pastValue = $pastRow ? $this->getMetric($pastRow, $columnName) : 0; + // Reduce past value proportionally to match the percent of the current period which is complete, if applicable + $ratio = self::getRatio($this->currentData, $this->pastData, $row); + $period = $this->pastData->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX); + $row->setMetadata('ratio', $ratio); + $row->setMetadata('currencySymbol', $row['label'] !== DataTable::ID_SUMMARY_ROW ? Site::getCurrencySymbolFor($row['label']) : API::getInstance()->getDefaultCurrency()); + $row->setMetadata('previous_'.$columnName, $pastValue); + $row->setMetadata('periodName', $period->getLabel()); + $row->setMetadata('previousRange', $period->getLocalizedShortString()); + $pastValue = ($pastValue * $ratio); + $dividend = $currentValue - $pastValue; $divisor = $pastValue; @@ -170,4 +214,56 @@ class EvolutionMetric extends ProcessedMetric } return $result; } + + /** + * Calculate the ratio of time between a past period and current incomplete period + * + * eg. if today is Thursday at 12:00pm and the past period is a week then the ratio is 0.5, exactly half of the + * current incomplete period has passed + * + * If the current period end is in the past then the ratio will always be 1, since the current period is complete. + * + * @param DataTable|null $currentData + * @param DataTable|null $pastData + * @param Row $row + * @return float|int + * @throws \Exception + */ + public static function getRatio(?DataTable $currentData, ?DataTable $pastData, Row $row) + { + $ratio = 1; + + if ($currentData != null && $pastData != null) { + + $p = $pastData->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX); + + $pStart = $p->getDateStart()->setTime('00:00:00'); + $pEnd = $p->getDateEnd()->setTime('23:59:59'); + + $c = $currentData->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX); + $cStart = $c->getDateStart()->setTime('00:00:00'); + $cEnd = $c->getDateEnd()->setTime('23:59:59'); + + $nowTS = Date::getNowTimestamp(); + + // If we know the date the the datatable data was generated then use that instead of now + $archivedDateStr = $row->getMetadata(DataTable::ARCHIVED_DATE_METADATA_NAME); + + if ($archivedDateStr) { + $archivedDate = Date::factory($archivedDateStr); + if ($archivedDate) { + $nowTS = Date::factory($archivedDate)->getTimestamp(); + } + } + + if ($cStart->getTimestamp() <= $nowTS && $cEnd->getTimestamp() >= $nowTS) { + $secsInPastPeriod = $pEnd->getTimestamp() - $pStart->getTimestamp(); + $secsInCurrentPeriod = $nowTS - $cStart->getTimestamp(); + $ratio = $secsInCurrentPeriod / $secsInPastPeriod; + } + } + + return round($ratio, 3); + + } }
\ No newline at end of file diff --git a/plugins/CoreHome/tests/Unit/EvolutionMetricTest.php b/plugins/CoreHome/tests/Unit/EvolutionMetricTest.php new file mode 100644 index 0000000000..7ecdb2d046 --- /dev/null +++ b/plugins/CoreHome/tests/Unit/EvolutionMetricTest.php @@ -0,0 +1,63 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link https://matomo.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ + +namespace Piwik\Plugins\CoreHome\tests\Unit; + +use PHPUnit\Framework\TestCase; +use Piwik\DataTable; +use Piwik\Archive\DataCollection; +use Piwik\DataTable\Row; +use Piwik\Date; +use Piwik\Plugins\CoreHome\Columns\Metrics\EvolutionMetric; + +/** + * @group CoreHome + * @group CoreHomeTest + * @group EvolutionMetric + */ +class EvolutionMetricTest extends TestCase +{ + public function test_shouldDoProportionalComparision_ifCurrentPeriodIncomplete() + { + $currentData = new DataTable(); + $cPeriod = new \Piwik\Period\Week(Date::factory('2021-10-10')); + $currentData->setMetadata('period', $cPeriod); + + // If the archived date meta data value exists on the row then it will be used + // as the current date for calculation purposes, we can use this to consistently test the + // ratio calculation by supplying a fixed set of dates that should result in a 0.5 ratio + + $row = new Row(); + $row->setMetadata(DataTable::ARCHIVED_DATE_METADATA_NAME, '2021-10-07 00:00:00'); + + $pastData = new DataTable(); + $sPeriod = new \Piwik\Period\Week(Date::factory('2021-10-03')); + $pastData->setMetadata('period', $sPeriod); + + $ratio = EvolutionMetric::getRatio($currentData, $pastData, $row); + + $this->assertEquals(0.429, $ratio); + } + + public function test_shouldNotDoProportionalComparision_ifCurrentPeriodComplete() + { + $currentData = new DataTable(); + $cPeriod = new \Piwik\Period\Week(Date::factory('2021-10-10')); + $currentData->setMetadata('period', $cPeriod); + + $pastData = new DataTable(); + $sPeriod = new \Piwik\Period\Week(Date::factory('2021-10-03')); + $pastData->setMetadata('period', $sPeriod); + + $ratio = EvolutionMetric::getRatio($currentData, $pastData, new Row()); + + $this->assertEquals(1, $ratio); + } + +} diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index a0e20a470c..097725bd84 100644 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -313,6 +313,12 @@ class API extends \Piwik\Plugin\API ); } + // Remove <ts_archived> row metadata, it's already been used by any filters that needed it + $dataTable->queueFilter(function($dataTable) { + $dataTable->deleteRowsMetadata(DataTable::ARCHIVED_DATE_METADATA_NAME); + $dataTable->deleteColumn('_metadata'); + }); + if ($multipleWebsitesRequested && $dataTable->getRowsCount() === 1 && $dataTable instanceof DataTable\Simple) { $simpleTable = $dataTable; $dataTable = $simpleTable->getEmptyClone(); @@ -358,7 +364,8 @@ class API extends \Piwik\Plugin\API $metricSettings[self::METRIC_RECORD_NAME_KEY], $pastData, $metricSettings[self::METRIC_EVOLUTION_COL_NAME_KEY], - $quotientPrecision = 1 + $quotientPrecision = 1, + $currentData ); } $currentData->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics); diff --git a/plugins/MultiSites/Columns/Metrics/EcommerceOnlyEvolutionMetric.php b/plugins/MultiSites/Columns/Metrics/EcommerceOnlyEvolutionMetric.php index 58718b0101..0a1fa62742 100644 --- a/plugins/MultiSites/Columns/Metrics/EcommerceOnlyEvolutionMetric.php +++ b/plugins/MultiSites/Columns/Metrics/EcommerceOnlyEvolutionMetric.php @@ -22,9 +22,10 @@ class EcommerceOnlyEvolutionMetric extends EvolutionMetric { private $isRevenueEvolution; - public function __construct($wrapped, DataTable $pastData, $evolutionMetricName = false, $quotientPrecision = 0) + public function __construct($wrapped, DataTable $pastData, $evolutionMetricName = false, $quotientPrecision = 0, + ?DataTable $currentData = null) { - parent::__construct($wrapped, $pastData, $evolutionMetricName, $quotientPrecision); + parent::__construct($wrapped, $pastData, $evolutionMetricName, $quotientPrecision, $currentData); $this->isRevenueEvolution = $this->getName() == 'revenue_evolution'; } diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php index f5aa8bb795..27bf465763 100644 --- a/plugins/MultiSites/MultiSites.php +++ b/plugins/MultiSites/MultiSites.php @@ -72,6 +72,12 @@ class MultiSites extends \Piwik\Plugin $translations[] = 'General_Faq'; $translations[] = 'Feedback_CommunityHelp'; $translations[] = 'Feedback_ProfessionalHelp'; + $translations[] = 'MultiSites_EvolutionComparisonIncomplete'; + $translations[] = 'MultiSites_EvolutionComparisonProportional'; + $translations[] = 'MultiSites_EvolutionComparisonDay'; + $translations[] = 'MultiSites_EvolutionComparisonWeek'; + $translations[] = 'MultiSites_EvolutionComparisonMonth'; + $translations[] = 'MultiSites_EvolutionComparisonYear'; } public function getJsFiles(&$jsFiles) diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js index a1f2936e97..32c2f404ca 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js +++ b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js @@ -63,9 +63,57 @@ var allSites = report.sites; angular.forEach(allSites, function (site, index) { - site.visits_evolution = parseInt(site.visits_evolution, 10); - site.pageviews_evolution = parseInt(site.pageviews_evolution, 10); - site.revenue_evolution = parseInt(site.revenue_evolution, 10); + + if (site.hasOwnProperty('ratio') && site.ratio != 1) { + var percent = NumberFormatter.formatPercent(Math.round((site.ratio * 100))); + var metricName = null; + var previousTotal = 0; + var currentTotal = 0; + var evolution = 0; + var previousTotalAdjusted = 0; + if (model.sortColumn == 'nb_visits' || model.sortColumn == 'visits_evolution') { + previousTotal = NumberFormatter.formatNumber(site.previous_nb_visits); + currentTotal = NumberFormatter.formatNumber(site.nb_visits); + evolution = NumberFormatter.formatPercent(site.visits_evolution); + metricName = _pk_translate("General_ColumnNbVisits"); + previousTotalAdjusted = NumberFormatter.formatNumber(Math.round(site.previous_nb_visits * site.ratio)); + } + if (model.sortColumn == 'pageviews_evolution') { + previousTotal = site.previous_Actions_nb_pageviews; + currentTotal = site.nb_pageviews; + evolution = NumberFormatter.formatPercent(site.pageviews_evolution); + metricName = _pk_translate("General_ColumnPageviews"); + previousTotalAdjusted = NumberFormatter.formatNumber(Math.round(site.previous_Actions_nb_pageviews * site.ratio)); + } + if (model.sortColumn == 'revenue_evolution') { + previousTotal = NumberFormatter.formatCurrency(site.previous_Goal_revenue, site.currencySymbol); + currentTotal = NumberFormatter.formatCurrency(site.revenue, site.currencySymbol); + evolution = NumberFormatter.formatPercent(site.revenue_evolution); + metricName = _pk_translate("General_ColumnRevenue"); + previousTotalAdjusted = NumberFormatter.formatCurrency(Math.round(site.previous_Goal_revenue * site.ratio), site.currencySymbol); + } + + if (metricName) { + site.tooltip = _pk_translate("MultiSites_EvolutionComparisonIncomplete", [percent]) + "\n"; + site.tooltip += _pk_translate("MultiSites_EvolutionComparisonProportional", [percent, previousTotalAdjusted, metricName, previousTotal]) + "\n"; + + switch (site.periodName) { + case 'day': + site.tooltip += _pk_translate("MultiSites_EvolutionComparisonDay", [currentTotal, metricName, previousTotalAdjusted, site.previousRange, evolution]); + break; + case 'week': + site.tooltip += _pk_translate("MultiSites_EvolutionComparisonWeek", [currentTotal, metricName, previousTotalAdjusted, site.previousRange, evolution]); + break; + case 'month': + site.tooltip += _pk_translate("MultiSites_EvolutionComparisonMonth", [currentTotal, metricName, previousTotalAdjusted, site.previousRange, evolution]); + break; + case 'year': + site.tooltip += _pk_translate("MultiSites_EvolutionComparisonYear", [currentTotal, metricName, previousTotalAdjusted, site.previousRange, evolution]); + break; + } + } + + } }); model.totalVisits = report.totals.nb_visits; @@ -110,7 +158,7 @@ model.sortColumn = metric; fetchAllSites(); - }; + } function previousPage() { model.currentPage = model.currentPage - 1; @@ -145,7 +193,7 @@ filter_sort_order: 'asc', filter_limit: model.pageSize, filter_offset: getCurrentPagingOffset(), - showColumns: 'label,nb_visits,nb_pageviews,visits_evolution,pageviews_evolution,revenue_evolution,nb_actions,revenue' + showColumns: 'label,nb_visits,nb_pageviews,visits_evolution,visits_evolution_trend,pageviews_evolution,pageviews_evolution_trend,revenue_evolution,revenue_evolution_trend,nb_actions,revenue' }; if (model.searchTerm) { diff --git a/plugins/MultiSites/angularjs/site/site.directive.html b/plugins/MultiSites/angularjs/site/site.directive.html index 376d70349a..b2b0d3780a 100644 --- a/plugins/MultiSites/angularjs/site/site.directive.html +++ b/plugins/MultiSites/angularjs/site/site.directive.html @@ -20,11 +20,11 @@ <span class="value">{{ website.revenue }}</span> </td> - <td ng-if="period != 'range'" class="multisites-evolution"> + <td ng-if="period != 'range'" class="multisites-evolution" title="{{ website.tooltip }}"> <div class="visits value" ng-if="!website.isGroup"> - <span ng-show="website[evolutionMetric] > 0"><img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}%</span></span> - <span ng-show="website[evolutionMetric] == 0"><img src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}%</span></span> - <span ng-show="website[evolutionMetric] < 0"><img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}%</span></span> + <span ng-show="website[evolutionMetric+'_trend'] == 1"><img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}</span></span> + <span ng-show="website[evolutionMetric+'_trend'] == 0"><img src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}</span></span> + <span ng-show="website[evolutionMetric+'_trend'] == -1"><img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}</span></span> </div> </td> @@ -37,3 +37,4 @@ </div> </td> </tr> + diff --git a/plugins/MultiSites/lang/en.json b/plugins/MultiSites/lang/en.json index f67438a2e4..c2a351b689 100644 --- a/plugins/MultiSites/lang/en.json +++ b/plugins/MultiSites/lang/en.json @@ -5,6 +5,14 @@ "PluginDescription": "View and compare all your websites and apps in this useful 'All Websites' dashboard.", "TopLinkTooltip": "Compare Web Analytics stats for all of your Websites.", "SingleWebsitesDashboardDocumentation": "This report gives you an informational overview for a specific website, containing the most general metrics about your visitors.", - "AllWebsitesDashboardDocumentation": "This report gives you an informational overview for each of your websites, containing the most general metrics about your visitors." + "AllWebsitesDashboardDocumentation": "This report gives you an informational overview for each of your websites, containing the most general metrics about your visitors.", + "EvolutionComparisonIncomplete": "The currently selected time period is %1$s complete.", + "EvolutionComparisonProportional": "When the previous period was also %1$s complete, there would have been an estimated %2$s %3$s\n (out of a total of %4$s %3$s in the previous period).", + "EvolutionComparisonDay": "%1$s %2$s this day compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s", + "EvolutionComparisonWeek": "%1$s %2$s this week compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s", + "EvolutionComparisonMonth": "%1$s %2$s this month compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s", + "EvolutionComparisonYear": "%1$s %2$s this year compared to %3$s %2$s in the previous period (%4$s) Evolution: %5$s" + + } }
\ No newline at end of file diff --git a/plugins/MultiSites/tests/Integration/ControllerTest.php b/plugins/MultiSites/tests/Integration/ControllerTest.php index b0ac45ad8f..dd54beefad 100644 --- a/plugins/MultiSites/tests/Integration/ControllerTest.php +++ b/plugins/MultiSites/tests/Integration/ControllerTest.php @@ -53,6 +53,24 @@ class ControllerTest extends SystemTestCase 'nb_conversions_evolution' => '100%', 'orders_evolution' => '100%', 'ecommerce_revenue_evolution' => '100%', + 'ratio' => 1, + 'previous_nb_visits' => 0, + 'periodName' => 'day', + 'previousRange' => 'Tue, Jan 22', + 'previous_nb_actions' => 0, + 'previous_Actions_nb_pageviews' => 0, + 'previous_Goal_revenue' => 0, + 'previous_Goal_nb_conversions' => 0, + 'previous_Goal_0_nb_conversions' => 0, + 'previous_Goal_0_revenue' => 0, + 'visits_evolution_trend' => 1, + 'actions_evolution_trend' => 1, + 'pageviews_evolution_trend' => 1, + 'revenue_evolution_trend' => 1, + 'nb_conversions_evolution_trend' => 1, + 'orders_evolution_trend' => 1, + 'ecommerce_revenue_evolution_trend' => 1, + 'currencySymbol' => '$', ), $sites['sites'][0]); unset($sites['sites']); diff --git a/plugins/MultiSites/tests/Integration/DashboardTest.php b/plugins/MultiSites/tests/Integration/DashboardTest.php index 982a6ecc37..277f52617b 100644 --- a/plugins/MultiSites/tests/Integration/DashboardTest.php +++ b/plugins/MultiSites/tests/Integration/DashboardTest.php @@ -80,6 +80,20 @@ class DashboardTest extends IntegrationTestCase 'main_url' => 'http://piwik.net', 'nb_conversions' => 0, 'nb_conversions_evolution' => '0%', + 'ratio' => 1, + 'previous_nb_visits' => 0, + 'periodName' => 'day', + 'previousRange' => 'Wed, Dec 12', + 'previous_nb_actions' => 0, + 'previous_Actions_nb_pageviews' => 0, + 'previous_Goal_revenue' => 0, + 'previous_Goal_nb_conversions' => 0, + 'visits_evolution_trend' => 0, + 'actions_evolution_trend' => 0, + 'pageviews_evolution_trend' => 0, + 'revenue_evolution_trend' => 0, + 'nb_conversions_evolution_trend' => 0, + 'currencySymbol' => '$', ), array ( 'label' => 'Site 2', @@ -96,7 +110,21 @@ class DashboardTest extends IntegrationTestCase 'main_url' => 'http://piwik.net', 'nb_conversions' => 0, 'nb_conversions_evolution' => '0%', - ), + 'ratio' => 1, + 'previous_nb_visits' => 0, + 'periodName' => 'day', + 'previousRange' => 'Wed, Dec 12', + 'previous_nb_actions' => 0, + 'previous_Actions_nb_pageviews' => 0, + 'previous_Goal_revenue' => 0, + 'previous_Goal_nb_conversions' => 0, + 'visits_evolution_trend' => 0, + 'actions_evolution_trend' => 0, + 'pageviews_evolution_trend' => 0, + 'revenue_evolution_trend' => 0, + 'nb_conversions_evolution_trend' => 0, + 'currencySymbol' => '$', + ), array ( 'label' => 'Site 3', 'nb_visits' => '0', @@ -112,6 +140,20 @@ class DashboardTest extends IntegrationTestCase 'main_url' => 'http://piwik.net', 'nb_conversions' => 0, 'nb_conversions_evolution' => '0%', + 'ratio' => 1, + 'previous_nb_visits' => 0, + 'periodName' => 'day', + 'previousRange' => 'Wed, Dec 12', + 'previous_nb_actions' => 0, + 'previous_Actions_nb_pageviews' => 0, + 'previous_Goal_revenue' => 0, + 'previous_Goal_nb_conversions' => 0, + 'visits_evolution_trend' => 0, + 'actions_evolution_trend' => 0, + 'pageviews_evolution_trend' => 0, + 'revenue_evolution_trend' => 0, + 'nb_conversions_evolution_trend' => 0, + 'currencySymbol' => '$', ), ); $this->assertEquals($expectedSites, $dashboard->getSites(array(), $limit = 10)); @@ -138,6 +180,20 @@ class DashboardTest extends IntegrationTestCase 'main_url' => 'http://piwik.net', 'nb_conversions' => 0, 'nb_conversions_evolution' => '0%', + 'ratio' => 1, + 'previous_nb_visits' => 0, + 'periodName' => 'day', + 'previousRange' => 'Wed, Dec 12', + 'previous_nb_actions' => 0, + 'previous_Actions_nb_pageviews' => 0, + 'previous_Goal_revenue' => 0, + 'previous_Goal_nb_conversions' => 0, + 'visits_evolution_trend' => 0, + 'actions_evolution_trend' => 0, + 'pageviews_evolution_trend' => 0, + 'revenue_evolution_trend' => 0, + 'nb_conversions_evolution_trend' => 0, + 'currencySymbol' => '$', ), ); $dashboard->search('site 2'); diff --git a/tests/PHPUnit/Integration/ArchiveTest.php b/tests/PHPUnit/Integration/ArchiveTest.php index 14caddbcd0..820dfe019c 100644 --- a/tests/PHPUnit/Integration/ArchiveTest.php +++ b/tests/PHPUnit/Integration/ArchiveTest.php @@ -112,6 +112,8 @@ class ArchiveTest extends IntegrationTestCase $archive = Archive::build($idSite, 'day', '2014-05-07'); $metrics = $archive->getNumeric(['ExamplePlugin_archive1metric', 'ExamplePlugin_archive2metric', 'ExamplePlugin_archive3metric']); + unset($metrics['_metadata']); + $expected = [ 'ExamplePlugin_archive1metric' => 1, 'ExamplePlugin_archive2metric' => 2, diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php index 8d357aa2b3..4708ba7013 100644 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php @@ -132,6 +132,10 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase $archive = Archive::build($idSite1, 'range', $dateTimeRange); $result = $archive->getNumeric($columns); + if (isset($result['_metadata'])) { + unset($result['_metadata']); + } + $this->assertEquals( array( 'nb_visits' => 5, diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml index 5218ad3961..98eba63273 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml @@ -7,10 +7,22 @@ <nb_pageviews>4</nb_pageviews> <revenue>43</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Mar 5</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://site.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index 39ab78c6e9..41dc8b695a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -7,10 +7,22 @@ <nb_pageviews>45</nb_pageviews> <revenue>195</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -21,10 +33,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -35,10 +59,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://example-site-two.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index ca2db76ca1..885016c4ca 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -3,9 +3,13 @@ <nb_visits>43</nb_visits> <nb_actions>51</nb_actions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <nb_pageviews>45</nb_pageviews> <revenue>195</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 1a70f3db7c..d61ce4a54f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -9,11 +9,25 @@ <revenue>195</revenue> <nb_conversions>39</nb_conversions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <nb_conversions_evolution>100%</nb_conversions_evolution> + <nb_conversions_evolution_trend>1</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -25,11 +39,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -41,11 +69,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -59,11 +101,25 @@ <revenue>5</revenue> <nb_conversions>1</nb_conversions> <visits_evolution>-97.7%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-80.4%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-77.8%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-97.4%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <nb_conversions_evolution>-97.4%</nb_conversions_evolution> + <nb_conversions_evolution_trend>-1</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>43</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Aug 2012</previousRange> + <previous_nb_actions>51</previous_nb_actions> + <previous_Actions_nb_pageviews>45</previous_Actions_nb_pageviews> + <previous_Goal_revenue>195</previous_Goal_revenue> + <previous_Goal_nb_conversions>39</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -75,11 +131,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>-100%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-100%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-100%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Aug 2012</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -91,11 +161,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>-100%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-100%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-100%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>3</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Aug 2012</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -109,11 +193,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>-100%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-100%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-100%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-100%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <nb_conversions_evolution>-100%</nb_conversions_evolution> + <nb_conversions_evolution_trend>-1</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Sep 2012</previousRange> + <previous_nb_actions>10</previous_nb_actions> + <previous_Actions_nb_pageviews>10</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> + <previous_Goal_nb_conversions>1</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -125,11 +223,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Sep 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -141,11 +253,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Sep 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -159,11 +285,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Oct 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -175,11 +315,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Oct 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -191,11 +345,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Oct 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -209,11 +377,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Nov 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -225,11 +407,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Nov 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -241,11 +437,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Nov 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -259,11 +469,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -275,11 +499,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -291,11 +529,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -309,11 +561,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jan 2013</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -325,11 +591,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jan 2013</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -341,11 +621,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jan 2013</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml index 5218ad3961..32dc2a24b3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml @@ -7,10 +7,22 @@ <nb_pageviews>4</nb_pageviews> <revenue>43</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Mar 5</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://site.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml index b76e6ee906..a0cd571ea6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml @@ -3,9 +3,13 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <nb_pageviews>4</nb_pageviews> <revenue>43</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index 109e6fb23b..225e76eef7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -209,6 +209,14 @@ <result prettyDate="Sunday, January 3, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sat, Jan 2</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -216,11 +224,27 @@ <result prettyDate="Monday, January 4, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> <row> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -228,6 +252,14 @@ <result prettyDate="Tuesday, January 5, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Jan 4</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -235,6 +267,14 @@ <result prettyDate="Wednesday, January 6, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Jan 5</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -242,6 +282,14 @@ <result prettyDate="Thursday, January 7, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Wed, Jan 6</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -249,6 +297,14 @@ <result prettyDate="Friday, January 8, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Thu, Jan 7</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -256,15 +312,19 @@ <result prettyDate="Saturday, January 9, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 8</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> </result> </reportMetadata> <reportTotal> - <nb_visits>9</nb_visits> - <nb_actions>31</nb_actions> - <nb_pageviews>31</nb_pageviews> - <revenue>35</revenue> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml index 2efd1eaab3..f974de9b54 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sat, Jan 2</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>-50%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-50%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-50%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-100%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>400%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>400%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Jan 4</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -70,10 +118,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Jan 5</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -86,10 +146,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Wed, Jan 6</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -102,10 +174,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Thu, Jan 7</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -118,10 +202,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 8</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml index a06b60b001..3fa8c0993e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml index 290e4f6217..5e0cf2cca7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 21 – 27, 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>31</nb_pageviews> <revenue>30</revenue> <visits_evolution>250%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>1,450%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>1,450%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>200%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>10</nb_pageviews> <revenue>10</revenue> <visits_evolution>-71.4%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-67.7%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-67.7%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-66.7%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>7</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Jan 4 – 10, 2010</previousRange> + <previous_nb_actions>31</previous_nb_actions> + <previous_Actions_nb_pageviews>31</previous_Actions_nb_pageviews> + <previous_Goal_revenue>30</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml index aad34392f8..e682f253e1 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml index 2efd1eaab3..f974de9b54 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sat, Jan 2</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>-50%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-50%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-50%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-100%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>400%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>400%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Jan 4</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -70,10 +118,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Jan 5</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -86,10 +146,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Wed, Jan 6</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -102,10 +174,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Thu, Jan 7</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -118,10 +202,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 8</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml index a06b60b001..3fa8c0993e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml index 290e4f6217..5e0cf2cca7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 21 – 27, 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>31</nb_pageviews> <revenue>30</revenue> <visits_evolution>250%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>1,450%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>1,450%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>200%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>10</nb_pageviews> <revenue>10</revenue> <visits_evolution>-71.4%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-67.7%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-67.7%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-66.7%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>7</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Jan 4 – 10, 2010</previousRange> + <previous_nb_actions>31</previous_nb_actions> + <previous_Actions_nb_pageviews>31</previous_Actions_nb_pageviews> + <previous_Goal_revenue>30</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml index aad34392f8..e682f253e1 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml index b34eb3e56b..5c94021bfc 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml @@ -4,9 +4,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -14,9 +18,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -24,9 +32,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -34,9 +46,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -44,9 +60,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -54,9 +74,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -64,9 +88,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml index aca453e363..72ef126616 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml @@ -4,9 +4,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -14,9 +18,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -24,9 +32,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -34,9 +46,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -44,9 +60,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -54,9 +74,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -64,9 +88,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> diff --git a/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml index 2c523aeb3e..f0a62bc625 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml @@ -3,9 +3,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml index a1c7e55b5f..8d6cd9b0b9 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml @@ -7,10 +7,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> + <previous_nb_actions>3</previous_nb_actions> + <previous_Actions_nb_pageviews>3</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml index f714cc123d..0ade0fabd6 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml @@ -8,10 +8,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> + <previous_nb_actions>3</previous_nb_actions> + <previous_Actions_nb_pageviews>3</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -47,10 +71,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Dec 24</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -61,10 +97,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Dec 24</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -97,10 +145,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 14</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml index 0f13a8fa50..e43a4f4166 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml @@ -7,8 +7,20 @@ <nb_pageviews>11</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> + <ratio>1</ratio> + <currencySymbol>USD</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>range</periodName> + <previousRange>Nov 13 – Dec 14, 2010</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml index 22ff810189..ea06868187 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml @@ -7,10 +7,22 @@ <nb_pageviews>9</nb_pageviews> <revenue>0</revenue> <visits_evolution>200%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>200%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>200%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>range</periodName> + <previousRange>Nov 13 – Dec 14, 2010</previousRange> + <previous_nb_actions>3</previous_nb_actions> + <previous_Actions_nb_pageviews>3</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -21,10 +33,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>range</periodName> + <previousRange>Nov 13 – Dec 14, 2010</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml index e9115ba10c..1925b7a67c 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml @@ -3,9 +3,13 @@ <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> <visits_evolution>200%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>200%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>200%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>9</nb_pageviews> <revenue>0</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml index 1639884498..ae23cd01c0 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml @@ -5,6 +5,11 @@ <nb_visits>2</nb_visits> <visits_evolution>0%</visits_evolution> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> <group /> <main_url>http://piwik.net</main_url> </row> @@ -13,6 +18,11 @@ <nb_visits>1</nb_visits> <visits_evolution>0%</visits_evolution> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> <group /> <main_url>http://piwik.net</main_url> </row> |