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

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2019-05-15 02:43:15 +0300
committerGitHub <noreply@github.com>2019-05-15 02:43:15 +0300
commit0af1f22f728b2bb2232f84ace5f4b5f0c3c60c57 (patch)
tree0eb34d450b850c1fe4253261d5e6c7de9edd3b33 /plugins/Goals
parent4b81b3b8eea9d0e361a5219164b08b850a30392d (diff)
Indent actions belonging to a pageview (#14063)
* Proof of concept for grouping actions by the page they occur in. * Add pageview to goals/ecommerce actionDetails in Live.getLastVisitsDetails. * Make count of actions to display when collapsed configurable. * Quick selector fix. * unfinished commit * Collapse multiple adjacent content items in the visitor log. * Get content collapsing to work w/ 3.x-dev changes. * Forgot to add Live config file. * Get to work w/ visitor profile and make sure last action does not have border so it looks like it correctly ends. * Fix some issues from review. * More styling tweaks. * another styling tweak * Update screenshots. * Show page refreshes and allow expanding them in new implementation. * Update some screenshots. * Make sure tooltip is replaced correctly when showing refreshes. * Another styling tweak. * Add UI test + fix page refresh issue. * Fix action group merging logic. * Fix another actions grouping issue. * Fixes for ending left border in certain edge cases. * Another UI tweak. * comparison threshold, random failure fix, update screenshots + another css tweak * more css tweaks * possible bug fix * Last couple CSS fixes. * More test fixes.
Diffstat (limited to 'plugins/Goals')
-rw-r--r--plugins/Goals/VisitorDetails.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/Goals/VisitorDetails.php b/plugins/Goals/VisitorDetails.php
index 2f94476093..7c52c0b899 100644
--- a/plugins/Goals/VisitorDetails.php
+++ b/plugins/Goals/VisitorDetails.php
@@ -70,12 +70,15 @@ class VisitorDetails extends VisitorDetailsAbstract
'goal' as type,
goal.name as goalName,
goal.idgoal as goalId,
+ log_link_visit_action.idpageview,
log_conversion.revenue as revenue,
log_conversion.idlink_va,
log_conversion.idlink_va as goalPageId,
log_conversion.server_time as serverTimePretty,
log_conversion.url as url
FROM " . Common::prefixTable('log_conversion') . " AS log_conversion
+ LEFT JOIN " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action
+ ON log_link_visit_action.idlink_va = log_conversion.idlink_va
LEFT JOIN " . Common::prefixTable('goal') . " AS goal
ON (goal.idsite = log_conversion.idsite
AND
@@ -83,7 +86,7 @@ class VisitorDetails extends VisitorDetailsAbstract
AND goal.deleted = 0
WHERE log_conversion.idvisit IN ('" . implode("','", $idVisits) . "')
AND log_conversion.idgoal > 0
- ORDER BY log_conversion.idvisit, server_time ASC
+ ORDER BY log_conversion.idvisit, log_conversion.server_time ASC
";
return Db::fetchAll($sql);
}