Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tracking: Write current interaction position for all actions #12125

Merged
merged 4 commits into from
Sep 27, 2017
Merged

Tracking: Write current interaction position for all actions #12125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5db474
write current interaction position for all actions
tsteur Sep 26, 2017
16c2c55
fix some tests
tsteur Sep 27, 2017
fc84f31
fix more tests
tsteur Sep 27, 2017
cd8fb34
update tests
tsteur Sep 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion plugins/Actions/Columns/InteractionPosition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/
namespace Piwik\Plugins\Actions\Columns;

use Piwik\Plugins\Events\Actions\ActionEvent;
use Piwik\Tracker\Action;
use Piwik\Tracker\Request;
use Piwik\Tracker\Visitor;
Expand All @@ -33,7 +34,13 @@ public function onNewAction(Request $request, Visitor $visitor, Action $action)
if ($shouldCount && $visitor->isNewVisit()) {
return 1;
} else if ($shouldCount) {
return VisitTotalInteractions::getCurrentInteractionPosition($request);
return VisitTotalInteractions::getNextInteractionPosition($request);
}

// we re-use same interaction position as last page view eg for events etc.
$position = VisitTotalInteractions::getCurrentInteractionPosition($request);
if ($position >= 1) {
return $position;
}

return false;
Expand Down
11 changes: 11 additions & 0 deletions plugins/Actions/Columns/VisitTotalInteractions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,17 @@ public static function getCurrentInteractionPosition($request)
{
$position = $request->getMetadata('Actions', 'visit_total_interactions');

return (int) $position;
}

/**
* @param Request $request
* @return int
*/
public static function getNextInteractionPosition($request)
{
$position = self::getCurrentInteractionPosition($request);

$position = $position + 1;

// Remove this in Piwik 4
Expand Down
66 changes: 38 additions & 28 deletions plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -56,7 +56,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -74,7 +74,7 @@
<contentTarget>http://www.example.com</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -92,7 +92,7 @@
<contentTarget>http://www.example.com</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -110,7 +110,7 @@
<contentTarget>http://www.example.com</contentTarget>
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -128,7 +128,7 @@
<contentTarget>http://piwik.org/download</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -146,7 +146,7 @@
<contentTarget>http://piwik.org/</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -164,7 +164,7 @@
<contentTarget>http://piwik.org/download</contentTarget>
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -182,7 +182,7 @@
<contentTarget>http://piwik.org/download</contentTarget>
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -200,7 +200,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -218,7 +218,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -230,13 +230,18 @@









<userId />
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>0</visitConverted>
<visitConvertedIcon />
<visitCount>1</visitCount>

<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>0</daysSinceFirstVisit>
Expand Down Expand Up @@ -272,10 +277,10 @@
<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
<totalEcommerceRevenue>0</totalEcommerceRevenue>
<totalEcommerceConversions>0</totalEcommerceConversions>
<totalEcommerceItems>0</totalEcommerceItems>
<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
<totalAbandonedCarts>0</totalAbandonedCarts>
<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
<events>0</events>
Expand Down Expand Up @@ -350,7 +355,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -368,7 +373,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -386,7 +391,7 @@
<contentTarget>http://www.example.com</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -404,7 +409,7 @@
<contentTarget>http://www.example.com</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -422,7 +427,7 @@
<contentTarget>http://www.example.com</contentTarget>
<contentInteraction>submit</contentInteraction>
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -440,7 +445,7 @@
<contentTarget>http://piwik.org/download</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -458,7 +463,7 @@
<contentTarget>http://piwik.org/</contentTarget>
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -476,7 +481,7 @@
<contentTarget>http://piwik.org/download</contentTarget>
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -494,7 +499,7 @@
<contentTarget>http://piwik.org/download</contentTarget>
<contentInteraction>click</contentInteraction>
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -512,7 +517,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -530,7 +535,7 @@
<contentTarget />
<contentInteraction />
<bandwidth />
<interactionPosition />
<interactionPosition>1</interactionPosition>

<bandwidth_pretty>0 M</bandwidth_pretty>
</row>
Expand All @@ -542,13 +547,18 @@









<userId />
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>0</visitConverted>
<visitConvertedIcon />
<visitCount>1</visitCount>

<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<daysSinceFirstVisit>0</daysSinceFirstVisit>
Expand Down Expand Up @@ -584,10 +594,10 @@
<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
<totalEcommerceRevenue>0</totalEcommerceRevenue>
<totalEcommerceConversions>0</totalEcommerceConversions>
<totalEcommerceItems>0</totalEcommerceItems>
<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
<totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue>
<totalAbandonedCarts>0</totalAbandonedCarts>
<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
<events>0</events>
Expand Down
Loading