diff options
10 files changed, 181 insertions, 177 deletions
diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index 1f4a53e48c..b6e484f924 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -216,7 +216,11 @@ class API extends \Piwik\Plugin\API */ public function getBrowserFamilies($idSite, $period, $date, $segment = false) { - return $this->getBrowsers($idSite, $period, $date, $segment); + $table = $this->getBrowsers($idSite, $period, $date, $segment); + // this one will not be sorted automatically by nb_visits since there is no Report class for it. + $table->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc')); + + return $table; } /** diff --git a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml index 02c15ad520..704c934193 100644 --- a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml @@ -45,7 +45,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Czech - Czech Republic (cs-cz)</label> + <label>Basque - Spain (eu-es)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -56,7 +56,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>German (de)</label> + <label>Chinese - Singapore (zh-sg)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -67,7 +67,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Greek - Greece (el-gr)</label> + <label>Czech - Czech Republic (cs-cz)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -78,7 +78,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Basque - Spain (eu-es)</label> + <label>French (fr)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -89,7 +89,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>French (fr)</label> + <label>French - Switzerland (fr-ch)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -100,7 +100,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>French - Switzerland (fr-ch)</label> + <label>German (de)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -111,7 +111,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Serbian - Serbia Montenegro (sr-cs)</label> + <label>Greek - Greece (el-gr)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -122,7 +122,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Thai (th)</label> + <label>Serbian - Serbia Montenegro (sr-cs)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -133,7 +133,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Unknown (xx)</label> + <label>Thai (th)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -144,7 +144,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Chinese - Singapore (zh-sg)</label> + <label>Unknown (xx)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml index 18d4468a2e..04af2f2ccf 100644 --- a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>French</label> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <nb_users>0</nb_users> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>4</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + </row> + <row> <label>Polish</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>3</nb_visits> @@ -23,17 +34,6 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>French</label> - <nb_uniq_visitors>3</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - <row> <label>Arabic</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> @@ -45,7 +45,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Czech</label> + <label>Basque</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -56,7 +56,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>German</label> + <label>Chinese</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -67,7 +67,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Greek</label> + <label>Czech</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -78,7 +78,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Basque</label> + <label>German</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -89,7 +89,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Serbian</label> + <label>Greek</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -100,7 +100,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Thai</label> + <label>Serbian</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -111,7 +111,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Unknown</label> + <label>Thai</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -122,7 +122,7 @@ <nb_visits_converted>0</nb_visits_converted> </row> <row> - <label>Chinese</label> + <label>Unknown</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml index f19b481c5c..49765ba76c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__ExamplePlugin.getExampleReport_month.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>My Label 2</label> - <nb_visits>5</nb_visits> - </row> - <row> <label>My Label 1</label> <nb_visits>1</nb_visits> </row> + <row> + <label>My Label 2</label> + <nb_visits>5</nb_visits> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml index f19b481c5c..49765ba76c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__ExamplePlugin.getExampleReport_day.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>My Label 2</label> - <nb_visits>5</nb_visits> - </row> - <row> <label>My Label 1</label> <nb_visits>1</nb_visits> </row> + <row> + <label>My Label 2</label> + <nb_visits>5</nb_visits> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index bd3ea31b16..db63e6a966 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -313,19 +313,15 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site Unknown,8,40,0%,5,00:15:01,0% Desktop,3,3,0%,1,00:00:00,100% -Visitor Browser -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Firefox,2,2,0%,1,00:00:00,100% -Opera,1,1,0%,1,00:00:00,100% - Device brand label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,11,43,0%,3.9,00:10:55,27% -Device model +Visitor Browser label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,11,43,0%,3.9,00:10:55,27% +Unknown,8,40,0%,5,00:15:01,0% +Firefox,2,2,0%,1,00:00:00,100% +Opera,1,1,0%,1,00:00:00,100% Browser version label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate @@ -333,6 +329,10 @@ Unknown,8,40,0%,5,00:15:01,0% Firefox 3.6,2,2,0%,1,00:00:00,100% Opera 9.63,1,1,0%,1,00:00:00,100% +Device model +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,11,43,0%,3.9,00:10:55,27% + Operating System families label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 161da940cd..5e42f00bd2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -275,18 +275,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);"> - Visitor Browser - </a> - </li> - <li> <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);"> Device brand </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);"> - Device model + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);"> + Visitor Browser </a> </li> <li> @@ -295,6 +290,11 @@ </a> </li> <li> + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(13,13,13);"> + Device model + </a> + </li> + <li> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(13,13,13);"> Operating System families </a> @@ -4520,8 +4520,8 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> - Visitor Browser +<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Device brand </h2> @@ -4529,7 +4529,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;"> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Browser + Device brand </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> Visits @@ -4554,73 +4554,23 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/brand/Unknown.ico'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style=";line-height: 22px;"> - <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/FF.gif'> - - Firefox </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% - </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(242,242,242);line-height: 22px;"> - <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/OP.gif'> - - Opera </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 11 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 43 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 1 + 3.9 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:10:55 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 27% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4632,8 +4582,8 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> - Device brand +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Visitor Browser </h2> @@ -4641,7 +4591,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;"> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Device brand + Browser </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> Visits @@ -4666,83 +4616,73 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/brand/Unknown.ico'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 11 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 43 + 40 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 3.9 + 5 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:10:55 + 00:15:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 27% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% </td> </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> - Back to top - </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> - Device model -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;"> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Device model - </th> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Visits - </th> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Actions - </th> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Actions per Visit - </th> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Bounce Rate - </th> - <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - + + <tr style=";line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> + + Firefox </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 100% + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> + + Opera </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 11 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 43 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 3.9 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:10:55 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 27% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% @@ -4866,6 +4806,66 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> +<h2 id="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Device model +</h2> + + + + <table style="border-collapse:collapse; margin-left: 5px;"> + <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;"> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Device model + </th> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Visits + </th> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Actions + </th> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Actions per Visit + </th> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Avg. Time on Website + </th> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Bounce Rate + </th> + <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> + Conversion Rate + </th> + </thead> + <tbody> + + <tr style="background-color: rgb(242,242,242);line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + Unknown </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 11 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 43 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 3.9 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 00:10:55 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 27% + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + </tbody> + </table> + <br/> + <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> + Back to top + </a> <h2 id="DevicesDetection_getOsFamilies" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> Operating System families </h2> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml index f19b481c5c..49765ba76c 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_day.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>My Label 2</label> - <nb_visits>5</nb_visits> - </row> - <row> <label>My Label 1</label> <nb_visits>1</nb_visits> </row> + <row> + <label>My Label 2</label> + <nb_visits>5</nb_visits> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml index f19b481c5c..49765ba76c 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__ExamplePlugin.getExampleReport_week.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>My Label 2</label> - <nb_visits>5</nb_visits> - </row> - <row> <label>My Label 1</label> <nb_visits>1</nb_visits> </row> + <row> + <label>My Label 2</label> + <nb_visits>5</nb_visits> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml index f19b481c5c..49765ba76c 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__ExamplePlugin.getExampleReport_day.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>My Label 2</label> - <nb_visits>5</nb_visits> - </row> - <row> <label>My Label 1</label> <nb_visits>1</nb_visits> </row> + <row> + <label>My Label 2</label> + <nb_visits>5</nb_visits> + </row> </result>
\ No newline at end of file |