diff options
13 files changed, 227 insertions, 211 deletions
diff --git a/core/API/DataTablePostProcessor.php b/core/API/DataTablePostProcessor.php index b4560889c8..2c5e4625ab 100644 --- a/core/API/DataTablePostProcessor.php +++ b/core/API/DataTablePostProcessor.php @@ -375,8 +375,9 @@ class DataTablePostProcessor $dataTable->setMetadata(self::PROCESSED_METRICS_FORMATTED_FLAG, true); if ($metricsToFormat !== null) { - $processedMetrics = array_filter($processedMetrics, function (ProcessedMetric $metric) use ($metricsToFormat) { - return in_array($metric->getName(), $metricsToFormat); + $metricMatchRegex = $this->makeRegexToMatchMetrics($metricsToFormat); + $processedMetrics = array_filter($processedMetrics, function (ProcessedMetric $metric) use ($metricMatchRegex) { + return preg_match($metricMatchRegex, $metric->getName()); }); } @@ -403,4 +404,17 @@ class DataTablePostProcessor { $dataTable->filter(array($this, 'computeProcessedMetrics')); } + + private function makeRegexToMatchMetrics($metricsToFormat) + { + $metricsRegexParts = array(); + foreach ($metricsToFormat as $metricFilter) { + if ($metricFilter[0] == '/') { + $metricsRegexParts[] = '(?:' . substr($metricFilter, 1, strlen($metricFilter) - 2) . ')'; + } else { + $metricsRegexParts[] = preg_quote($metricFilter); + } + } + return '/^' . implode('|', $metricsRegexParts) . '$/'; + } }
\ No newline at end of file diff --git a/core/API/Inconsistencies.php b/core/API/Inconsistencies.php index 70735972a1..58bd7404ba 100644 --- a/core/API/Inconsistencies.php +++ b/core/API/Inconsistencies.php @@ -30,8 +30,10 @@ class Inconsistencies 'conversion_rate', 'interaction_rate', 'exit_rate', - 'bounce_rate_returning' - // TODO: what about goal & evolution metrics? need to use regex i guess. + 'bounce_rate_returning', + 'nb_visits_percentage', + '/.*_evolution/', + '/goal_.*_conversion_rate/' ); } }
\ No newline at end of file diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 35368516db..5cbe823cd9 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -330,7 +330,7 @@ class Visitor implements VisitorInterface $actionDetail['eventValue'] = round($actionDetail['custom_float'], self::EVENT_VALUE_PRECISION); } } elseif ($actionDetail['custom_float'] > 0) { - $actionDetail['generationTime'] = $formatter->getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000); + $actionDetail['generationTime'] = $formatter->getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000, true); } unset($actionDetail['custom_float']); diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 8207e23bb6..d6453075a7 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -123,9 +123,9 @@ class API extends \Piwik\Plugin\API $table = $this->getSumVisitsLength($idSite, $period, $date, $segment); if (is_object($table)) { $table->filter('ColumnCallbackReplace', - array('sum_visit_length', array($formatter, 'getPrettyTimeFromSeconds'))); + array('sum_visit_length', array($formatter, 'getPrettyTimeFromSeconds'), array(true))); } else { - $table = $formatter->getPrettyTimeFromSeconds($table); + $table = $formatter->getPrettyTimeFromSeconds($table, true); } return $table; } diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 188f7cb3c2..b7a2b4a74e 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -19,7 +19,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s pitch black...</pageTitle> + <pageTitle>It's pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>61</pageId> @@ -131,7 +131,7 @@ <pageId>30</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -148,7 +148,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -193,7 +193,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -282,7 +282,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>29</pageId> @@ -412,7 +412,7 @@ <pageId>27</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -457,7 +457,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -546,7 +546,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>26</pageId> @@ -676,7 +676,7 @@ <pageId>23</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -693,7 +693,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -738,7 +738,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -827,7 +827,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>22</pageId> @@ -957,7 +957,7 @@ <pageId>20</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1002,7 +1002,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -1091,7 +1091,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>19</pageId> @@ -1221,7 +1221,7 @@ <pageId>16</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1238,7 +1238,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -1283,7 +1283,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -1372,7 +1372,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>15</pageId> @@ -1502,7 +1502,7 @@ <pageId>13</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1547,7 +1547,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -1641,7 +1641,7 @@ <pageId>52</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1686,7 +1686,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -1767,7 +1767,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>12</pageId> @@ -1892,7 +1892,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>51</pageId> @@ -2022,7 +2022,7 @@ <pageId>9</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -2039,7 +2039,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -2084,7 +2084,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -2178,7 +2178,7 @@ <pageId>48</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -2195,7 +2195,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -2240,7 +2240,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -2321,7 +2321,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>8</pageId> @@ -2446,7 +2446,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>47</pageId> @@ -2576,7 +2576,7 @@ <pageId>6</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -2621,7 +2621,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -2715,7 +2715,7 @@ <pageId>38</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -2760,7 +2760,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -2854,7 +2854,7 @@ <pageId>45</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -2899,7 +2899,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -2985,7 +2985,7 @@ <pageId>59</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -3030,7 +3030,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -3119,7 +3119,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>5</pageId> @@ -3244,7 +3244,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>37</pageId> @@ -3369,7 +3369,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>44</pageId> @@ -3494,7 +3494,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>58</pageId> @@ -3624,7 +3624,7 @@ <pageId>2</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -3641,7 +3641,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -3686,7 +3686,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -3780,7 +3780,7 @@ <pageId>34</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -3797,7 +3797,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -3842,7 +3842,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -3936,7 +3936,7 @@ <pageId>41</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -3953,7 +3953,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -3998,7 +3998,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -4084,7 +4084,7 @@ <pageId>55</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -4101,7 +4101,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -4146,7 +4146,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -4235,7 +4235,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>1</pageId> @@ -4360,7 +4360,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>33</pageId> @@ -4485,7 +4485,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>40</pageId> @@ -4610,7 +4610,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>54</pageId> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index a0cd8d2485..dafd6523e3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -220,7 +220,7 @@ <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -233,7 +233,7 @@ <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>420</timeSpent> - <timeSpentPretty>7 min 0s</timeSpentPretty> + <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -246,7 +246,7 @@ <eventAction>Search</eventAction> <eventName>Search query here</eventName> <timeSpent>900</timeSpent> - <timeSpentPretty>15 min 0s</timeSpentPretty> + <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -259,7 +259,7 @@ <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -273,7 +273,7 @@ <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> <timeSpent>720</timeSpent> - <timeSpentPretty>12 min 0s</timeSpentPretty> + <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -310,7 +310,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <visitDurationPretty>58 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> @@ -489,9 +489,9 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> - <generationTime>0.33s</generationTime> + <generationTime>00:00:00.33</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -518,9 +518,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -537,9 +537,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -556,9 +556,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -575,7 +575,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -594,7 +594,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -613,7 +613,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -633,10 +633,10 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> - <timeSpentPretty>24 min 59s</timeSpentPretty> + <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -646,9 +646,9 @@ <pageIdAction>12</pageIdAction> <pageId>9</pageId> - <generationTime>0.67s</generationTime> + <generationTime>00:00:00.66</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -661,7 +661,7 @@ <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -674,7 +674,7 @@ <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -687,7 +687,7 @@ <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -700,7 +700,7 @@ <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -713,7 +713,7 @@ <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -749,7 +749,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> @@ -1025,7 +1025,7 @@ <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1038,7 +1038,7 @@ <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>420</timeSpent> - <timeSpentPretty>7 min 0s</timeSpentPretty> + <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1051,7 +1051,7 @@ <eventAction>Search</eventAction> <eventName>Search query here</eventName> <timeSpent>900</timeSpent> - <timeSpentPretty>15 min 0s</timeSpentPretty> + <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1064,7 +1064,7 @@ <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1078,7 +1078,7 @@ <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> <timeSpent>720</timeSpent> - <timeSpentPretty>12 min 0s</timeSpentPretty> + <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1115,7 +1115,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <visitDurationPretty>58 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> @@ -1286,9 +1286,9 @@ <pageIdAction>2</pageIdAction> <pageId>25</pageId> - <generationTime>0.33s</generationTime> + <generationTime>00:00:00.33</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1315,9 +1315,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1334,9 +1334,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1353,9 +1353,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1372,7 +1372,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1391,7 +1391,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1410,7 +1410,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -1430,10 +1430,10 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> - <timeSpentPretty>24 min 59s</timeSpentPretty> + <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1443,9 +1443,9 @@ <pageIdAction>12</pageIdAction> <pageId>33</pageId> - <generationTime>0.67s</generationTime> + <generationTime>00:00:00.66</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1458,7 +1458,7 @@ <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1471,7 +1471,7 @@ <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1484,7 +1484,7 @@ <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1497,7 +1497,7 @@ <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1510,7 +1510,7 @@ <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1546,7 +1546,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index a0cd8d2485..dafd6523e3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -220,7 +220,7 @@ <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -233,7 +233,7 @@ <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>420</timeSpent> - <timeSpentPretty>7 min 0s</timeSpentPretty> + <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -246,7 +246,7 @@ <eventAction>Search</eventAction> <eventName>Search query here</eventName> <timeSpent>900</timeSpent> - <timeSpentPretty>15 min 0s</timeSpentPretty> + <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -259,7 +259,7 @@ <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -273,7 +273,7 @@ <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> <timeSpent>720</timeSpent> - <timeSpentPretty>12 min 0s</timeSpentPretty> + <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -310,7 +310,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <visitDurationPretty>58 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> @@ -489,9 +489,9 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> - <generationTime>0.33s</generationTime> + <generationTime>00:00:00.33</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -518,9 +518,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -537,9 +537,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -556,9 +556,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -575,7 +575,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -594,7 +594,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -613,7 +613,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -633,10 +633,10 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> - <timeSpentPretty>24 min 59s</timeSpentPretty> + <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -646,9 +646,9 @@ <pageIdAction>12</pageIdAction> <pageId>9</pageId> - <generationTime>0.67s</generationTime> + <generationTime>00:00:00.66</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -661,7 +661,7 @@ <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -674,7 +674,7 @@ <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -687,7 +687,7 @@ <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -700,7 +700,7 @@ <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -713,7 +713,7 @@ <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -749,7 +749,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> @@ -1025,7 +1025,7 @@ <eventAction>play50%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1038,7 +1038,7 @@ <eventAction>play75%</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>420</timeSpent> - <timeSpentPretty>7 min 0s</timeSpentPretty> + <timeSpentPretty>7 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1051,7 +1051,7 @@ <eventAction>Search</eventAction> <eventName>Search query here</eventName> <timeSpent>900</timeSpent> - <timeSpentPretty>15 min 0s</timeSpentPretty> + <timeSpentPretty>15 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1064,7 +1064,7 @@ <eventAction>playEnd</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1078,7 +1078,7 @@ <eventName>Spirited Away (千と千尋の神隠し)</eventName> <eventValue>9.66</eventValue> <timeSpent>720</timeSpent> - <timeSpentPretty>12 min 0s</timeSpentPretty> + <timeSpentPretty>12 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1115,7 +1115,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3481</visitDuration> - <visitDurationPretty>58 min 1s</visitDurationPretty> + <visitDurationPretty>58 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> @@ -1286,9 +1286,9 @@ <pageIdAction>2</pageIdAction> <pageId>25</pageId> - <generationTime>0.33s</generationTime> + <generationTime>00:00:00.33</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1315,9 +1315,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1334,9 +1334,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1353,9 +1353,9 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1372,7 +1372,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1391,7 +1391,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1410,7 +1410,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -1430,10 +1430,10 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l&#039;eau</eventName> + <eventName>La fiancée de l'eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> - <timeSpentPretty>24 min 59s</timeSpentPretty> + <timeSpentPretty>24 min 59s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1443,9 +1443,9 @@ <pageIdAction>12</pageIdAction> <pageId>33</pageId> - <generationTime>0.67s</generationTime> + <generationTime>00:00:00.66</generationTime> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1458,7 +1458,7 @@ <eventAction>playTrailer</eventAction> <eventName>Princess Mononoke (もののけ姫)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1471,7 +1471,7 @@ <eventAction>playTrailer</eventAction> <eventName>Ponyo (崖の上のポニョ)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1484,7 +1484,7 @@ <eventAction>playTrailer</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>60</timeSpent> - <timeSpentPretty>1 min 0s</timeSpentPretty> + <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1497,7 +1497,7 @@ <eventAction>clickBuyNow</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>120</timeSpent> - <timeSpentPretty>2 min 0s</timeSpentPretty> + <timeSpentPretty>2 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1510,7 +1510,7 @@ <eventAction>playStart</eventAction> <eventName>Spirited Away (千と千尋の神隠し)</eventName> <timeSpent>1320</timeSpent> - <timeSpentPretty>22 min 0s</timeSpentPretty> + <timeSpentPretty>22 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> </row> <row> @@ -1546,7 +1546,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3601</visitDuration> - <visitDurationPretty>1 hours 0 min</visitDurationPretty> + <visitDurationPretty>1 hours 0 min</visitDurationPretty> <customVariables> <row> <customVariableName1>Visit Scope Custom var</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index cdcfa194b1..c53a94ae90 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -142,7 +142,7 @@ </row> </customVariables> <timeSpent>79</timeSpent> - <timeSpentPretty>1 min 19s</timeSpentPretty> + <timeSpentPretty>1 min 19s</timeSpentPretty> <icon /> </row> <row> @@ -192,7 +192,7 @@ <daysSinceFirstVisit>181</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>81</visitDuration> - <visitDurationPretty>1 min 21s</visitDurationPretty> + <visitDurationPretty>1 min 21s</visitDurationPretty> <customVariables> <row> <customVariableName1>Domain landed</customVariableName1> @@ -2199,7 +2199,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -2249,7 +2249,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>182</visitDuration> - <visitDurationPretty>3 min 2s</visitDurationPretty> + <visitDurationPretty>3 min 2s</visitDurationPretty> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> @@ -2324,7 +2324,7 @@ </row> </customVariables> <timeSpent>61</timeSpent> - <timeSpentPretty>1 min 1s</timeSpentPretty> + <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> </row> <row> @@ -2341,7 +2341,7 @@ </row> </customVariables> <timeSpent>61</timeSpent> - <timeSpentPretty>1 min 1s</timeSpentPretty> + <timeSpentPretty>1 min 1s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> </row> <row> @@ -2381,7 +2381,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>123</visitDuration> - <visitDurationPretty>2 min 3s</visitDurationPretty> + <visitDurationPretty>2 min 3s</visitDurationPretty> <customVariables> <row> <customVariableName1>Not-Bot</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index d1f2bda02f..7079af5413 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -3,43 +3,43 @@ <row> <label>Cookie</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>9.5%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>9.5%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> - <nb_visits_percentage>10%</nb_visits_percentage> + <nb_visits_percentage>9.5%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/java.gif</logo> </row> <row> <label>Director</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4.8%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/director.gif</logo> </row> <row> <label>Gears</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4.8%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/gears.gif</logo> </row> <row> <label>Pdf</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4.8%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/pdf.gif</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>5%</nb_visits_percentage> + <nb_visits_percentage>4.8%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml index d7672ae30c..a1ec37b5bf 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -3,7 +3,7 @@ <row> <label>1 visit</label> <nb_visits>33</nb_visits> - <nb_visits_percentage>83%</nb_visits_percentage> + <nb_visits_percentage>82.5%</nb_visits_percentage> </row> <row> <label>2 visits</label> @@ -18,7 +18,7 @@ <row> <label>4 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2.5%</nb_visits_percentage> </row> <row> <label>5 visits</label> @@ -33,7 +33,7 @@ <row> <label>7 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2.5%</nb_visits_percentage> </row> <row> <label>8 visits</label> @@ -58,7 +58,7 @@ <row> <label>51-100 visits</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3%</nb_visits_percentage> + <nb_visits_percentage>2.5%</nb_visits_percentage> </row> <row> <label>101-200 visits</label> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index 2c93902a53..0a9c671f55 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>5 min 5s</result>
\ No newline at end of file +<result>5 min 5s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 46d72dcf04..62f736ac83 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -63,7 +63,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>363</visitDuration> - <visitDurationPretty>6 min 3s</visitDurationPretty> + <visitDurationPretty>6 min 3s</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -167,7 +167,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -196,7 +196,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -274,7 +274,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>1</daysSinceLastEcommerceOrder> <visitDuration>1081</visitDuration> - <visitDurationPretty>18 min 1s</visitDurationPretty> + <visitDurationPretty>18 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 9d33118b4c..0029166a94 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -32,7 +32,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -61,7 +61,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -139,7 +139,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>721</visitDuration> - <visitDurationPretty>12 min 1s</visitDurationPretty> + <visitDurationPretty>12 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -231,7 +231,7 @@ </row> </customVariables> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -248,7 +248,7 @@ </row> </customVariables> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -277,7 +277,7 @@ </row> </customVariables> <timeSpent>720</timeSpent> - <timeSpentPretty>12 min 0s</timeSpentPretty> + <timeSpentPretty>12 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -362,7 +362,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -391,7 +391,7 @@ </row> </customVariables> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -469,7 +469,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>3961</visitDuration> - <visitDurationPretty>1 hours 6 min</visitDurationPretty> + <visitDurationPretty>1 hours 6 min</visitDurationPretty> <customVariables> <row> <customVariableName3>VisitorName</customVariableName3> @@ -583,7 +583,7 @@ </row> </customVariables> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -612,7 +612,7 @@ </row> </customVariables> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -689,7 +689,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>721</visitDuration> - <visitDurationPretty>12 min 1s</visitDurationPretty> + <visitDurationPretty>12 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName4>ValueIsZero</customVariableName4> |