diff --git a/core/Archive.php b/core/Archive.php
index 97b034b507d740107062452bfe088e8502d0c1a6..07695eab3504b22bda79227a64a044210d61ecd0 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -132,17 +132,18 @@ class Piwik_Archive
}
$segment = new Piwik_Segment($segment, $websiteIds);
$idSiteIsAll = $idSites == self::REQUEST_ALL_WEBSITES_FLAG;
- return Piwik_Archive::factory($segment, $allPeriods, $websiteIds, $idSiteIsAll);
+ $isMultipleDate = Piwik_Period::isMultiplePeriod($strDate, $period);
+ return Piwik_Archive::factory($segment, $allPeriods, $websiteIds, $idSiteIsAll, $isMultipleDate);
}
- public static function factory(Piwik_Segment $segment, array $periods, $idSites, $idSiteIsAll = false)
+ public static function factory(Piwik_Segment $segment, array $periods, $idSites, $idSiteIsAll = false, $isMultipleDate = false)
{
$forceIndexedBySite = false;
$forceIndexedByDate = false;
if ($idSiteIsAll || count($idSites) > 1) {
$forceIndexedBySite = true;
}
- if (count($periods) > 1) {
+ if (count($periods) > 1 || $isMultipleDate) {
$forceIndexedByDate = true;
}
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index e9984b99aaf6bd346b7030799df50dfe9e80d603..e3d398c2592fcda427675c6f7d3df40fdf1ab86a 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -218,11 +218,13 @@ class Piwik_MultiSites_API
) {
$dataTable = $dataTable->mergeChildren();
} else {
- if (!$dataTable instanceof Piwik_DataTable_Array
+ if (!($dataTable instanceof Piwik_DataTable_Array)
&& $dataTable->getRowsCount() > 0
) {
+ $firstSite = is_array($sites) ? reset($sites) : $sites;
+
$firstDataTableRow = $dataTable->getFirstRow();
- $firstDataTableRow->setColumn('label', $sites);
+ $firstDataTableRow->setColumn('label', $firstSite);
}
}
@@ -232,20 +234,19 @@ class Piwik_MultiSites_API
// if the period isn't a range & a lastN/previousN date isn't used, we get the same
// data for the last period to show the evolution of visits/actions/revenue
list($strLastDate, $lastPeriod) = Piwik_Period_Range::getLastDate($date, $period);
- if (
- // FIXMEA broken without this false
- false
- && $strLastDate !== false) {
+ if ($strLastDate !== false) {
if ($lastPeriod !== false) {
// NOTE: no easy way to set last period date metadata when range of dates is requested.
// will be easier if DataTable_Array::metadata is removed, and metadata that is
// put there is put directly in Piwik_DataTable::metadata.
$dataTable->setMetadata(self::getLastPeriodMetadataName('date'), $lastPeriod);
}
- $pastArchive = Piwik_Archive::build('all', $period, $strLastDate, $segment, $_restrictSitesToLogin);
+ $pastArchive = Piwik_Archive::build($sites, $period, $strLastDate, $segment, $_restrictSitesToLogin);
$pastData = $pastArchive->getDataTableFromNumeric($fieldsToGet);
-
- if(!($dataTable instanceof Piwik_DataTable_Simple)) {
+
+ if ($pastData instanceof Piwik_DataTable_Array
+ && $multipleWebsitesRequested
+ ) {
$pastData = $pastData->mergeChildren();
}
@@ -318,8 +319,13 @@ class Piwik_MultiSites_API
*/
private function calculateEvolutionPercentages($currentData, $pastData, $apiMetrics)
{
+ if (get_class($currentData) != get_class($pastData)) { // sanity check for regressions
+ throw new Exception("Expected \$pastData to be of type ".get_class($currentData)." - got "
+ . get_class($pastData).".");
+ }
+
if ($currentData instanceof Piwik_DataTable_Array) {
- $pastArray = $pastData->getRows();
+ $pastArray = $pastData->getArray();
foreach ($currentData->getArray() as $subTable) {
$this->calculateEvolutionPercentages($subTable, current($pastArray), $apiMetrics);
next($pastArray);
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index 7f794bce824b70d11fbd5cde4cc0e72c1e524c60..2f4aaee06b208296361de533a50e9067960d747e 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -68,32 +68,24 @@ class Piwik_VisitTime_API
// metrics to query
$metrics = Piwik_Metrics::getVisitsMetricNames();
unset($metrics[Piwik_Metrics::INDEX_MAX_ACTIONS]);
-
- try {
- // get metric data for every day within the supplied period
- $oPeriod = Piwik_Period::makePeriodFromQueryParams(Piwik_Site::getTimezoneFor($idSite), $period, $date);
- $dateRange = $oPeriod->getDateStart()->toString() . ',' . $oPeriod->getDateEnd()->toString();
- $archive = Piwik_Archive::build($idSite, 'day', $dateRange, $segment);
- } catch(Exception $e) {
- throw new Exception("getByDayOfWeek not working yet");
+
+ // disabled for multiple dates
+ if (Piwik_Period::isMultiplePeriod($date, $period)) {
+ throw new Exception("VisitTime.getByDayOfWeek does not support multiple dates.");
}
- // disabled for multiple sites/dates
- if ( count( $archive->getParams()->getIdSites() ) > 1) {
- throw new Exception("VisitTime.getByDayOfWeek does not support multiple sites.");
- }
+ // get metric data for every day within the supplied period
+ $oPeriod = Piwik_Period::makePeriodFromQueryParams(Piwik_Site::getTimezoneFor($idSite), $period, $date);
+ $dateRange = $oPeriod->getDateStart()->toString() . ',' . $oPeriod->getDateEnd()->toString();
+ $archive = Piwik_Archive::build($idSite, 'day', $dateRange, $segment);
- $periods = $archive->getParams()->getPeriods();
- if ( count ($periods) > 1
- && !($periods[0] instanceof Piwik_Period_Day)) {
- throw new Exception("VisitTime.getByDayOfWeek does not support multiple dates.");
+ // disabled for multiple sites
+ if (count($archive->getParams()->getIdSites()) > 1) {
+ throw new Exception("VisitTime.getByDayOfWeek does not support multiple sites.");
}
- $dataTable = $archive->getDataTableFromNumeric($metrics);
+ $dataTable = $archive->getDataTableFromNumeric($metrics)->mergeChildren();
- if(!($dataTable instanceof Piwik_DataTable)) {
- return new Piwik_DataTable();
- }
// if there's no data for this report, don't bother w/ anything else
if ($dataTable->getRowsCount() == 0) {
return $dataTable;
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
index 92c79f743aa0bec811b606522bea84e3b431cdfb..8a400626b7f1bab2510a3b83fc2018e05976c213 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -6,6 +6,10 @@
<nb_actions>29</nb_actions>
<nb_pageviews>25</nb_pageviews>
<revenue>120</revenue>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>100%</revenue_evolution>
<idsite>1</idsite>
</row>
<row>
@@ -14,6 +18,10 @@
<nb_actions>1</nb_actions>
<nb_pageviews>1</nb_pageviews>
<revenue>0</revenue>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
<idsite>2</idsite>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
index cb5be388e9e8a558c3be00aae9f42e03cc5b9046..febd0b7d2f7593689f811236371361aacba3aa08 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -2,6 +2,10 @@
<result>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>100%</revenue_evolution>
<nb_pageviews>25</nb_pageviews>
<revenue>120</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index c234bed59e963e268d7a9bc05348d941758c4aa9..a95e7420bbcb06603e1db356f72264e654d7b38e 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -1,2 +1,58 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result />
\ No newline at end of file
+<result>
+ <row>
+ <label>Monday</label>
+ <nb_visits>0</nb_visits>
+ <day_of_week>1</day_of_week>
+ </row>
+ <row>
+ <label>Tuesday</label>
+ <nb_visits>0</nb_visits>
+ <day_of_week>2</day_of_week>
+ </row>
+ <row>
+ <label>Wednesday</label>
+ <nb_visits>2</nb_visits>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_actions>2</nb_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <day_of_week>3</day_of_week>
+ </row>
+ <row>
+ <label>Thursday</label>
+ <nb_visits>9</nb_visits>
+ <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_actions>9</nb_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <nb_visits_converted>9</nb_visits_converted>
+ <day_of_week>4</day_of_week>
+ </row>
+ <row>
+ <label>Friday</label>
+ <nb_visits>6</nb_visits>
+ <nb_uniq_visitors>6</nb_uniq_visitors>
+ <nb_actions>6</nb_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>6</nb_visits_converted>
+ <day_of_week>5</day_of_week>
+ </row>
+ <row>
+ <label>Saturday</label>
+ <nb_visits>9</nb_visits>
+ <nb_uniq_visitors>9</nb_uniq_visitors>
+ <nb_actions>12</nb_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>7</nb_visits_converted>
+ <day_of_week>6</day_of_week>
+ </row>
+ <row>
+ <label>Sunday</label>
+ <nb_visits>0</nb_visits>
+ <day_of_week>7</day_of_week>
+ </row>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
index 818c899ce8b27a6f917373860ee5355eca311064..78d5baaa75e14012b905606c57e55d489574a855 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
@@ -6,6 +6,10 @@
<nb_actions>8</nb_actions>
<nb_pageviews>4</nb_pageviews>
<revenue>43</revenue>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>100%</revenue_evolution>
<idsite>1</idsite>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
index 2594503584ce43db67c9a74951180386e95fe04d..b76e6ee906d6a7f0583a9c66071181d078d66faf 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml
@@ -2,6 +2,10 @@
<result>
<nb_visits>2</nb_visits>
<nb_actions>8</nb_actions>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>100%</revenue_evolution>
<nb_pageviews>4</nb_pageviews>
<revenue>43</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
index 8f2a7940d4b6297d3efb95beddacd34a5c4a2423..e715309206aa884f75ec89101c9caf6342393ebb 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml
@@ -17,12 +17,7 @@
</row>
<row>
<label>Thursday</label>
- <nb_visits>2</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_actions>8</nb_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
+ <nb_visits>0</nb_visits>
<day_of_week>4</day_of_week>
</row>
<row>
@@ -32,7 +27,12 @@
</row>
<row>
<label>Saturday</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>2</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_actions>8</nb_actions>
+ <sum_visit_length>1621</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
<day_of_week>6</day_of_week>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
index b358ca25482780094f249679481c6f5933c15240..7b035b01889ba7f9cd6bff712e55d9d4f77a7357 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml
@@ -17,12 +17,7 @@
</row>
<row>
<label>Thursday</label>
- <nb_visits>2</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_actions>9</nb_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
+ <nb_visits>0</nb_visits>
<day_of_week>4</day_of_week>
</row>
<row>
@@ -32,7 +27,12 @@
</row>
<row>
<label>Saturday</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>2</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_actions>9</nb_actions>
+ <sum_visit_length>1621</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
<day_of_week>6</day_of_week>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
index e65de573d81dddea4670fbfa7b831c2782fb85d6..63e040aca09169ab275634265fd406a287271a2d 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
@@ -1648,7 +1648,205 @@ Back to top
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Visits by Day of Week
</h2>
-There is no data for this report.<a name="Actions_get"/>
+<img
+alt=""
+src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAJBklEQVR4nO3dz4vbeR3H8XT7Y9rasXQs/TXWihmoVgpC7Unw4GUPgiKi/4AH7x5FLyJ78epFcf+BBfEke1OQdS9VwYO1YKMM3Wl3yjLVrbYdCh0PgTSTfL/Ja5JMvt9v8nicZpLvpJ+8+eY7z37zY47s7e21AADGeaPqBQAAzSAaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiMw7GtrtduGFhZeP/ikAYJ6Ozfbm3nr7TwOX/PB7X05+sNPp5Ne22+3R2wMAMzfjaPjHg49fvnzZ+/b48eNbW1vr6+u9SzqdzsCvfAUAAI0w42hotVrPnj3rfX327NmHDx/2R0OZ4ZLofT3QGd2reht0r+3feLrlAwDFZh8N0xsREK2ihnDeAgDmoIJ3T/SfG0h+xx8oAhQDAByS2Z9pOH369JS30KuKpAAOtDEAMLEZR8O3vtZ+uLU1/e10CyCsgQNtDABMZsbR8I2vXmu1ro3dLDw90F8DyW22vKYBAA5NHT8R8kAf5eRznwBgPur47onhd1EWvoGibOP5LBIAls2Rvb29qtcAADRAHZ+eAABqSDQAABHRAABERAMAEBENAEBENAAAEdEAAEQGo6HdbvuMRQBg2L5o8IcbAIAy+6JBMQAAZcb/7Ymt/X/qent7+9KlS71vf/vHD2a/qGb6+lc+XXaVKXWNGBFArThu9/Qfuqf6g1W//t3m7//84dTrWRBf+OzZz62vDl/+k1/99fGTF/NfTw2JBqAR/v6vf7/7/tb47ZbDwaJhfX297NtPnPlohstquvPnz1+58qnhy48d+9v8F1NPV65cqXoJAOM9/vho1Uuokf5Dt7dcAgAR0QAARPY9PdH7hIbuF95MAQD07IsGlQAAlPH0BAAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQORY/zftdrv3dafTmftiAID6eh0N7Xa7PxQGvgUAlpynJwCAyLHxm8Ah+/Cj//3o53+oehW1cPToG7/48ZuFV7373j/f+8sHc15PPX3m8ie//50vFV7101++/5//7s55PfX03Tc/f/uLlwuv+vYPfjPnxdTWOz/75tGj/vN8AEf29va6X5U9PXHnzp3+H7h3796NGzfmucTRdnd3Hzx4sLGxUfVCam1nZ2d3d/fy5eIjCF2bm5tra2urq6tVL6TW7t69W6sjQA09ffp0Z2fn2rVrVS+k1h49erSysrK2tlb1Qmrt/v37V69eXVlZqXohr40/03D79u0R31bu+fPnq6urN2/erHohtba9vf3ixQtHsdHOnDlz4cKFc+fOVb2QWnv16tWtW7eqXkWtPXny5PHjx9evX696IbW2ubl58uTJixcvVr2QWjtx4sTGxsapU6eqXshrTssAABHRAABEXj890el0fE4DAFBm32sahAIAUOb1uycAAEbwmgYAILKY0dD/4gxGW8JZzfAuN316h7H+ps9kVsxhGqZXqA5jqcUnQnYHMfDRUi2vsehTuK8s53xG/5EUfzOlTB0ONw01MLqBHWw5d7nkVfPLOZkyC/M+g1pEA2P1djKPQyZTuAspidCIB90SPh6V+kEt0sTqEg3dN3x259j9onc4Gwi0gWtHHP4Kt1mk375lO+Jw0g6MovBXRVPGVbirFO45rXG7x/CONHZ0ZTc1vE0NR1emf/2FO9XwnHvbD9xC2c22mjaT0QrH0lq+OXSNOMgM7yqtg0yv6Y+sMmMfaL3NWvXbqeoSDWWGJ9sqGlDhZguwb01g9CjKNmgtyrhGPBT7LxzeOHyObPH2tPDEw0CZld1Ca+H2qDLmMGDgbhZW5oARv+oW4JE1meSg1Kp0Mo18IeTEM+pF3PLsgtNY+HEd3p1q0OjC5U1/Lxo0k2HtPt1Llvko1L0LAwOZ7HYm+6dbTZtePrHJ7tQ8x1KjMw29uz2r+zzN3txoA3c8HGzjxtV7eCSniPPb7P92UUc3jfxxukhjmeagtEhz6Ck8nzfzf2WRRld4wmBiFU6mRtEwW7P6LdJEwwe4shPLPc0aV+ERqvCZiAluufCShRndTIydSWspx1JoSeZwGHdzSUY3gWonU6+nJ7rPhE15I2NP/jTrvFZoxLOGE/xUT53H1b+qEb/Rx15SZuyWC7+nTXA8WviZhBZ7DjM8mTfBNk2c3pTH4WSzuY2l7mcaBv5PWXYSbOAVp4d3uqxWhu91a+TE+k/mj/6p5hq++62Su5z87PAT2Au/p42dVTKTsp9dbMszh8JH2fDdLBzCch7DR08sPCjVZKdaxr890bhKrZZxTczohplJlzlMw/QKzWcs9Xp6Yg7sbQdiXBMzumFm0mUO0zC9QnMbyzKeaQAAJrB0ZxoAgMmIBgAgIhoAgMj/AafOR5ztYuGeAAAAAElFTkSuQmCC"
+height="200"
+width="700"/>
+<br/>
+<br/>
+<table style="border-collapse:collapse; margin-left: 5px">
+<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
+<th style="padding: 6px 0;">
+ Day of the week
+</th>
+<th style="padding: 6px 0;">
+ Visits
+</th>
+<th style="padding: 6px 0;">
+ Actions
+</th>
+<th style="padding: 6px 0;">
+ Actions per Visit
+</th>
+<th style="padding: 6px 0;">
+ Avg. Time on Website
+</th>
+<th style="padding: 6px 0;">
+ Bounce Rate
+</th>
+<th style="padding: 6px 0;">
+ Conversion Rate
+</th>
+</thead>
+<tbody>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Monday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+2
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+2
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:06:01
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Tuesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+5
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+5
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:15:01
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Wednesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Thursday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Friday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Saturday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Sunday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+100%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+</tbody>
+</table>
+<br/>
+<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop">
+Back to top
+</a><a name="Actions_get"/>
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Actions - Main metrics
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
index ebc947ff38509cf955649bca93627a64d90995c8..1abca8b9f385998d34b26251a3b57dda1543b6ea 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
@@ -1620,7 +1620,198 @@ Back to top
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Visits by Day of Week
</h2>
-There is no data for this report.<a name="Actions_get"/>
+<table style="border-collapse:collapse; margin-left: 5px">
+<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
+<th style="padding: 6px 0;">
+ Day of the week
+</th>
+<th style="padding: 6px 0;">
+ Visits
+</th>
+<th style="padding: 6px 0;">
+ Actions
+</th>
+<th style="padding: 6px 0;">
+ Actions per Visit
+</th>
+<th style="padding: 6px 0;">
+ Avg. Time on Website
+</th>
+<th style="padding: 6px 0;">
+ Bounce Rate
+</th>
+<th style="padding: 6px 0;">
+ Conversion Rate
+</th>
+</thead>
+<tbody>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Monday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+2
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+2
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:06:01
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Tuesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+5
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+5
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:15:01
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Wednesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Thursday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Friday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Saturday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Sunday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+100%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+</tbody>
+</table>
+<br/>
+<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop">
+Back to top
+</a><a name="Actions_get"/>
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Actions - Main metrics
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf
index 190016aa7fb8cf40b2340f1db4fe2a87e7bacec5..3cc8a3fbd057b1d37249e64afc7be04387f0c925 100644
Binary files a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf and b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf differ
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt
index b5ad16e1ba73c5671da898028197f95beb5deea1..398cd7cdd73b277f1d5a209e21e588462fd4e49c 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__PDFReports.generateReport_month.original.sms.txt
@@ -1 +1 @@
-2010, January. Site 1: 3 Visits, 8 Actions. Site 2: 1 Visits, 3 Actions
\ No newline at end of file
+2010, January. Site 1: 3 Visits (+100%), 8 Actions (+100%). Site 2: 1 Visits (+100%), 3 Actions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__PDFReports.generateReport_month.original.sms.txt b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__PDFReports.generateReport_month.original.sms.txt
index 17121891e82c58281a5d6fc4ecac079f9d5e41f8..96518ebcbc7ce8cdfe51f8a7543bcd08341fe031 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__PDFReports.generateReport_month.original.sms.txt
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__PDFReports.generateReport_month.original.sms.txt
@@ -1 +1 @@
-2010, January. 3 Visits, 8 Actions
\ No newline at end of file
+2010, January. 3 Visits (+100%), 8 Actions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
index 0f224cb46e2d867d14dee9249526cfe6c73c0a2c..e9de54454b39bb2b5e7a8ca0e97a77f5a6d25d66 100755
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__VisitTime.getByDayOfWeek_day.xml
@@ -7,7 +7,12 @@
</row>
<row>
<label>Tuesday</label>
- <nb_visits>0</nb_visits>
+ <nb_visits>3</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_actions>13</nb_actions>
+ <sum_visit_length>5403</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
<day_of_week>2</day_of_week>
</row>
<row>
@@ -17,12 +22,7 @@
</row>
<row>
<label>Thursday</label>
- <nb_visits>3</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_actions>13</nb_actions>
- <sum_visit_length>5403</sum_visit_length>
- <bounce_count>0</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
+ <nb_visits>0</nb_visits>
<day_of_week>4</day_of_week>
</row>
<row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
index 2aec4e385fe217c50d6a9b59b139e1c4d27ca96e..3ea13e548d50bd71558e0aec72b1ab681489ab52 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
@@ -1708,7 +1708,205 @@ Back to top
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Visits by Day of Week
</h2>
-There is no data for this report.<a name="Goals_get_idGoal--ecommerceOrder"/>
+<img
+alt=""
+src="data:image/png;base64,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"
+height="200"
+width="700"/>
+<br/>
+<br/>
+<table style="border-collapse:collapse; margin-left: 5px">
+<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
+<th style="padding: 6px 0;">
+ Day of the week
+</th>
+<th style="padding: 6px 0;">
+ Visits
+</th>
+<th style="padding: 6px 0;">
+ Actions
+</th>
+<th style="padding: 6px 0;">
+ Actions per Visit
+</th>
+<th style="padding: 6px 0;">
+ Avg. Time on Website
+</th>
+<th style="padding: 6px 0;">
+ Bounce Rate
+</th>
+<th style="padding: 6px 0;">
+ Conversion Rate
+</th>
+</thead>
+<tbody>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Monday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Tuesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+3
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+13
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+4.33
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:30:01
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+66.67%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Wednesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+2
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+3
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1.5
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:12:02
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+50%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+100%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Thursday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Friday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Saturday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Sunday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+</tbody>
+</table>
+<br/>
+<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop">
+Back to top
+</a><a name="Goals_get_idGoal--ecommerceOrder"/>
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Ecommerce Orders
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
index d8f85ebc9d26d5f2b54602de688967257d1e14f5..c4e10f7ff62f10a9332565041e92f35f0fca56fa 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
@@ -1680,7 +1680,198 @@ Back to top
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Visits by Day of Week
</h2>
-There is no data for this report.<a name="Goals_get_idGoal--ecommerceOrder"/>
+<table style="border-collapse:collapse; margin-left: 5px">
+<thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;">
+<th style="padding: 6px 0;">
+ Day of the week
+</th>
+<th style="padding: 6px 0;">
+ Visits
+</th>
+<th style="padding: 6px 0;">
+ Actions
+</th>
+<th style="padding: 6px 0;">
+ Actions per Visit
+</th>
+<th style="padding: 6px 0;">
+ Avg. Time on Website
+</th>
+<th style="padding: 6px 0;">
+ Bounce Rate
+</th>
+<th style="padding: 6px 0;">
+ Conversion Rate
+</th>
+</thead>
+<tbody>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Monday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Tuesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+3
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+13
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+4.33
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:30:01
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+66.67%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Wednesday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+2
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+3
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+1.5
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:12:02
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+50%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+100%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Thursday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Friday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="background-color: rgb(249,250,250)">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Saturday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+<tr style="">
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+Sunday
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+00:00:00
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+0%
+</td>
+</tr>
+</tbody>
+</table>
+<br/>
+<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt" href="#reportTop">
+Back to top
+</a><a name="Goals_get_idGoal--ecommerceOrder"/>
<h2 style="color: rgb(126,115,99); font-size: 11pt;">
Ecommerce Orders
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf
index 9c560a5fdb1769af280c5deb3c4cdc09c684a80c..ba1c591b34319ddf4acf76d02c886b90f77c9ccf 100644
Binary files a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf and b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf differ
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__PDFReports.generateReport_week.original.sms.txt b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__PDFReports.generateReport_week.original.sms.txt
index 22063e7354fbc9b16511bd2baf060f154a5b971c..a421c77027cddd85500cda99036df0e01786d020 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__PDFReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__PDFReports.generateReport_week.original.sms.txt
@@ -1 +1 @@
-Week 4 April - 10 April 2011. Piwik test: 5 Visits, 16 Actions, Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders. Piwik test: 1 Visits, 0 Actions, Revenue: $ 250, 1 Goal conversions
\ No newline at end of file
+Week 4 April - 10 April 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 1 Visits (+100%), 0 Actions, Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__PDFReports.generateReport_week.original.sms.txt b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__PDFReports.generateReport_week.original.sms.txt
index e84eb14972ebe52a61096c914359c52eabb3d225..fa6a9d691ea6b4ae9c1724a39cc036516e83ff00 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__PDFReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__PDFReports.generateReport_week.original.sms.txt
@@ -1 +1 @@
-Week 4 April - 10 April 2011. 5 Visits, 16 Actions, Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders
\ No newline at end of file
+Week 4 April - 10 April 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
index 151ee2db1eea22ebb2dc7463c322e27b62eb695a..9e698bf229dd7a7cdba841f070b74041358ae450 100755
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_day.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <error message="getByDayOfWeek not working yet
+ <error message="VisitTime.getByDayOfWeek does not support multiple dates.
--> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
index 151ee2db1eea22ebb2dc7463c322e27b62eb695a..9e698bf229dd7a7cdba841f070b74041358ae450 100755
--- a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__VisitTime.getByDayOfWeek_week.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <error message="getByDayOfWeek not working yet
+ <error message="VisitTime.getByDayOfWeek does not support multiple dates.
--> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
index af9517fd597e9b25424fb39407d7091355253adc..2c523aeb3e01364ef215e4cb85d5830492765eb1 100644
--- a/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_noVisit__MultiSites.getOne_day.xml
@@ -2,6 +2,10 @@
<result>
<nb_visits>0</nb_visits>
<nb_actions>0</nb_actions>
+ <visits_evolution>0%</visits_evolution>
+ <actions_evolution>0%</actions_evolution>
+ <pageviews_evolution>0%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
<nb_pageviews>0</nb_pageviews>
<revenue>0</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
index 162b8f9429adcbac998cf9ed2a0cd050270fc7e9..c234bed59e963e268d7a9bc05348d941758c4aa9 100755
--- a/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_noVisit__VisitTime.getByDayOfWeek_day.xml
@@ -1,43 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Monday</label>
- <nb_visits>0</nb_visits>
- <day_of_week>1</day_of_week>
- </row>
- <row>
- <label>Tuesday</label>
- <nb_visits>0</nb_visits>
- <day_of_week>2</day_of_week>
- </row>
- <row>
- <label>Wednesday</label>
- <nb_visits>0</nb_visits>
- <day_of_week>3</day_of_week>
- </row>
- <row>
- <label>Thursday</label>
- <nb_visits>0</nb_visits>
- <nb_uniq_visitors>0</nb_uniq_visitors>
- <nb_actions>0</nb_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>0</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <day_of_week>4</day_of_week>
- </row>
- <row>
- <label>Friday</label>
- <nb_visits>0</nb_visits>
- <day_of_week>5</day_of_week>
- </row>
- <row>
- <label>Saturday</label>
- <nb_visits>0</nb_visits>
- <day_of_week>6</day_of_week>
- </row>
- <row>
- <label>Sunday</label>
- <nb_visits>0</nb_visits>
- <day_of_week>7</day_of_week>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
index fc198901aced51697b0ea768e404a6126f1ccfab..938d916f4c4555e6654422196827f16faf204215 100755
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml
@@ -3,6 +3,10 @@
<nb_visits>2</nb_visits>
<nb_actions>3</nb_actions>
<label>Site AAAAAA</label>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
<nb_pageviews>3</nb_pageviews>
<revenue>0</revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
index 1e3dd308ae554c02398a6bed615b83324da7fce3..e30b698273536e5a6797e79a9cc7ef23add50590 100644
--- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml
@@ -1,6 +1,98 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <error message="Date format must be: YYYY-MM-DD, or 'today' or 'yesterday' or any keyword supported by the strtotime function (see http://php.net/strtotime for more information): 1970-01-01
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
-</result>
\ No newline at end of file
+<results>
+ <result date="2010-12-15">
+ <row>
+ <label>Site AAAAAA</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>3</nb_actions>
+ <nb_pageviews>3</nb_pageviews>
+ <revenue>0</revenue>
+ <visits_evolution>0%</visits_evolution>
+ <actions_evolution>0%</actions_evolution>
+ <pageviews_evolution>0%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
+ <idsite>1</idsite>
+ </row>
+ <row>
+ <label>SITE BBbbBB</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_pageviews>1</nb_pageviews>
+ <revenue>0</revenue>
+ <visits_evolution>0%</visits_evolution>
+ <actions_evolution>0%</actions_evolution>
+ <pageviews_evolution>0%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
+ <idsite>2</idsite>
+ </row>
+ </result>
+ <result date="2010-12-16" />
+ <result date="2010-12-17" />
+ <result date="2010-12-18" />
+ <result date="2010-12-19" />
+ <result date="2010-12-20" />
+ <result date="2010-12-21" />
+ <result date="2010-12-22" />
+ <result date="2010-12-23" />
+ <result date="2010-12-24" />
+ <result date="2010-12-25">
+ <row>
+ <label>Site AAAAAA</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>3</nb_actions>
+ <nb_pageviews>3</nb_pageviews>
+ <revenue>0</revenue>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
+ <idsite>1</idsite>
+ </row>
+ <row>
+ <label>SITE BBbbBB</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_pageviews>1</nb_pageviews>
+ <revenue>0</revenue>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
+ <idsite>2</idsite>
+ </row>
+ </result>
+ <result date="2010-12-26" />
+ <result date="2010-12-27" />
+ <result date="2010-12-28" />
+ <result date="2010-12-29" />
+ <result date="2010-12-30" />
+ <result date="2010-12-31" />
+ <result date="2011-01-01" />
+ <result date="2011-01-02" />
+ <result date="2011-01-03" />
+ <result date="2011-01-04" />
+ <result date="2011-01-05" />
+ <result date="2011-01-06" />
+ <result date="2011-01-07" />
+ <result date="2011-01-08" />
+ <result date="2011-01-09" />
+ <result date="2011-01-10" />
+ <result date="2011-01-11" />
+ <result date="2011-01-12" />
+ <result date="2011-01-13" />
+ <result date="2011-01-14" />
+ <result date="2011-01-15">
+ <row>
+ <label>Site AAAAAA</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>3</nb_actions>
+ <nb_pageviews>3</nb_pageviews>
+ <revenue>0</revenue>
+ <visits_evolution>100%</visits_evolution>
+ <actions_evolution>100%</actions_evolution>
+ <pageviews_evolution>100%</pageviews_evolution>
+ <revenue_evolution>0%</revenue_evolution>
+ <idsite>1</idsite>
+ </row>
+ </result>
+</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index e085147ec4b98a48ea0ee54d23bbea6ff166f54f..5507afa7340b890b0afd0270f98e27d84fcc8f8b 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -553,6 +553,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
$parametersToSet['serialize'] = 1;
$exampleUrl = $apiMetadata->getExampleUrl($class, $methodName, $parametersToSet);
+
if ($exampleUrl === false) {
$skipped[] = $apiId;
continue;
@@ -621,7 +622,8 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
}
$parametersToSet = array(
'idSite' => $idSite,
- 'date' => $periods == array('range') ? $dateTime : date('Y-m-d', strtotime($dateTime)),
+ 'date' => ($periods == array('range') || strpos($dateTime, ',') !== false) ?
+ $dateTime : date('Y-m-d', strtotime($dateTime)),
'expanded' => '1',
'piwikUrl' => 'http://example.org/piwik/',
// Used in getKeywordsForPageUrl