Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-08-06 13:14:50 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-08-06 13:14:50 +0400
commitc43448866d241c7773423d99c1a4301709dd2e4c (patch)
treec9ed6e2a4be739e3f477c5749fd1b2cad0954a47
parentbdb6528d3079ed846c80780d2004db23b4ff24c4 (diff)
refs #5926 move reports to exampleReport
-rw-r--r--core/Plugin/Manager.php3
-rw-r--r--plugins/CoreConsole/Commands/GenerateDimension.php4
-rw-r--r--plugins/CoreConsole/Commands/GenerateReport.php6
-rw-r--r--plugins/ExampleReport/Reports/Base.php (renamed from plugins/ExamplePlugin/Reports/Base.php)2
-rw-r--r--plugins/ExampleReport/Reports/GetExampleReport.php (renamed from plugins/ExamplePlugin/Reports/GetExampleReport.php)4
-rw-r--r--plugins/ExampleTracker/Columns/ExampleActionDimension.php4
-rw-r--r--plugins/ExampleTracker/Columns/ExampleConversionDimension.php4
-rw-r--r--plugins/ExampleTracker/Columns/ExampleDimension.php2
-rw-r--r--plugins/ExampleTracker/Columns/ExampleVisitDimension.php4
-rw-r--r--plugins/ExampleTracker/lang/en.json (renamed from plugins/ExamplePlugin/lang/en.json)2
-rw-r--r--tests/PHPUnit/Core/Plugin/ReportTest.php37
-rw-r--r--tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv4
-rw-r--r--tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html8
-rw-r--r--tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html65
-rw-r--r--tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdfbin506974 -> 506213 bytes
-rw-r--r--tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv4
-rw-r--r--tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html8
-rw-r--r--tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html65
-rw-r--r--tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdfbin525709 -> 525682 bytes
m---------tests/PHPUnit/UI0
20 files changed, 201 insertions, 25 deletions
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 3569bdd3cd..aa925215c4 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -77,7 +77,8 @@ class Manager extends Singleton
'ExampleUI',
'ExampleVisualization',
'ExamplePluginTemplate',
- 'ExampleTracker'
+ 'ExampleTracker',
+ 'ExampleReport',
);
// Themes bundled with core package, disabled by default
diff --git a/plugins/CoreConsole/Commands/GenerateDimension.php b/plugins/CoreConsole/Commands/GenerateDimension.php
index ac342fa1ce..269632100e 100644
--- a/plugins/CoreConsole/Commands/GenerateDimension.php
+++ b/plugins/CoreConsole/Commands/GenerateDimension.php
@@ -62,8 +62,8 @@ class GenerateDimension extends GeneratePluginBase
'ExampleVisitDimension' => $dimensionClassName,
'ExampleActionDimension' => $dimensionClassName,
'ExampleConversionDimension' => $dimensionClassName,
- 'ExamplePlugin_DimensionName' => $translatedDimensionName,
- 'ExamplePlugin' => $pluginName,
+ 'ExampleTracker_DimensionName' => $translatedDimensionName,
+ 'ExampleTracker' => $pluginName,
);
$whitelistFiles = array('/Columns');
diff --git a/plugins/CoreConsole/Commands/GenerateReport.php b/plugins/CoreConsole/Commands/GenerateReport.php
index 84677f10db..7a678c270a 100644
--- a/plugins/CoreConsole/Commands/GenerateReport.php
+++ b/plugins/CoreConsole/Commands/GenerateReport.php
@@ -39,8 +39,8 @@ class GenerateReport extends GeneratePluginBase
$order = $this->getOrder($category);
$apiName = $this->getApiName($reportName);
- $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin';
- $replace = array('ExamplePlugin' => $pluginName,
+ $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleReport';
+ $replace = array('ExampleReport' => $pluginName,
'GetExampleReport' => ucfirst($apiName),
'getExampleReport' => lcfirst($apiName),
'getApiReport' => lcfirst($apiName),
@@ -55,7 +55,7 @@ class GenerateReport extends GeneratePluginBase
$whitelistFiles = array('/Reports', '/Reports/Base.php', '/Reports/GetExampleReport.php');
if (file_exists($this->getPluginPath($pluginName) . '/API.php')) {
- $this->copyTemplateMethodToExisitingClass('Piwik\Plugins\ExamplePlugin\API', 'getExampleReport', $replace);
+ $this->copyTemplateMethodToExisitingClass('Piwik\Plugins\ExampleReport\API', 'getExampleReport', $replace);
} else {
$whitelistFiles[] = '/API.php';
}
diff --git a/plugins/ExamplePlugin/Reports/Base.php b/plugins/ExampleReport/Reports/Base.php
index e23a058ebb..c09da78e4b 100644
--- a/plugins/ExamplePlugin/Reports/Base.php
+++ b/plugins/ExampleReport/Reports/Base.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\ExamplePlugin\Reports;
+namespace Piwik\Plugins\ExampleReport\Reports;
use Piwik\Plugin\Report;
diff --git a/plugins/ExamplePlugin/Reports/GetExampleReport.php b/plugins/ExampleReport/Reports/GetExampleReport.php
index dbb7179ed6..408ba9a23d 100644
--- a/plugins/ExamplePlugin/Reports/GetExampleReport.php
+++ b/plugins/ExampleReport/Reports/GetExampleReport.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\ExamplePlugin\Reports;
+namespace Piwik\Plugins\ExampleReport\Reports;
use Piwik\Piwik;
use Piwik\Plugin\Report;
@@ -96,7 +96,7 @@ class GetExampleReport extends Base
* @return string
public function render()
{
- $view = new View('@ExamplePlugin/getExampleReport');
+ $view = new View('@ExampleReport/getExampleReport');
$view->myData = array();
return $view->render();
diff --git a/plugins/ExampleTracker/Columns/ExampleActionDimension.php b/plugins/ExampleTracker/Columns/ExampleActionDimension.php
index b6a9666617..b0ce98f7c9 100644
--- a/plugins/ExampleTracker/Columns/ExampleActionDimension.php
+++ b/plugins/ExampleTracker/Columns/ExampleActionDimension.php
@@ -46,7 +46,7 @@ class ExampleActionDimension extends ActionDimension
*/
public function getName()
{
- return Piwik::translate('ExamplePlugin_DimensionName');
+ return Piwik::translate('ExampleTracker_DimensionName');
}
/**
@@ -59,7 +59,7 @@ class ExampleActionDimension extends ActionDimension
$segment = new Segment();
$segment->setSegment('keywords');
$segment->setCategory('General_Actions');
- $segment->setName('ExamplePlugin_DimensionName');
+ $segment->setName('ExampleTracker_DimensionName');
$segment->setAcceptedValues('Here you should explain which values are accepted/useful: Any word, for instance MyKeyword1, MyKeyword2');
$this->addSegment($segment);
}
diff --git a/plugins/ExampleTracker/Columns/ExampleConversionDimension.php b/plugins/ExampleTracker/Columns/ExampleConversionDimension.php
index 48347695ec..3e24008449 100644
--- a/plugins/ExampleTracker/Columns/ExampleConversionDimension.php
+++ b/plugins/ExampleTracker/Columns/ExampleConversionDimension.php
@@ -48,7 +48,7 @@ class ExampleConversionDimension extends ConversionDimension
*/
public function getName()
{
- return Piwik::translate('ExamplePlugin_DimensionName');
+ return Piwik::translate('ExampleTracker_DimensionName');
}
/**
@@ -61,7 +61,7 @@ class ExampleConversionDimension extends ConversionDimension
$segment = new Segment();
$segment->setSegment('myConversionSegmentName');
$segment->setCategory('General_Visit');
- $segment->setName('ExamplePlugin_DimensionName');
+ $segment->setName('ExampleTracker_DimensionName');
$segment->setAcceptedValues('Here you should explain which values are accepted/useful: Any number, for instance 1, 2, 3 , 99');
$this->addSegment($segment);
}
diff --git a/plugins/ExampleTracker/Columns/ExampleDimension.php b/plugins/ExampleTracker/Columns/ExampleDimension.php
index 01d5dfea88..738d0be9e1 100644
--- a/plugins/ExampleTracker/Columns/ExampleDimension.php
+++ b/plugins/ExampleTracker/Columns/ExampleDimension.php
@@ -25,6 +25,6 @@ class ExampleDimension extends Dimension
*/
public function getName()
{
- return Piwik::translate('ExamplePlugin_DimensionName');
+ return Piwik::translate('ExampleTracker_DimensionName');
}
} \ No newline at end of file
diff --git a/plugins/ExampleTracker/Columns/ExampleVisitDimension.php b/plugins/ExampleTracker/Columns/ExampleVisitDimension.php
index 93bdb17ef6..d47d98eb59 100644
--- a/plugins/ExampleTracker/Columns/ExampleVisitDimension.php
+++ b/plugins/ExampleTracker/Columns/ExampleVisitDimension.php
@@ -46,7 +46,7 @@ class ExampleVisitDimension extends VisitDimension
*/
public function getName()
{
- return Piwik::translate('ExamplePlugin_DimensionName');
+ return Piwik::translate('ExampleTracker_DimensionName');
}
/**
@@ -59,7 +59,7 @@ class ExampleVisitDimension extends VisitDimension
$segment = new Segment();
$segment->setSegment('achievementPoints');
$segment->setCategory('General_Visit');
- $segment->setName('ExamplePlugin_DimensionName');
+ $segment->setName('ExampleTracker_DimensionName');
$segment->setAcceptedValues('Here you should explain which values are accepted/useful: Any number, for instance 1, 2, 3 , 99');
$this->addSegment($segment);
}
diff --git a/plugins/ExamplePlugin/lang/en.json b/plugins/ExampleTracker/lang/en.json
index 3ec2fab503..f270876f33 100644
--- a/plugins/ExamplePlugin/lang/en.json
+++ b/plugins/ExampleTracker/lang/en.json
@@ -1,5 +1,5 @@
{
- "ExamplePlugin": {
+ "ExampleTracker": {
"DimensionName": "Example Dimension"
}
} \ No newline at end of file
diff --git a/tests/PHPUnit/Core/Plugin/ReportTest.php b/tests/PHPUnit/Core/Plugin/ReportTest.php
new file mode 100644
index 0000000000..e5b1edce1c
--- /dev/null
+++ b/tests/PHPUnit/Core/Plugin/ReportTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+use Piwik\Plugin\Report;
+use Piwik\Plugins\ExampleReport\Reports\GetExampleReport;
+use Piwik\Metrics;
+
+/**
+ * @group Core
+ */
+class Plugin_ReportTest extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Report
+ */
+ private $report;
+
+ public function setUp()
+ {
+ $this->report = new GetExampleReport();
+ }
+
+ public function test_reportShouldUseDefaultMetrics()
+ {
+ $this->assertEquals(Metrics::getDefaultMetrics(), $this->report->getMetrics());
+ }
+
+ public function test_reportShouldUseDefaultProcessedMetrics()
+ {
+ $this->assertEquals(Metrics::getDefaultProcessedMetrics(), $this->report->getProcessedMetrics());
+ }
+} \ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index ba5dafe722..e662112861 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -1,3 +1,7 @@
+ExampleReportName
+nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,label,nb_actions
+5,0%,0,00:00:00,0%,0,0
+
All Websites dashboard
label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,orders_evolution,ecommerce_revenue,ecommerce_revenue_evolution
Site 1,10,43,43,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index adb664ab33..9115282428 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -3330,7 +3330,7 @@
<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;">
- &nbsp;Entry Page URL&nbsp;&nbsp;
+ &nbsp;Page URL&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Entrances&nbsp;&nbsp;
@@ -3396,7 +3396,7 @@
<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;">
- &nbsp;Exit Page URL&nbsp;&nbsp;
+ &nbsp;Page URL&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Exits&nbsp;&nbsp;
@@ -3597,7 +3597,7 @@
<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;">
- &nbsp;Entry Page title&nbsp;&nbsp;
+ &nbsp;Page Name&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Entrances&nbsp;&nbsp;
@@ -3659,7 +3659,7 @@
<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;">
- &nbsp;Exit Page Title&nbsp;&nbsp;
+ &nbsp;Page Name&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Exits&nbsp;&nbsp;
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index f4e7a9afb5..8738c93a9f 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -20,6 +20,11 @@
</h2>
<ul>
<li>
+ <a href="#ExampleReport_getExampleReport" style="text-decoration:none; color: rgb(68,68,68);">
+ ExampleReportName
+ </a>
+ </li>
+ <li>
<a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);">
All Websites dashboard
</a>
@@ -300,6 +305,66 @@
</a>
</li>
</ul>
+<h2 id="ExampleReport_getExampleReport" style="color: rgb(126,115,99); font-size: 11pt;">
+ ExampleReportName
+</h2>
+
+
+
+ <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;">
+ &nbsp;Exit Page URL&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Visits&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Actions&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Actions per Visit&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Avg. Time on Website&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Bounce Rate&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Conversion Rate&nbsp;&nbsp;
+ </th>
+ </thead>
+ <tbody>
+
+ <tr style="">
+ <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;">
+ 5
+ </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>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
All Websites dashboard
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
index b615d1d9a8..9b86222a07 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf
Binary files differ
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 478590155c..29fef7ec11 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -1,3 +1,7 @@
+ExampleReportName
+nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,label,nb_actions
+5,0%,0,00:00:00,0%,0,0
+
All Websites dashboard
label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders_evolution,ecommerce_revenue_evolution
Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100%
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index 247f013038..47d2b984d2 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -4338,7 +4338,7 @@
<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;">
- &nbsp;Entry Page URL&nbsp;&nbsp;
+ &nbsp;Page URL&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Entrances&nbsp;&nbsp;
@@ -4388,7 +4388,7 @@
<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;">
- &nbsp;Exit Page URL&nbsp;&nbsp;
+ &nbsp;Page URL&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Exits&nbsp;&nbsp;
@@ -4638,7 +4638,7 @@
<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;">
- &nbsp;Entry Page title&nbsp;&nbsp;
+ &nbsp;Page Name&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Entrances&nbsp;&nbsp;
@@ -4714,7 +4714,7 @@
<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;">
- &nbsp;Exit Page Title&nbsp;&nbsp;
+ &nbsp;Page Name&nbsp;&nbsp;
</th>
<th style="padding: 6px 0;">
&nbsp;Exits&nbsp;&nbsp;
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 78ca134267..f68e5bec1a 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -20,6 +20,11 @@
</h2>
<ul>
<li>
+ <a href="#ExampleReport_getExampleReport" style="text-decoration:none; color: rgb(68,68,68);">
+ ExampleReportName
+ </a>
+ </li>
+ <li>
<a href="#MultiSites_getAll" style="text-decoration:none; color: rgb(68,68,68);">
All Websites dashboard
</a>
@@ -360,6 +365,66 @@
</a>
</li>
</ul>
+<h2 id="ExampleReport_getExampleReport" style="color: rgb(126,115,99); font-size: 11pt;">
+ ExampleReportName
+</h2>
+
+
+
+ <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;">
+ &nbsp;Exit Page URL&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Visits&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Actions&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Actions per Visit&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Avg. Time on Website&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Bounce Rate&nbsp;&nbsp;
+ </th>
+ <th style="padding: 6px 0;">
+ &nbsp;Conversion Rate&nbsp;&nbsp;
+ </th>
+ </thead>
+ <tbody>
+
+ <tr style="">
+ <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;">
+ 5
+ </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>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
All Websites dashboard
</h2>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
index 3a6b3333e4..f7bdbe8b56 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
Binary files differ
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject 679f39948b60b454bf593fd30d93530bdff310b
+Subproject f32585361f06393d29076019ea116dc5d2adff8