diff options
Diffstat (limited to 'plugins/Contents')
21 files changed, 2285 insertions, 158 deletions
diff --git a/plugins/Contents/Columns/ContentInteraction.php b/plugins/Contents/Columns/ContentInteraction.php index 149ed94059..a50467f9d6 100644 --- a/plugins/Contents/Columns/ContentInteraction.php +++ b/plugins/Contents/Columns/ContentInteraction.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Contents\Columns; use Piwik\Piwik; use Piwik\Plugin\Dimension\ActionDimension; use Piwik\Plugins\Actions\Segment; +use Piwik\Plugins\Contents\Actions\ActionContent; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -40,12 +41,11 @@ class ContentInteraction extends ActionDimension public function onLookupAction(Request $request, Action $action) { - $interaction = $request->getParam('c_i'); - - if (empty($interaction)) { + if (!($action instanceof ActionContent)) { return false; } + $interaction = $request->getParam('c_i'); $interaction = trim($interaction); if (strlen($interaction) > 0) { diff --git a/plugins/Contents/Columns/ContentName.php b/plugins/Contents/Columns/ContentName.php index 5ed5485791..6168a48725 100644 --- a/plugins/Contents/Columns/ContentName.php +++ b/plugins/Contents/Columns/ContentName.php @@ -8,9 +8,11 @@ */ namespace Piwik\Plugins\Contents\Columns; +use Piwik\Exception\InvalidRequestParameterException; use Piwik\Piwik; use Piwik\Plugin\Dimension\ActionDimension; use Piwik\Plugins\Actions\Segment; +use Piwik\Plugins\Contents\Actions\ActionContent; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -40,18 +42,17 @@ class ContentName extends ActionDimension public function onLookupAction(Request $request, Action $action) { - $contentName = $request->getParam('c_n'); - - if (empty($contentName)) { + if (!($action instanceof ActionContent)) { return false; } + $contentName = $request->getParam('c_n'); $contentName = trim($contentName); if (strlen($contentName) > 0) { return $contentName; } - return false; + throw new InvalidRequestParameterException('Param `c_n` must not be empty or filled with whitespaces'); } }
\ No newline at end of file diff --git a/plugins/Contents/Columns/ContentPiece.php b/plugins/Contents/Columns/ContentPiece.php index 6affe9a3d0..4cd0722e5a 100644 --- a/plugins/Contents/Columns/ContentPiece.php +++ b/plugins/Contents/Columns/ContentPiece.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Contents\Columns; use Piwik\Piwik; use Piwik\Plugin\Dimension\ActionDimension; use Piwik\Plugins\Actions\Segment; +use Piwik\Plugins\Contents\Actions\ActionContent; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -40,12 +41,11 @@ class ContentPiece extends ActionDimension public function onLookupAction(Request $request, Action $action) { - $contentPiece = $request->getParam('c_p'); - - if (empty($contentPiece)) { + if (!($action instanceof ActionContent)) { return false; } + $contentPiece = $request->getParam('c_p'); $contentPiece = trim($contentPiece); if (strlen($contentPiece) > 0) { diff --git a/plugins/Contents/Columns/ContentTarget.php b/plugins/Contents/Columns/ContentTarget.php index 26c7a0d7a2..9e81c687f3 100644 --- a/plugins/Contents/Columns/ContentTarget.php +++ b/plugins/Contents/Columns/ContentTarget.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Contents\Columns; use Piwik\Piwik; use Piwik\Plugin\Dimension\ActionDimension; use Piwik\Plugins\Actions\Segment; +use Piwik\Plugins\Contents\Actions\ActionContent; use Piwik\Tracker\Action; use Piwik\Tracker\Request; @@ -40,6 +41,10 @@ class ContentTarget extends ActionDimension public function onLookupAction(Request $request, Action $action) { + if (!($action instanceof ActionContent)) { + return false; + } + $contentTarget = $request->getParam('c_t'); $contentTarget = trim($contentTarget); diff --git a/plugins/Contents/Contents.php b/plugins/Contents/Contents.php index 99e47bf8fd..289bdb25ec 100644 --- a/plugins/Contents/Contents.php +++ b/plugins/Contents/Contents.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugins\Contents; +use Piwik\Common; use Piwik\Piwik; class Contents extends \Piwik\Plugin @@ -21,6 +22,7 @@ class Contents extends \Piwik\Plugin 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', 'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations', 'AssetManager.getJavaScriptFiles' => 'getJsFiles', + 'Actions.getCustomActionDimensionFieldsAndJoins' => 'provideActionDimensionFields' ); } @@ -41,4 +43,20 @@ class Contents extends \Piwik\Plugin $translations['nb_impressions'] = Piwik::translate('Contents_ImpressionsMetricDocumentation'); $translations['nb_interactions'] = Piwik::translate('Contents_InteractionsMetricDocumentation'); } + + public function provideActionDimensionFields(&$fields, &$joins) + { + $fields[] = 'log_action_content_name.name as contentName'; + $fields[] = 'log_action_content_piece.name as contentPiece'; + $fields[] = 'log_action_content_target.name as contentTarget'; + $fields[] = 'log_action_content_interaction.name as contentInteraction'; + $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_name + ON log_link_visit_action.idaction_content_name = log_action_content_name.idaction'; + $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_piece + ON log_link_visit_action.idaction_content_piece = log_action_content_piece.idaction'; + $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_target + ON log_link_visit_action.idaction_content_target = log_action_content_target.idaction'; + $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_interaction + ON log_link_visit_action.idaction_content_interaction = log_action_content_interaction.idaction'; + } } diff --git a/plugins/Contents/VisitorDetails.php b/plugins/Contents/VisitorDetails.php new file mode 100644 index 0000000000..acf3363d38 --- /dev/null +++ b/plugins/Contents/VisitorDetails.php @@ -0,0 +1,50 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Contents; + +use Piwik\Plugins\Live\VisitorDetailsAbstract; +use Piwik\Tracker\Action; +use Piwik\View; + +class VisitorDetails extends VisitorDetailsAbstract +{ + public function extendActionDetails(&$action, $nextAction, $visitorDetails) + { + if ($action['type'] != Action::TYPE_CONTENT) { + unset($action['contentName']); + unset($action['contentPiece']); + unset($action['contentTarget']); + unset($action['contentInteraction']); + } + } + + public function renderAction($action, $previousAction, $visitorDetails) + { + if ($action['type'] != Action::TYPE_CONTENT) { + return; + } + + $view = new View('@Contents/_actionContent.twig'); + $view->action = $action; + $view->previousAction = $previousAction; + $view->visitInfo = $visitorDetails; + return $view->render(); + } + + public function renderActionTooltip($action, $visitInfo) + { + if ($action['type'] != Action::TYPE_CONTENT) { + return []; + } + + $view = new View('@Contents/_actionTooltip'); + $view->action = $action; + return [[ 10, $view->render() ]]; + } +}
\ No newline at end of file diff --git a/plugins/Contents/lang/el.json b/plugins/Contents/lang/el.json index 1460b25528..59afbdcfaf 100644 --- a/plugins/Contents/lang/el.json +++ b/plugins/Contents/lang/el.json @@ -2,6 +2,7 @@ "Contents": { "PluginDescription": "Η παρακολούθηση περιεχομένου και εικόνων επιτρέπει να μετράτε την απόδοση (επισκέψεις, κλικ, CTR) οποιουδήποτε είδους περιεχομένου των σελίδων σας (εικόνες διαφημίσεων, εικόνες, οποιαδήποτε αντικείμενα).", "Impressions": "Αποτυπώσεις", + "ContentImpression": "Αποτύπωμα Περιεχομένου", "ContentInteraction": "Αλληλεπίδραση σε Περιεχόμενο", "ContentInteractions": "Αλληλεπιδράσεις σε Περιεχόμενο", "InteractionRate": "Ρυθμός αλληλεπίδρασης", diff --git a/plugins/Contents/lang/en.json b/plugins/Contents/lang/en.json index 915b9d9746..0947590f69 100644 --- a/plugins/Contents/lang/en.json +++ b/plugins/Contents/lang/en.json @@ -2,6 +2,7 @@ "Contents": { "PluginDescription": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).", "Impressions": "Impressions", + "ContentImpression": "Content Impression", "ContentInteraction": "Content Interaction", "ContentInteractions": "Content Interactions", "InteractionRate": "Interaction Rate", diff --git a/plugins/Contents/lang/id.json b/plugins/Contents/lang/id.json new file mode 100644 index 0000000000..ab3e8d9707 --- /dev/null +++ b/plugins/Contents/lang/id.json @@ -0,0 +1,11 @@ +{ + "Contents": { + "Impressions": "Impresi", + "ContentInteraction": "Interaksi Konten", + "ContentInteractions": "Interaksi Konten", + "InteractionRate": "Nilai Interaksi", + "ContentName": "Nama Konten", + "ContentPiece": "Potongan Konten", + "Contents": "Konten" + } +}
\ No newline at end of file diff --git a/plugins/Contents/lang/pl.json b/plugins/Contents/lang/pl.json index f80a193a26..4910ef0655 100644 --- a/plugins/Contents/lang/pl.json +++ b/plugins/Contents/lang/pl.json @@ -1,6 +1,17 @@ { "Contents": { + "PluginDescription": "Śledzenie treści i banerów pozwala Ci zmierzyć wydajność (wyświetleń, kliknięć, CTR) dowolnego fragmentu treści na Twojej stronie (baner reklamowy, obrazek, dowolny element).", + "Impressions": "Wyświetlenia treści", + "ContentImpression": "Wyświetlenia treści", + "ContentInteraction": "Interakcja", + "ContentInteractions": "Interakcje", + "InteractionRate": "Częstość interakcji", "ContentName": "Nazwa treści", - "Contents": "Treść" + "ContentPiece": "Fragment treści", + "ContentTarget": "Cel treści", + "Contents": "Treść", + "InteractionsMetricDocumentation": "Liczba interakcji wykonanych na zawartości (np. 'kliknięcie' w baner lub reklamę).", + "ImpressionsMetricDocumentation": "Liczba wyświetleń bloku treści, takiego jak baner czy reklama, na stronie.", + "InteractionRateMetricDocumentation": "Stosunek wyświetleń treści do interakcji" } }
\ No newline at end of file diff --git a/plugins/Contents/lang/ru.json b/plugins/Contents/lang/ru.json index 6240e4888f..8b5b48fe3c 100644 --- a/plugins/Contents/lang/ru.json +++ b/plugins/Contents/lang/ru.json @@ -2,6 +2,8 @@ "Contents": { "PluginDescription": "Отслеживание контента и баннеров позволяет вам измерять эффективность (просмотры, клики, CTR) любой части контента на ваших страницах (баннер-реклама, изображение, любой элемент).", "Impressions": "Показы", + "ContentInteraction": "Взаимодействие с контентом", + "ContentInteractions": "Взаимодействия с контентом", "InteractionRate": "Коэффициент взаимодествия", "ContentName": "Название публикации", "ContentPiece": "Часть публикации", diff --git a/plugins/Contents/lang/sv.json b/plugins/Contents/lang/sv.json index 5562463bca..053eb2c4ce 100644 --- a/plugins/Contents/lang/sv.json +++ b/plugins/Contents/lang/sv.json @@ -2,6 +2,8 @@ "Contents": { "PluginDescription": "Innehålls- och bannertracking ger dig möjlighet att mäta prestanda (visningar, klick, CTR) för alla typer av innehåll på dina sidor (bannerannonser, bilder mm).", "Impressions": "Visningar", + "ContentInteraction": "Innehållsinteraktion", + "ContentInteractions": "Innehållsinteraktioner", "InteractionRate": "Andel interaktioner", "ContentName": "Namn på innehåll", "ContentPiece": "Innehållsdel", diff --git a/plugins/Contents/lang/zh-cn.json b/plugins/Contents/lang/zh-cn.json index 9ed12a2719..e423e21b51 100644 --- a/plugins/Contents/lang/zh-cn.json +++ b/plugins/Contents/lang/zh-cn.json @@ -1,16 +1,16 @@ { "Contents": { - "PluginDescription": "内容和横幅跟踪，您可以衡量您的网页上任何一部分内容（横幅广告，图像，任何项目）的性能（浏览次数，点击次数，点击率）。", - "Impressions": "印象", - "ContentInteraction": "内容交互", - "ContentInteractions": "内容交互", + "PluginDescription": "追踪内容和横幅可以让您衡量您网页上任何一部分内容（横幅广告，图像，任何项目）的表现（浏览次数，点击次数，点击率）。", + "Impressions": "展示次数", + "ContentInteraction": "内容互动", + "ContentInteractions": "内容互动", "InteractionRate": "互动率", "ContentName": "内容名称", - "ContentPiece": "内容块", + "ContentPiece": "内容区块", "ContentTarget": "内容目标", "Contents": "内容", - "InteractionsMetricDocumentation": "内容块上的互动次数(例如，点击横幅或广告)", - "ImpressionsMetricDocumentation": "内容块的次数，例如显示在页面上的一个横幅或是广告。", + "InteractionsMetricDocumentation": "内容区块的互动次数（例如点击横幅或广告）", + "ImpressionsMetricDocumentation": "内容区块（例如横幅或广告）在页面上的展示次数。", "InteractionRateMetricDocumentation": "内容展示和互动的比率。" } }
\ No newline at end of file diff --git a/plugins/Contents/lang/zh-tw.json b/plugins/Contents/lang/zh-tw.json index e9496f622e..ce6c197ad5 100644 --- a/plugins/Contents/lang/zh-tw.json +++ b/plugins/Contents/lang/zh-tw.json @@ -2,6 +2,7 @@ "Contents": { "PluginDescription": "追蹤內容和橫幅讓你衡量網頁中任何區塊內容（橫幅廣告、圖片、任何項目）的表現（瀏覽數、點擊數、CTR）。", "Impressions": "曝光", + "ContentImpression": "內容曝光", "ContentInteraction": "內容互動", "ContentInteractions": "內容互動", "InteractionRate": "互動率", diff --git a/plugins/Contents/templates/_actionContent.twig b/plugins/Contents/templates/_actionContent.twig new file mode 100644 index 0000000000..138f0e350e --- /dev/null +++ b/plugins/Contents/templates/_actionContent.twig @@ -0,0 +1,15 @@ +<li class="content" + title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}"> + <div> + {% if action.contentInteraction %} + <span class="icon-document action-list-action-icon" title="{{ 'Contents_ContentInteraction'|translate }}"></span> + {% else %} + <span class="icon-show action-list-action-icon" title="{{ 'Contents_ContentImpression'|translate }}"></span> + {% endif %} + {% if action.contentInteraction %} + [{{ action.contentInteraction }}] + {% endif %} + {{ action.contentName }} - + {{ action.contentPiece }} + </div> +</li> diff --git a/plugins/Contents/templates/_actionTooltip.twig b/plugins/Contents/templates/_actionTooltip.twig new file mode 100644 index 0000000000..c81c6883b4 --- /dev/null +++ b/plugins/Contents/templates/_actionTooltip.twig @@ -0,0 +1,9 @@ +{% if action.contentName %} + +{{ 'Contents_ContentName'|translate }}: {{ action.contentName }}{% endif %}{% if action.contentPiece %} + +{{ 'Contents_ContentPiece'|translate }}: {{ action.contentPiece }}{% endif %}{% if action.contentTarget %} + +{{ 'Contents_ContentTarget'|translate }}: {{ action.contentTarget }}{% endif %}{% if action.contentInteraction %} + +{{ 'Contents_ContentInteraction'|translate }}: {{ action.contentInteraction }}{% endif %}
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 0513e6b34b..52061fb273 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -12,14 +12,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>1</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>2</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>3</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>4</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>5</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>6</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>7</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>8</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>9</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>10</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>11</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>12</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -71,6 +272,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -89,9 +296,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -100,17 +311,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -124,14 +324,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>13</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>14</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>15</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>16</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>17</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>18</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>19</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>20</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>21</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>22</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>23</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>24</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -183,6 +584,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -201,23 +608,16 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 0513e6b34b..52061fb273 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -12,14 +12,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>1</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>2</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>3</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>4</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>5</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>6</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>7</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>8</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>9</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>10</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>11</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>12</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -71,6 +272,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -89,9 +296,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -100,17 +311,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -124,14 +324,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>13</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>14</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>15</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>16</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>17</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>18</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>19</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>20</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>21</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>22</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>23</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>24</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -183,6 +584,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -201,23 +608,16 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 0513e6b34b..52061fb273 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -12,14 +12,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>1</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>2</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>3</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>4</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>5</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>6</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>7</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>8</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>9</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>10</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>11</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>12</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -71,6 +272,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -89,9 +296,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -100,17 +311,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -124,14 +324,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>13</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>14</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>15</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>16</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>17</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>18</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>19</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>20</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>21</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>22</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>23</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>24</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -183,6 +584,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -201,23 +608,16 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 0513e6b34b..52061fb273 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -12,14 +12,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>1</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>2</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>3</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>4</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>5</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>6</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>7</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>8</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>9</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>10</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>11</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>12</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -71,6 +272,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -89,9 +296,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -100,17 +311,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -124,14 +324,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>13</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>14</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>15</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>16</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>17</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>18</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>19</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>20</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>21</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>22</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>23</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>24</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -183,6 +584,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -201,23 +608,16 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 0513e6b34b..52061fb273 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -12,14 +12,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>1</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>2</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>3</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>4</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>5</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>6</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>7</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>8</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>9</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>10</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>11</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>12</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -71,6 +272,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -89,9 +296,13 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>flash, java</plugins> + <plugins>cookie, flash, java</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> @@ -100,17 +311,6 @@ <pluginName>java</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> <row> <idSite>1</idSite> @@ -124,14 +324,215 @@ <pageTitle>Ads</pageTitle> <pageIdAction>2</pageIdAction> + <pageId>13</pageId> + <bandwidth /> + <timeSpent>271</timeSpent> + <timeSpentPretty>4 min 31s</timeSpentPretty> <generationTimeMilliseconds>333</generationTimeMilliseconds> <generationTime>0.33s</generationTime> <interactionPosition>1</interactionPosition> - <timeSpent>271</timeSpent> - <timeSpentPretty>4 min 31s</timeSpentPretty> <icon /> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>14</pageId> + <contentName>ImageAd</contentName> + <contentPiece>Unknown</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>15</pageId> + <contentName>ImageAd</contentName> + <contentPiece /> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>120</timeSpentRef> + <pageId>16</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>17</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad2.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>18</pageId> + <contentName>ImageAd</contentName> + <contentPiece>/path/ad.jpg</contentPiece> + <contentTarget>http://www.example.com</contentTarget> + <contentInteraction>submit</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>19</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>20</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/</contentTarget> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>21</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>0</timeSpentRef> + <pageId>22</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click NOW</contentPiece> + <contentTarget>http://piwik.org/download</contentTarget> + <contentInteraction>click</contentInteraction> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>60</timeSpentRef> + <pageId>23</pageId> + <contentName>Text Ad</contentName> + <contentPiece>Click to download Piwik now</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>13</type> + <url>http://www.example.org/page</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <timeSpentRef>30</timeSpentRef> + <pageId>24</pageId> + <contentName>Video Ad</contentName> + <contentPiece>movie.mov</contentPiece> + <contentTarget /> + <contentInteraction /> + <bandwidth /> + <interactionPosition /> + + <bandwidth_pretty>0 M</bandwidth_pretty> </row> </actionDetails> <goalConversions>0</goalConversions> @@ -183,6 +584,12 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> + <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> <continent>Europe</continent> <continentCode>eur</continentCode> @@ -201,23 +608,16 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>director</plugins> + <plugins>cookie, director</plugins> <pluginsIcons> <row> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> + <pluginName>cookie</pluginName> + </row> + <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> - - - - - - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> - <totalEcommerceConversions>0</totalEcommerceConversions> - <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> - <totalAbandonedCarts>0</totalAbandonedCarts> - <totalAbandonedCartsItems>0</totalAbandonedCartsItems> </row> </result>
\ No newline at end of file |