Skip to content
Extraits de code Groupes Projets
Valider f31f0286 rédigé par benakamoorthi's avatar benakamoorthi
Parcourir les fichiers

Refs #3274, fix build & remove unneccessary timeSpentRef column from... 

Refs #3274, fix build & remove unneccessary timeSpentRef column from Live.getLastVisitsDetails API method.


git-svn-id: http://dev.piwik.org/svn/trunk@6690 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 4c68149e
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 42 ajouts et 4 suppressions
plugins/Live/API.php
+ 4
− 2
Voir le fichier @ f31f0286
......@@ -225,9 +225,11 @@ class Piwik_Live_API
// set the time spent for this action (which is the timeSpentRef of the next action)
if (isset($actionDetails[$actionIdx + 1]))
{
$timeSpent = $actionDetails[$actionIdx + 1]['timeSpentRef'];
$actionDetail['timeSpent'] = Piwik::getPrettyTimeFromSeconds($timeSpent);
$actionDetail['timeSpent'] = $actionDetails[$actionIdx + 1]['timeSpentRef'];
$actionDetail['timeSpentPretty'] = Piwik::getPrettyTimeFromSeconds($actionDetail['timeSpent']);
}
unset($actionDetails[$actionIdx]['timeSpentRef']); // not needed after timeSpent is added
}
// If the visitor converted a goal, we shall select all Goals
......
plugins/Live/templates/lastVisits.tpl
+ 1
− 1
Voir le fichier @ f31f0286
......@@ -53,7 +53,7 @@
{php}$col++; if ($col>=9) { $col=0; }{/php}
<a href="{$action.url|escape:'html'}" target="_blank">
{if $action.type == 'action'}
<img src="plugins/Live/templates/images/file{php} echo $col; {/php}.png" title="{if !empty($action.pageTitle)}{$action.pageTitle}{/if} - {$action.serverTimePretty|escape:'html'}{if isset($action.timeSpent)} - {'General_TimeOnPage'|translate}: {$action.timeSpent}{/if}" />
<img src="plugins/Live/templates/images/file{php} echo $col; {/php}.png" title="{if !empty($action.pageTitle)}{$action.pageTitle}{/if} - {$action.serverTimePretty|escape:'html'}{if isset($action.timeSpentPretty)} - {'General_TimeOnPage'|translate}: {$action.timeSpentPretty}{/if}" />
{elseif $action.type == 'outlink' || $action.type == 'download'}
<img class='iconPadding' src="{$action.icon}" title="{$action.url|escape:'html'} - {$action.serverTimePretty|escape:'html'}" />
{else}
......
plugins/Live/templates/visitorLog.tpl
+ 1
− 1
Voir le fichier @ f31f0286
......@@ -167,7 +167,7 @@
{if !$javascriptVariablesToSet.filterEcommerce
|| $action.type == 'ecommerceOrder'
|| $action.type == 'ecommerceAbandonedCart'}
<li class="{if !empty($action.goalName)}goal{else}action{/if}" title="{$action.serverTimePretty|escape:'html'}{if !empty($action.url) && strlen(trim($action.url))} - {$action.url|escape:'html'}{/if} {if strlen(trim($customVariablesTooltip))} - {$customVariablesTooltip}{/if}{if isset($action.timeSpent)} - {'General_TimeOnPage'|translate}: {$action.timeSpent}{/if}">
<li class="{if !empty($action.goalName)}goal{else}action{/if}" title="{$action.serverTimePretty|escape:'html'}{if !empty($action.url) && strlen(trim($action.url))} - {$action.url|escape:'html'}{/if} {if strlen(trim($customVariablesTooltip))} - {$customVariablesTooltip}{/if}{if isset($action.timeSpentPretty)} - {'General_TimeOnPage'|translate}: {$action.timeSpentPretty}{/if}">
{if $action.type == 'ecommerceOrder' || $action.type == 'ecommerceAbandonedCart'}
{* Ecommerce Abandoned Cart / Ecommerce Order *}
......
tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+ 12
− 0
Voir le fichier @ f31f0286
......@@ -108,6 +108,8 @@
<pageIdAction>2</pageIdAction>
<pageId>1</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -117,6 +119,8 @@
<pageIdAction>4</pageIdAction>
<pageId>2</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -126,6 +130,8 @@
<pageIdAction>5</pageIdAction>
<pageId>3</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon>themes/default/images/link.gif</icon>
</row>
<row>
......@@ -135,6 +141,8 @@
<pageIdAction>6</pageIdAction>
<pageId>4</pageId>
<timeSpent>72</timeSpent>
<timeSpentPretty>1 min 12s</timeSpentPretty>
<icon>themes/default/images/download.png</icon>
</row>
<row>
......@@ -144,6 +152,8 @@
<pageIdAction>7</pageIdAction>
<pageId>5</pageId>
<timeSpent>108</timeSpent>
<timeSpentPretty>1 min 48s</timeSpentPretty>
<icon>themes/default/images/link.gif</icon>
</row>
<row>
......@@ -153,6 +163,8 @@
<pageIdAction>5</pageIdAction>
<pageId>6</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon>themes/default/images/link.gif</icon>
</row>
<row>
......
tests/integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+ 4
− 0
Voir le fichier @ f31f0286
......@@ -147,6 +147,8 @@
<customVariableValue4>PRODUCT THREE LEFT in cart</customVariableValue4>
</row>
</customVariables>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -170,6 +172,8 @@
<customVariableValue4>PRODUCT THREE LEFT in cart</customVariableValue4>
</row>
</customVariables>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......
tests/integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+ 20
− 0
Voir le fichier @ f31f0286
......@@ -34,6 +34,8 @@
<customVariableValue4>PRODUCT THREE LEFT in cart</customVariableValue4>
</row>
</customVariables>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -57,6 +59,8 @@
<customVariableValue4>PRODUCT THREE LEFT in cart</customVariableValue4>
</row>
</customVariables>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -203,6 +207,8 @@
<customVariableValue5>Electronics &amp; Cameras</customVariableValue5>
</row>
</customVariables>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -218,6 +224,8 @@
<customVariableValue5>Electronics &amp; Cameras</customVariableValue5>
</row>
</customVariables>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -245,6 +253,8 @@
<customVariableValue5>Electronics &amp; Cameras</customVariableValue5>
</row>
</customVariables>
<timeSpent>720</timeSpent>
<timeSpentPretty>12 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -324,6 +334,8 @@
<customVariableValue4>PRODUCT THREE LEFT in cart</customVariableValue4>
</row>
</customVariables>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -347,6 +359,8 @@
<customVariableValue4>PRODUCT THREE LEFT in cart</customVariableValue4>
</row>
</customVariables>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -514,6 +528,8 @@
<customVariableValue5>Electronics &amp; Cameras</customVariableValue5>
</row>
</customVariables>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -541,6 +557,8 @@
<customVariableValue5>Electronics &amp; Cameras</customVariableValue5>
</row>
</customVariables>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
<icon />
</row>
<row>
......@@ -560,6 +578,8 @@
<customVariableValue4>PRODUCT name</customVariableValue4>
</row>
</customVariables>
<timeSpent>0</timeSpent>
<timeSpentPretty>0s</timeSpentPretty>
<icon />
</row>
<row>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter