diff --git a/core/Date.php b/core/Date.php index dd2051a1a0b8ec89451528f5a75f542f1d472ca1..64583c981469577b77fcf5552f42edb6599a601b 100644 --- a/core/Date.php +++ b/core/Date.php @@ -725,6 +725,14 @@ class Date return $this->toString('h'); case "h": return $this->toString('g'); + case "KK": // 00 .. 11 + return str_pad($this->toString('g') - 1, 2, '0'); + case "K": // 0 .. 11 + return $this->toString('g') - 1; + case "kk": // 01 .. 24 + return str_pad($this->toString('G') + 1, 2, '0'); + case "k": // 1 .. 24 + return $this->toString('G') + 1; // minute case "mm": case "m": @@ -755,7 +763,7 @@ class Date } protected static $tokens = array( - 'G', 'y', 'M', 'L', 'd', 'h', 'H', 'm', 's', 'E', 'c', 'e', 'D', 'F', 'w', 'W', 'a', 'z', 'Z', 'v', + 'G', 'y', 'M', 'L', 'd', 'h', 'H', 'k', 'K', 'm', 's', 'E', 'c', 'e', 'D', 'F', 'w', 'W', 'a', 'z', 'Z', 'v', ); /** diff --git a/core/Intl/Data/Provider/DateTimeFormatProvider.php b/core/Intl/Data/Provider/DateTimeFormatProvider.php index 90ffad609ff75ac42b5ccb62e6ce8e3716d87b4f..daf22b0b8cf0a40c5b21718ba46afd78ad932dd1 100644 --- a/core/Intl/Data/Provider/DateTimeFormatProvider.php +++ b/core/Intl/Data/Provider/DateTimeFormatProvider.php @@ -64,6 +64,16 @@ class DateTimeFormatProvider return $format; } + /** + * Returns if time is present as 12 hour clock (eg am/pm) + * + * @return bool + */ + public function uses12HourClock() + { + return false; + } + /** * Returns interval format pattern for the given format type * diff --git a/plugins/Intl/Commands/GenerateIntl.php b/plugins/Intl/Commands/GenerateIntl.php index d9710f5977f5940e6d075de232d7ea2b50ad0512..59b79ae30e33bdba0e1d1adb53317549118bd01b 100644 --- a/plugins/Intl/Commands/GenerateIntl.php +++ b/plugins/Intl/Commands/GenerateIntl.php @@ -265,6 +265,8 @@ class GenerateIntl extends ConsoleCommand $translations['Intl']['Format_Time'] = '{time}'; $translations['Intl']['Format_Time_12'] = $calendarData['dateTimeFormats']['availableFormats']['hms']; $translations['Intl']['Format_Time_24'] = $calendarData['dateTimeFormats']['availableFormats']['Hms']; + $translations['Intl']['Format_Hour_12'] = $calendarData['dateTimeFormats']['availableFormats']['h']; + $translations['Intl']['Format_Hour_24'] = $calendarData['dateTimeFormats']['availableFormats']['H']; $translations['Intl']['Format_Date_Long'] = $calendarData['dateFormats']['full']; $translations['Intl']['Format_Date_Day_Month'] = $calendarData['dateTimeFormats']['availableFormats']['MMMEd']; $translations['Intl']['Format_Date_Short'] = $calendarData['dateFormats']['medium']; diff --git a/plugins/Intl/DateTimeFormatProvider.php b/plugins/Intl/DateTimeFormatProvider.php index 19fcd7acca9a21dbf32bc9cb532850654b8e165f..afe8a303c2b6049dafbac4d451a2276edb56a6fa 100644 --- a/plugins/Intl/DateTimeFormatProvider.php +++ b/plugins/Intl/DateTimeFormatProvider.php @@ -106,13 +106,9 @@ class DateTimeFormatProvider extends \Piwik\Intl\Data\Provider\DateTimeFormatPro protected function getTimeFormat() { - if (is_null($this->use12HourClock)) { - $this->use12HourClock = LanguagesManager::uses12HourClockForCurrentUser(); - } - $timeFormat = 'Intl_Format_Time_24'; - if ($this->use12HourClock) { + if ($this->uses12HourClock()) { $timeFormat = 'Intl_Format_Time_12'; } @@ -121,6 +117,20 @@ class DateTimeFormatProvider extends \Piwik\Intl\Data\Provider\DateTimeFormatPro return $template; } + /** + * Returns if time is present as 12 hour clock (eg am/pm) + * + * @return bool + */ + public function uses12HourClock() + { + if (is_null($this->use12HourClock)) { + $this->use12HourClock = LanguagesManager::uses12HourClockForCurrentUser(); + } + + return $this->use12HourClock; + } + /** * For testing purpose only: Overwrites time format * diff --git a/plugins/Intl/lang/am.json b/plugins/Intl/lang/am.json index 4ea641a511baa1162ee07840300246e33dd90a4e..26aa0adb840077e6a9379e0dff6830d4638011e2 100644 --- a/plugins/Intl/lang/am.json +++ b/plugins/Intl/lang/am.json @@ -63,7 +63,7 @@ "Country_CW": "ኩራሳዎ", "Country_CX": "የገና ደሴት", "Country_CY": "ሳá‹á•ረስ", - "Country_CZ": "ቼአሪá‘ብሊáŠ", + "Country_CZ": "ቼቺያ", "Country_DE": "ጀáˆáˆ˜áŠ•", "Country_DJ": "ጂቡቲ", "Country_DK": "ዴንማáˆáŠ", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "EᣠMMM d", "Format_Date_Long": "EEEE á£d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "MMMM d–dᣠy", "Format_Interval_Long_M": "MMMM d – MMMM dᣠy", "Format_Interval_Long_Y": "MMMM dᣠy – MMMM dᣠy", diff --git a/plugins/Intl/lang/ar.json b/plugins/Intl/lang/ar.json index c82d41c5bed3120eb266a7ef6d00526b5e78ce3f..5041cce381670c87129606841c932bfc8079dcd3 100644 --- a/plugins/Intl/lang/ar.json +++ b/plugins/Intl/lang/ar.json @@ -63,7 +63,7 @@ "Country_CW": "كوراساو", "Country_CX": "جزيرة الكريسماس", "Country_CY": "قبرص", - "Country_CZ": "جمهورية التشيك", + "Country_CZ": "التشيك", "Country_DE": "ألمانيا", "Country_DJ": "جيبوتي", "Country_DK": "الدانمرك", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "EØŒ d MMM", "Format_Date_Long": "EEEEØŒ d MMMMØŒ y", "Format_Date_Short": "ddâ€\/MMâ€\/y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMMØŒ y", "Format_Interval_Long_M": "d MMMM – d MMMMØŒ y", "Format_Interval_Long_Y": "d MMMMØŒ y – d MMMMØŒ y", diff --git a/plugins/Intl/lang/be.json b/plugins/Intl/lang/be.json index 49eaf85f474a697afb78ad48767b44cb76be25c4..deea5d3a6bd1ec695c1d676aad9e6976c954d3b0 100644 --- a/plugins/Intl/lang/be.json +++ b/plugins/Intl/lang/be.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y 'г'.", "Format_Date_Short": "d.MM.y", + "Format_Hour_12": "hh a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/bg.json b/plugins/Intl/lang/bg.json index c440f820e6261ca3b3ea9038e9fe3fe8891ba076..216e5dee892db382b4e1696c5ef72110e0f751b7 100644 --- a/plugins/Intl/lang/bg.json +++ b/plugins/Intl/lang/bg.json @@ -63,7 +63,7 @@ "Country_CW": "КюраÑао", "Country_CX": "ОÑтров РождеÑтво", "Country_CY": "Кипър", - "Country_CZ": "Чешка република", + "Country_CZ": "ЧехиÑ", "Country_DE": "ГерманиÑ", "Country_DJ": "Джибути", "Country_DK": "ДаниÑ", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d.MM", "Format_Date_Long": "EEEE, d MMMM y 'г'.", "Format_Date_Short": "d.MM.y 'г'.", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d – d MMMM y 'г'.", "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", @@ -557,7 +559,7 @@ "NMinutesShort": "%s min", "NSeconds": "%s Ñекунди", "NSecondsShort": "%s s", - "NumberFormatCurrency": "#0.00 ¤", + "NumberFormatCurrency": "0.00 ¤", "NumberFormatNumber": "#,##0.###", "NumberFormatPercent": "#,##0%", "NumberSymbolDecimal": ",", diff --git a/plugins/Intl/lang/bn.json b/plugins/Intl/lang/bn.json index 9a1953797625ab9e5c9fcbd2cfc948c3d95be7e2..bcc6b976211c6fac96505dae5118ec3eb9cbe740 100644 --- a/plugins/Intl/lang/bn.json +++ b/plugins/Intl/lang/bn.json @@ -63,7 +63,7 @@ "Country_CW": "কিউরাসাও", "Country_CX": "কà§à¦°à¦¿à¦¸à¦®à¦¾à¦¸ দà§à¦¬à§€à¦ª", "Country_CY": "সাইপà§à¦°à¦¾à¦¸", - "Country_CZ": "চেক পà§à¦°à¦œà¦¾à¦¤à¦¨à§à¦¤à§à¦°", + "Country_CZ": "চেচিয়া", "Country_DE": "জারà§à¦®à¦¾à¦¨à¦¿", "Country_DJ": "জিবà§à¦¤à¦¿", "Country_DK": "ডেনমারà§à¦•", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM, y", "Format_Interval_Long_M": "d MMMM – d MMMM, y", "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", diff --git a/plugins/Intl/lang/bs.json b/plugins/Intl/lang/bs.json index 3c776babd7fc1c9d4531df7ebace697170eb7d39..899daef98b5c0340f102a86a2b5c791208d64991 100644 --- a/plugins/Intl/lang/bs.json +++ b/plugins/Intl/lang/bs.json @@ -63,7 +63,7 @@ "Country_CW": "Kurasao", "Country_CX": "Božićna Ostrva", "Country_CY": "Kipar", - "Country_CZ": "ÄŒeÅ¡ka Republika", + "Country_CZ": "ÄŒeÅ¡ka", "Country_DE": "NjemaÄka", "Country_DJ": "Džibuti", "Country_DK": "Danska", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y.", "Format_Date_Short": "d. MMM. y.", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d. – d. MMMM y.", "Format_Interval_Long_M": "d. MMMM – d. MMMM y.", "Format_Interval_Long_Y": "d. MMMM y. – d. MMMM y.", diff --git a/plugins/Intl/lang/ca.json b/plugins/Intl/lang/ca.json index 614fe35f720f28434434db813d94f38183f747eb..a48b09d2441c6480995fbad96d6c67a093be3169 100644 --- a/plugins/Intl/lang/ca.json +++ b/plugins/Intl/lang/ca.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Illa Christmas", "Country_CY": "Xipre", - "Country_CZ": "República Txeca", + "Country_CZ": "Txèquia", "Country_DE": "Alemanya", "Country_DJ": "Djibouti", "Country_DK": "Dinamarca", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM 'de' y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d–d MMMM 'de' y", "Format_Interval_Long_M": "d MMMM – d MMMM 'de' y", "Format_Interval_Long_Y": "d MMMM 'de' y – d MMMM 'de' y", diff --git a/plugins/Intl/lang/cs.json b/plugins/Intl/lang/cs.json index 885d852428d06aa62147aee324cb1397b15630cc..39d03a45acce84e27c14a5b08070f905dbc57ffc 100644 --- a/plugins/Intl/lang/cs.json +++ b/plugins/Intl/lang/cs.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "VánoÄnà ostrov", "Country_CY": "Kypr", - "Country_CZ": "ÄŒeská republika", + "Country_CZ": "ÄŒesko", "Country_DE": "NÄ›mecko", "Country_DJ": "Džibutsko", "Country_DK": "Dánsko", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d. M.", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. M. y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d.–d. M. y", "Format_Interval_Long_M": "d. M. – d. M. y", "Format_Interval_Long_Y": "d. M. y – d. M. y", diff --git a/plugins/Intl/lang/cy.json b/plugins/Intl/lang/cy.json index 4b98f7551aa5829b3596c13960e4baed87107096..0b7f67eaf3b37c0067b357c43a238a668f60aeb5 100644 --- a/plugins/Intl/lang/cy.json +++ b/plugins/Intl/lang/cy.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Ynys y Nadolig", "Country_CY": "Cyprus", - "Country_CZ": "Gweriniaeth Tsiec", + "Country_CZ": "Tsiecia", "Country_DE": "Yr Almaen", "Country_DJ": "Djibouti", "Country_DK": "Denmarc", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM, y – d MMMM y", diff --git a/plugins/Intl/lang/da.json b/plugins/Intl/lang/da.json index 18fdff2299e282f685644a13ade68d1bfb9bb7a2..ef3d26a4116662aee7157433e5de8cc3a8b906ad 100644 --- a/plugins/Intl/lang/da.json +++ b/plugins/Intl/lang/da.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE 'den' d. MMMM y", "Format_Date_Short": "d. MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM.–d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", diff --git a/plugins/Intl/lang/de.json b/plugins/Intl/lang/de.json index 8de4c29cef3b9ac8f19b00ee8ae09b8258752e73..cbc32832ee8fd5fb1cd56397c36a0969229f41c6 100644 --- a/plugins/Intl/lang/de.json +++ b/plugins/Intl/lang/de.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Weihnachtsinsel", "Country_CY": "Zypern", - "Country_CZ": "Tschechische Republik", + "Country_CZ": "Tschechien", "Country_DE": "Deutschland", "Country_DJ": "Dschibuti", "Country_DK": "Dänemark", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "dd.MM.y", + "Format_Hour_12": "h 'Uhr' a", + "Format_Hour_24": "HH 'Uhr'", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM – d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", diff --git a/plugins/Intl/lang/el.json b/plugins/Intl/lang/el.json index c0fdc4628467852024b6b246f8da9161e53c0cf3..edb78624f667def4edf2d3728c45d870ec345c7e 100644 --- a/plugins/Intl/lang/el.json +++ b/plugins/Intl/lang/el.json @@ -63,7 +63,7 @@ "Country_CW": "ΚουÏασάο", "Country_CX": "Îήσος των ΧÏιστουγÎννων", "Country_CY": "ΚÏÏ€Ïος", - "Country_CZ": "Τσεχική ΔημοκÏατία", + "Country_CZ": "Τσεχία", "Country_DE": "ΓεÏμανία", "Country_DJ": "Τζιμπουτί", "Country_DK": "Δανία", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd–dd MMMM y", "Format_Interval_Long_M": "dd MMMM – dd MMMM y", "Format_Interval_Long_Y": "dd MMMM y – dd MMMM y", diff --git a/plugins/Intl/lang/en.json b/plugins/Intl/lang/en.json index 063bf9187c7cf3f115850a2bf56391573c3c8a53..07e367ce8c6d204fdbc44babb0576c6e3b2286b4 100644 --- a/plugins/Intl/lang/en.json +++ b/plugins/Intl/lang/en.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmas Island", "Country_CY": "Cyprus", - "Country_CZ": "Czech Republic", + "Country_CZ": "Czechia", "Country_DE": "Germany", "Country_DJ": "Djibouti", "Country_DK": "Denmark", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, MMMM d, y", "Format_Date_Short": "MMM d, y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "MMMM d – d, y", "Format_Interval_Long_M": "MMMM d – MMMM d, y", "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", diff --git a/plugins/Intl/lang/es.json b/plugins/Intl/lang/es.json index edcde23bb174e8d5092fa597494698c2756498f4..1753d1729e1937ae87f2850c296d65bac3854abe 100644 --- a/plugins/Intl/lang/es.json +++ b/plugins/Intl/lang/es.json @@ -63,7 +63,7 @@ "Country_CW": "Curazao", "Country_CX": "Isla de Navidad", "Country_CY": "Chipre", - "Country_CZ": "República Checa", + "Country_CZ": "Chequia", "Country_DE": "Alemania", "Country_DJ": "Yibuti", "Country_DK": "Dinamarca", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", "Format_Interval_Long_M": "d 'de' MMMM–d 'de' MMMM 'de' y", "Format_Interval_Long_Y": "d 'de' MMMM 'de' y–d 'de' MMMM 'de' y", diff --git a/plugins/Intl/lang/et.json b/plugins/Intl/lang/et.json index d1a921756b06789582d6d6a723cd627ba22af9a7..14c21067035d95b5faa3675a99c1c3143ac29a52 100644 --- a/plugins/Intl/lang/et.json +++ b/plugins/Intl/lang/et.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Jõulusaar", "Country_CY": "Küpros", - "Country_CZ": "TÅ¡ehhi", + "Country_CZ": "TÅ¡ehhia", "Country_DE": "Saksamaa", "Country_DJ": "Djibouti", "Country_DK": "Taani", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM – d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", diff --git a/plugins/Intl/lang/eu.json b/plugins/Intl/lang/eu.json index e61a18ea4de562545f5840dac196d25251298756..a186b7354efd31ccbcb61ffedbff47647668cd02 100644 --- a/plugins/Intl/lang/eu.json +++ b/plugins/Intl/lang/eu.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmas uhartea", "Country_CY": "Zipre", - "Country_CZ": "Txekiar Errepublika", + "Country_CZ": "Txekia", "Country_DE": "Alemania", "Country_DJ": "Djibuti", "Country_DK": "Danimarka", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "MMM d, E", "Format_Date_Long": "y('e')'ko' MMMM d, EEEE", "Format_Date_Short": "y MMM d", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "y('e')'ko' MMMM d–d", "Format_Interval_Long_M": "y('e')'ko' MMMM d – MMMM d", "Format_Interval_Long_Y": "y('e')'ko' MMMM d – y('e')'ko' MMMM d", diff --git a/plugins/Intl/lang/fa.json b/plugins/Intl/lang/fa.json index 9edb2ecb7fad52665f7016b16932c6b9622e378b..8dc4e63106962639b00fbc7ad052e44d080493fd 100644 --- a/plugins/Intl/lang/fa.json +++ b/plugins/Intl/lang/fa.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d LLL", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d تا d MMMM y", "Format_Interval_Long_M": "d LLLL تا d MMMM y", "Format_Interval_Long_Y": "d MMMM y تا d MMMM y", diff --git a/plugins/Intl/lang/fi.json b/plugins/Intl/lang/fi.json index c1ac3de33abb04eb2d2e718d40ff1d3856eeae43..f926d41b0aeee8175578527c59f47b36ba58c460 100644 --- a/plugins/Intl/lang/fi.json +++ b/plugins/Intl/lang/fi.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Joulusaari", "Country_CY": "Kypros", - "Country_CZ": "TÅ¡ekki", + "Country_CZ": "TÅ¡ekinmaa", "Country_DE": "Saksa", "Country_DJ": "Djibouti", "Country_DK": "Tanska", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "ccc d. MMM", "Format_Date_Long": "cccc d. MMMM y", "Format_Date_Short": "d.M.y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM – d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", diff --git a/plugins/Intl/lang/fr.json b/plugins/Intl/lang/fr.json index 9a2fd48a53ecf9b4c5a7e8ed33b2e9c5da62a641..fe69b0ac95226c01354fee1f6c7e5b8ea09158d2 100644 --- a/plugins/Intl/lang/fr.json +++ b/plugins/Intl/lang/fr.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "ÃŽle Christmas", "Country_CY": "Chypre", - "Country_CZ": "République tchèque", + "Country_CZ": "Tchéquie", "Country_DE": "Allemagne", "Country_DJ": "Djibouti", "Country_DK": "Danemark", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH 'h'", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/gl.json b/plugins/Intl/lang/gl.json index 4b500e22210d9f9b346a95603cbade44174601f8..5a58b3c71685e3dec6e076e3cf00f9a2ebfa5f42 100644 --- a/plugins/Intl/lang/gl.json +++ b/plugins/Intl/lang/gl.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Illa de Nadal", "Country_CY": "Chipre", - "Country_CZ": "República Checa", + "Country_CZ": "Chequia", "Country_DE": "Alemaña", "Country_DJ": "Djibuti", "Country_DK": "Dinamarca", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "ccc, d 'de' MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d 'de' MMM 'de' y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", "Format_Interval_Long_M": "d MMMM – d MMMM 'de' y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/he.json b/plugins/Intl/lang/he.json index c3367fb439bcf2cbb73ce136992a170fe2765f8c..98c7ca0bc95530f5bcce8682c480f9199ced529d 100644 --- a/plugins/Intl/lang/he.json +++ b/plugins/Intl/lang/he.json @@ -63,7 +63,7 @@ "Country_CW": "קור×ס×ו", "Country_CX": "×”××™ כריסטמס", "Country_CY": "קפריסין", - "Country_CZ": "הרפובליקה הצ׳כית", + "Country_CZ": "צ׳כיה", "Country_DE": "×’×¨×ž× ×™×”", "Country_DJ": "ג׳יבוטי", "Country_DK": "×“× ×ž×¨×§", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d בMMM", "Format_Date_Long": "EEEE, d בMMMM y", "Format_Date_Short": "d בMMM y", + "Format_Hour_12": "â€h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d–d בMMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/hi.json b/plugins/Intl/lang/hi.json index 8d84e5b37ce6ed894fcb0f483b8b3a12e06ba052..99267589813a34851bd7df19f5b2863345ad62f3 100644 --- a/plugins/Intl/lang/hi.json +++ b/plugins/Intl/lang/hi.json @@ -63,7 +63,7 @@ "Country_CW": "कà¥à¤¯à¥‚रासाओ", "Country_CX": "कà¥à¤°à¤¿à¤¸à¤®à¤¸ दà¥à¤µà¥€à¤ª", "Country_CY": "साइपà¥à¤°à¤¸", - "Country_CZ": "चेक गणराजà¥à¤¯", + "Country_CZ": "चेकिया", "Country_DE": "जरà¥à¤®à¤¨à¥€", "Country_DJ": "जिबूती", "Country_DK": "डेनमारà¥à¤•", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "dd\/MM\/y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/hr.json b/plugins/Intl/lang/hr.json index 49c566262cf7af1cf7af8cf57ffefea7d640a50b..0b65845da20d68a31a37577dffa4607e04ea2f71 100644 --- a/plugins/Intl/lang/hr.json +++ b/plugins/Intl/lang/hr.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Božićni otok", "Country_CY": "Cipar", - "Country_CZ": "ÄŒeÅ¡ka Republika", + "Country_CZ": "ÄŒeÅ¡ka", "Country_DE": "NjemaÄka", "Country_DJ": "Džibuti", "Country_DK": "Danska", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y.", "Format_Date_Short": "d. MMM y.", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd. – dd. MMMM y.", "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", diff --git a/plugins/Intl/lang/hu.json b/plugins/Intl/lang/hu.json index 11c04ef70538d393faef36cef69e12aa18d4b0d9..e8a3bd12616c18f053160859a8dc4dc1d9784158 100644 --- a/plugins/Intl/lang/hu.json +++ b/plugins/Intl/lang/hu.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "MMM d., E", "Format_Date_Long": "y. MMMM d., EEEE", "Format_Date_Short": "y. MMM d.", + "Format_Hour_12": "a h", + "Format_Hour_24": "H", "Format_Interval_Long_D": "y. MMMM d–d.", "Format_Interval_Long_M": "y. MMMM d. – MMMM d.", "Format_Interval_Long_Y": "y. MMMM d. – y. MMMM d.", @@ -428,12 +430,12 @@ "Language_mt": "Máltai", "Language_my": "Burmai", "Language_na": "Naurui", - "Language_nb": "Norvég (bokmál)", + "Language_nb": "Norvég (bokmÃ¥l)", "Language_nd": "Északi ndebele", "Language_ne": "Nepáli", "Language_ng": "Ndonga", "Language_nl": "Holland", - "Language_nn": "Norvég (nynrosk)", + "Language_nn": "Norvég (nynorsk)", "Language_no": "Norvég", "Language_nr": "Déli ndebele", "Language_nv": "Navahó", diff --git a/plugins/Intl/lang/id.json b/plugins/Intl/lang/id.json index eefdadfcf456ac7d610bd87cb1e1a2d456fd96b6..5b7c0fc725e3fad3f3c6907dd480469f7bc1c29e 100644 --- a/plugins/Intl/lang/id.json +++ b/plugins/Intl/lang/id.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Pulau Christmas", "Country_CY": "Siprus", - "Country_CZ": "Republik Cheska", + "Country_CZ": "Cheska", "Country_DE": "Jerman", "Country_DJ": "Jibuti", "Country_DK": "Denmark", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, dd MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/is.json b/plugins/Intl/lang/is.json index 278e92d010cc875ccb8a3f9350c9a67f31b262bc..6424ba8f559c22d7f67073c98a5f44984d224195 100644 --- a/plugins/Intl/lang/is.json +++ b/plugins/Intl/lang/is.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM – d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", diff --git a/plugins/Intl/lang/it.json b/plugins/Intl/lang/it.json index 73a419fc11cb72395951f38cb7218e9c34319eed..b5226d723e0c5ff7af4416ce893d3dba980c4b29 100644 --- a/plugins/Intl/lang/it.json +++ b/plugins/Intl/lang/it.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Isola Christmas", "Country_CY": "Cipro", - "Country_CZ": "Repubblica Ceca", + "Country_CZ": "Cèchia", "Country_DE": "Germania", "Country_DJ": "Gibuti", "Country_DK": "Danimarca", @@ -228,7 +228,7 @@ "Country_TH": "Thailandia", "Country_TJ": "Tagikistan", "Country_TK": "Tokelau", - "Country_TL": "Timor Leste", + "Country_TL": "Timor Est", "Country_TM": "Turkmenistan", "Country_TN": "Tunisia", "Country_TO": "Tonga", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "dd MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd–dd MMMM y", "Format_Interval_Long_M": "dd MMMM – dd MMMM y", "Format_Interval_Long_Y": "dd MMMM y – dd MMMM y", diff --git a/plugins/Intl/lang/ja.json b/plugins/Intl/lang/ja.json index e6f685bfc1664b381ea83cb2f00bee50017a34bf..99dd2fb62a9a9957237d66cb3ed230b7a5c562ca 100644 --- a/plugins/Intl/lang/ja.json +++ b/plugins/Intl/lang/ja.json @@ -63,7 +63,7 @@ "Country_CW": "ã‚ュラソー", "Country_CX": "クリスマス島", "Country_CY": "ã‚プãƒã‚¹", - "Country_CZ": "ãƒã‚§ã‚³å…±å’Œå›½", + "Country_CZ": "ãƒã‚§ã‚³", "Country_DE": "ドイツ", "Country_DJ": "ジブãƒ", "Country_DK": "デンマーク", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "M月dæ—¥(E)", "Format_Date_Long": "yå¹´M月dæ—¥EEEE", "Format_Date_Short": "y\/MM\/dd", + "Format_Hour_12": "aK時", + "Format_Hour_24": "H時", "Format_Interval_Long_D": "yå¹´M月d日~dæ—¥", "Format_Interval_Long_M": "yå¹´M月d日~M月dæ—¥", "Format_Interval_Long_Y": "yå¹´M月d日~yå¹´M月dæ—¥", diff --git a/plugins/Intl/lang/ka.json b/plugins/Intl/lang/ka.json index f7ba2b9a72e8538fc3a2fbd45b97ec50f94cbf50..5f2632617d3f3992cc355a06864c38530e0eb31c 100644 --- a/plugins/Intl/lang/ka.json +++ b/plugins/Intl/lang/ka.json @@ -63,7 +63,7 @@ "Country_CW": "კიურáƒáƒ¡áƒáƒ", "Country_CX": "შáƒáƒ‘ის კუნძული", "Country_CY": "კვიპრáƒáƒ¡áƒ˜", - "Country_CZ": "ჩეხეთის რესპუბლიკáƒ", + "Country_CZ": "ჩეხეთი", "Country_DE": "გერმáƒáƒœáƒ˜áƒ", "Country_DJ": "ჯიბუტი", "Country_DK": "დáƒáƒœáƒ˜áƒ", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, dd MMMM, y", "Format_Date_Short": "d MMM. y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM, y", "Format_Interval_Long_M": "dd MMMM. – dd MMMM. y", "Format_Interval_Long_Y": "dd MMMM. y – d MMMM. y", diff --git a/plugins/Intl/lang/ko.json b/plugins/Intl/lang/ko.json index 0855521b953f0261accee24c46c234be267be6f6..dad90d000811f69e67014f03fd19793e4bef5edf 100644 --- a/plugins/Intl/lang/ko.json +++ b/plugins/Intl/lang/ko.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "MMM dì¼ (E)", "Format_Date_Long": "yë…„ Mì›” dì¼ EEEE", "Format_Date_Short": "y. M. d.", + "Format_Hour_12": "a h시", + "Format_Hour_24": "H시", "Format_Interval_Long_D": "yë…„ Mì›” dì¼~dì¼", "Format_Interval_Long_M": "yë…„ Mì›” dì¼ ~ Mì›” dì¼", "Format_Interval_Long_Y": "yë…„ Mì›” dì¼ ~ yë…„ Mì›” dì¼", diff --git a/plugins/Intl/lang/lt.json b/plugins/Intl/lang/lt.json index 0df15e67f0eb8b5142b62687d21f0b321639358c..03ff52afa8fb86189fb48bf6bf20a95fa906ec24 100644 --- a/plugins/Intl/lang/lt.json +++ b/plugins/Intl/lang/lt.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "MM-dd, E", "Format_Date_Long": "y 'm'. MMMM d 'd'., EEEE", "Format_Date_Short": "y-MM-dd", + "Format_Hour_12": "hh a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "y MMMM d–d", "Format_Interval_Long_M": "y MMMM d – MMMM d", "Format_Interval_Long_Y": "y MMMM d – y MMMM d", diff --git a/plugins/Intl/lang/lv.json b/plugins/Intl/lang/lv.json index 4a333747244992e94aa7802d5be8e04a43ccf180..884fc7638e495f92e46b38e6dc402236d1a9e8da 100644 --- a/plugins/Intl/lang/lv.json +++ b/plugins/Intl/lang/lv.json @@ -63,7 +63,7 @@ "Country_CW": "Kirasao", "Country_CX": "ZiemsvÄ“tku sala", "Country_CY": "Kipra", - "Country_CZ": "ÄŒehijas Republika", + "Country_CZ": "ÄŒehija", "Country_DE": "VÄcija", "Country_DJ": "Džibutija", "Country_DK": "DÄnija", @@ -116,7 +116,7 @@ "Country_IO": "Indijas okeÄna Britu teritorija", "Country_IQ": "IrÄka", "Country_IR": "IrÄna", - "Country_IS": "Īslande", + "Country_IS": "Islande", "Country_IT": "ItÄlija", "Country_JE": "Džērsija", "Country_JM": "Jamaika", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, y. 'gada' d. MMMM", "Format_Date_Short": "y. 'gada' d. MMM", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "y. 'gada' d.–d. MMMM", "Format_Interval_Long_M": "y. 'gada' d. MMMM – d. MMMM", "Format_Interval_Long_Y": "y. 'gada' d. MMMM – y. 'gada' d. MMMM", @@ -388,7 +390,7 @@ "Language_ii": "SiÄuaņas ji", "Language_ik": "Inupiaku", "Language_io": "Ido", - "Language_is": "ĪslandieÅ¡u", + "Language_is": "IslandieÅ¡u", "Language_it": "ItÄļu", "Language_iu": "InuÄ«tu", "Language_ja": "JapÄņu", diff --git a/plugins/Intl/lang/nb.json b/plugins/Intl/lang/nb.json index b7fa781a4d160982dd036f7a6d370046eaa95188..38d5d9dd764c9a39b8be21e778b9b7c2dbbc6d04 100644 --- a/plugins/Intl/lang/nb.json +++ b/plugins/Intl/lang/nb.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmasøya", "Country_CY": "Kypros", - "Country_CZ": "Den tsjekkiske republikk", + "Country_CZ": "Tsjekkia", "Country_DE": "Tyskland", "Country_DJ": "Djibouti", "Country_DK": "Danmark", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", diff --git a/plugins/Intl/lang/nl.json b/plugins/Intl/lang/nl.json index 3d5fbab51d112c91d349ba684840ece07a68f58c..b620e278a9a30a175d55a1687b626b8367895035 100644 --- a/plugins/Intl/lang/nl.json +++ b/plugins/Intl/lang/nl.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmaseiland", "Country_CY": "Cyprus", - "Country_CZ": "Tsjechië", + "Country_CZ": "Tsjechische Republiek", "Country_DE": "Duitsland", "Country_DJ": "Djibouti", "Country_DK": "Denemarken", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/nn.json b/plugins/Intl/lang/nn.json index 95406e4a6715a30ac7b5862f90e8c1e08be29c1b..9c2fe0373a050b9265029b45d98ac71c8d8fc262 100644 --- a/plugins/Intl/lang/nn.json +++ b/plugins/Intl/lang/nn.json @@ -304,6 +304,8 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", diff --git a/plugins/Intl/lang/pl.json b/plugins/Intl/lang/pl.json index b3bc1f32fdcbfea4429712c315d82ce9f3ee2fce..89f64fcbfa46714e8a4a820e8d4466de0cc9dac8 100644 --- a/plugins/Intl/lang/pl.json +++ b/plugins/Intl/lang/pl.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/pt-br.json b/plugins/Intl/lang/pt-br.json index b52e1555a4c470bdab7975be25c04b48522e3f5e..934d5ef10713c54b6bb53e2c6912a902d812ebcd 100644 --- a/plugins/Intl/lang/pt-br.json +++ b/plugins/Intl/lang/pt-br.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Ilha Christmas", "Country_CY": "Chipre", - "Country_CZ": "República Tcheca", + "Country_CZ": "Tchéquia", "Country_DE": "Alemanha", "Country_DJ": "Djibuti", "Country_DK": "Dinamarca", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d 'de' MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d 'de' MMM 'de' y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d – d 'de' MMMM 'de' y", "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", diff --git a/plugins/Intl/lang/pt.json b/plugins/Intl/lang/pt.json index d82075c57f8df3f3c3b96d5b22a99b29c76b3b55..ab43bc3df0ee85a1e37fc6e0a113c2181dabdcef 100644 --- a/plugins/Intl/lang/pt.json +++ b/plugins/Intl/lang/pt.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d\/MM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "dd\/MM\/y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", diff --git a/plugins/Intl/lang/ro.json b/plugins/Intl/lang/ro.json index 663d42f3abfbda9af28aabc6a89d96d56235758d..733cf78e7bafdc31ccdbcb533c52b9163e1eb998 100644 --- a/plugins/Intl/lang/ro.json +++ b/plugins/Intl/lang/ro.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Insula Christmas", "Country_CY": "Cipru", - "Country_CZ": "Republica Cehă", + "Country_CZ": "Cehia", "Country_DE": "Germania", "Country_DJ": "Djibouti", "Country_DK": "Danemarca", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/ru.json b/plugins/Intl/lang/ru.json index e3d47e4dc4b04a1e65a6f6561bc83c060b2125e7..8a3dc80345fa1666173068a828bb5a2f2a2696fc 100644 --- a/plugins/Intl/lang/ru.json +++ b/plugins/Intl/lang/ru.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "ccc, d MMM", "Format_Date_Long": "EEEE, d MMMM y 'г'.", "Format_Date_Short": "d MMM y 'г'.", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d–d MMMM y 'г'.", "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", diff --git a/plugins/Intl/lang/sk.json b/plugins/Intl/lang/sk.json index 3efd518b7e647d7dd812646255b992ad229b0030..f9397c9ae29944a3777dc7d82ac67150ff6bae61 100644 --- a/plugins/Intl/lang/sk.json +++ b/plugins/Intl/lang/sk.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "VianoÄný ostrov", "Country_CY": "Cyprus", - "Country_CZ": "ÄŒeská republika", + "Country_CZ": "ÄŒesko", "Country_DE": "Nemecko", "Country_DJ": "Džibutsko", "Country_DK": "Dánsko", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d. M.", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. M. y", + "Format_Hour_12": "h a", + "Format_Hour_24": "H", "Format_Interval_Long_D": "d. – d. M. y", "Format_Interval_Long_M": "d. M. – d. M. y", "Format_Interval_Long_Y": "d. M. y – d. M. y", diff --git a/plugins/Intl/lang/sl.json b/plugins/Intl/lang/sl.json index 805a679a08fe22a4d7d00b141679af8405cc840f..bd55af10adec2cd3a89a9c37023bafba26a5b30d 100644 --- a/plugins/Intl/lang/sl.json +++ b/plugins/Intl/lang/sl.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, dd. MMMM y", "Format_Date_Short": "d. MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH'h'", "Format_Interval_Long_D": "d.–d. MMMM y", "Format_Interval_Long_M": "d. MMMM–d. MMMM y", "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", @@ -561,7 +563,7 @@ "NumberFormatPercent": "#,##0 %", "NumberSymbolDecimal": ",", "NumberSymbolGroup": ".", - "NumberSymbolMinus": "–", + "NumberSymbolMinus": "−", "NumberSymbolPercent": "%", "NumberSymbolPlus": "+", "OneDay": "1 dan", diff --git a/plugins/Intl/lang/sq.json b/plugins/Intl/lang/sq.json index 6a5954b2dfbbcf56e8ae5309435d57b9552f703b..0ac3b260f0d7aae1920accd8121da63ff381582c 100644 --- a/plugins/Intl/lang/sq.json +++ b/plugins/Intl/lang/sq.json @@ -63,7 +63,7 @@ "Country_CW": "Kuraçao", "Country_CX": "Ishulli i Krishtlindjes", "Country_CY": "Qipro", - "Country_CZ": "Republika Çeke", + "Country_CZ": "Çeki", "Country_DE": "Gjermani", "Country_DJ": "Xhibuti", "Country_DK": "Danimarkë", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d – d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/sr.json b/plugins/Intl/lang/sr.json index aaf5b36f1f742a4e62d264bcace1485f26b372a6..e13fb8bad26530db8e5e7b9b70f5acecb76256d9 100644 --- a/plugins/Intl/lang/sr.json +++ b/plugins/Intl/lang/sr.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE, dd. MMMM y.", "Format_Date_Short": "dd.MM.y.", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "dd.–dd. MMMM y.", "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", diff --git a/plugins/Intl/lang/sv.json b/plugins/Intl/lang/sv.json index 5313dded029e5151f50cf6a3fba2a1c19184399f..a53a7c252edb2a823619b596417cc18e0213078e 100644 --- a/plugins/Intl/lang/sv.json +++ b/plugins/Intl/lang/sv.json @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM–d MMMM y", "Format_Interval_Long_Y": "d MMMM y–d MMMM y", diff --git a/plugins/Intl/lang/ta.json b/plugins/Intl/lang/ta.json index 35dbccb1e9a8cc1b1ed22223be7e46451d219baf..72367ea9eb7721bb3f81d967f3cbd147405a6d3a 100644 --- a/plugins/Intl/lang/ta.json +++ b/plugins/Intl/lang/ta.json @@ -63,7 +63,7 @@ "Country_CW": "கà¯à®°à®¾à®•வà¯", "Country_CX": "கிறிஸà¯à®¤à¯à®®à®¸à¯ தீவà¯", "Country_CY": "சைபà¯à®°à®¸à¯", - "Country_CZ": "செக௠கà¯à®Ÿà®¿à®¯à®°à®šà¯", + "Country_CZ": "செசியா", "Country_DE": "ஜெரà¯à®®à®©à®¿", "Country_DJ": "ஜிபௌடà¯à®Ÿà®¿", "Country_DK": "டெனà¯à®®à®¾à®°à¯à®•à¯", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "MMM d, E", "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", + "Format_Hour_12": "a h", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d – d MMMM, y", "Format_Interval_Long_M": "d MMMM – d MMMM, y", "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", diff --git a/plugins/Intl/lang/te.json b/plugins/Intl/lang/te.json index 2442a474f5e700494bbb7c56c73635e80403d8fd..d9fbe082763334f1b67b4e4bb3facf21d6f8cd69 100644 --- a/plugins/Intl/lang/te.json +++ b/plugins/Intl/lang/te.json @@ -63,7 +63,7 @@ "Country_CW": "à°•à±à°°à°¾à°•వో", "Country_CX": "à°•à±à°°à°¿à°¸à±à°®à°¸à± దీవి", "Country_CY": "సైపà±à°°à°¸à±", - "Country_CZ": "చెకౠరిపబà±à°²à°¿à°•à±", + "Country_CZ": "చెకà±â€Œà°šà°¿à°¯", "Country_DE": "జరà±à°®à°¨à±€", "Country_DJ": "జిబౌటి", "Country_DK": "డెనà±à°®à°¾à°°à±à°•à±", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "d, MMMM y, EEEE", "Format_Date_Short": "d MMM, y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM, y", "Format_Interval_Long_M": "d MMMM – d MMMM, y", "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", diff --git a/plugins/Intl/lang/th.json b/plugins/Intl/lang/th.json index f31a27b455a8d1d0cd3c3fe27d6edd9096b3e94c..f1a73cf34e718bc1744b1c0bba21b0ee4825d0ed 100644 --- a/plugins/Intl/lang/th.json +++ b/plugins/Intl/lang/th.json @@ -63,7 +63,7 @@ "Country_CW": "คูราเซา", "Country_CX": "เà¸à¸²à¸°à¸„ริสต์มาส", "Country_CY": "ไซปรัส", - "Country_CZ": "สาธารณรัà¸à¹€à¸Šà¹‡à¸", + "Country_CZ": "เช็à¸", "Country_DE": "เยà¸à¸£à¸¡à¸™à¸µ", "Country_DJ": "จิบูตี", "Country_DK": "เดนมาร์à¸", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEEที่ d MMMM G y", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM G y", "Format_Interval_Long_M": "d MMMM – d MMMM G y", "Format_Interval_Long_Y": "d MMMM G y – d MMMM y", diff --git a/plugins/Intl/lang/tl.json b/plugins/Intl/lang/tl.json index 50f776d514bf71c3dfc5f36d93b39eaffe8d3e7a..24fcf6ee7532004183ac65469a4a85478dba7f6b 100644 --- a/plugins/Intl/lang/tl.json +++ b/plugins/Intl/lang/tl.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmas Island", "Country_CY": "Cyprus", - "Country_CZ": "Czech Republic", + "Country_CZ": "Czechia", "Country_DE": "Germany", "Country_DJ": "Djibouti", "Country_DK": "Denmark", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, MMMM d, y", "Format_Date_Short": "MMM d, y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "MMMM d–d, y", "Format_Interval_Long_M": "MMMM d – MMMM d, y", "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", diff --git a/plugins/Intl/lang/tr.json b/plugins/Intl/lang/tr.json index f94ba5e001d5c1f8f8da63600b329bc11e3c6f3b..1aa9c650febf9921118b7999f7c8c7ab2bfbb534 100644 --- a/plugins/Intl/lang/tr.json +++ b/plugins/Intl/lang/tr.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Christmas Adası", "Country_CY": "Kıbrıs", - "Country_CZ": "Çek Cumhuriyeti", + "Country_CZ": "Çekya", "Country_DE": "Almanya", "Country_DJ": "Cibuti", "Country_DK": "Danimarka", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "d MMMM E", "Format_Date_Long": "d MMMM y EEEE", "Format_Date_Short": "d MMM y", + "Format_Hour_12": "a h", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/uk.json b/plugins/Intl/lang/uk.json index e6f3e902e513706e76c994ced5b57a6a164e4db3..be5710fe7678c880594c765a96677071ad3fb344 100644 --- a/plugins/Intl/lang/uk.json +++ b/plugins/Intl/lang/uk.json @@ -63,7 +63,7 @@ "Country_CW": "КюраÑао", "Country_CX": "ОÑтрів Різдва", "Country_CY": "Кіпр", - "Country_CZ": "ЧеÑька РеÑпубліка", + "Country_CZ": "ЧехіÑ", "Country_DE": "Ðімеччина", "Country_DJ": "Джибуті", "Country_DK": "ДаніÑ", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y 'Ñ€'.", "Format_Date_Short": "d MMM y 'Ñ€'.", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d–d MMMM y", "Format_Interval_Long_M": "d MMMM – d MMMM y", "Format_Interval_Long_Y": "d MMMM y – d MMMM y", diff --git a/plugins/Intl/lang/vi.json b/plugins/Intl/lang/vi.json index d90239f51906bad770c90a8ba31474ce6047f08e..bd64a859219cf88408fa0cf4c8861d88904e5beb 100644 --- a/plugins/Intl/lang/vi.json +++ b/plugins/Intl/lang/vi.json @@ -63,7 +63,7 @@ "Country_CW": "Curaçao", "Country_CX": "Äảo Giáng Sinh", "Country_CY": "SÃp", - "Country_CZ": "Cá»™ng hòa Séc", + "Country_CZ": "Czechia", "Country_DE": "Äức", "Country_DJ": "Djibouti", "Country_DK": "Äan Mạch", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", + "Format_Hour_12": "h a", + "Format_Hour_24": "HH", "Format_Interval_Long_D": "d – d MMMM, y", "Format_Interval_Long_M": "d MMMM – d MMMM, y", "Format_Interval_Long_Y": "'Ngà y' dd 'tháng' M 'năm' y - 'Ngà y' dd 'tháng' M 'năm' y", diff --git a/plugins/Intl/lang/zh-cn.json b/plugins/Intl/lang/zh-cn.json index 954b5b4d13581c6cde03421c2a138dfe4cd3e52e..ee37bb0e579d0c6dde13d697a55b10f6ed5a3f1d 100644 --- a/plugins/Intl/lang/zh-cn.json +++ b/plugins/Intl/lang/zh-cn.json @@ -63,7 +63,7 @@ "Country_CW": "库拉索", "Country_CX": "圣诞岛", "Country_CY": "塞浦路斯", - "Country_CZ": "æ·å…‹å…±å’Œå›½", + "Country_CZ": "æ·å…‹", "Country_DE": "德国", "Country_DJ": "å‰å¸ƒæ", "Country_DK": "丹麦", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "M月dæ—¥E", "Format_Date_Long": "yå¹´M月dæ—¥EEEE", "Format_Date_Short": "yå¹´M月dæ—¥", + "Format_Hour_12": "ahæ—¶", + "Format_Hour_24": "Hæ—¶", "Format_Interval_Long_D": "yå¹´M月d日至dæ—¥", "Format_Interval_Long_M": "yå¹´M月d日至M月dæ—¥", "Format_Interval_Long_Y": "yå¹´M月d日至yå¹´M月dæ—¥", diff --git a/plugins/Intl/lang/zh-tw.json b/plugins/Intl/lang/zh-tw.json index c4a345a33a673b4b3417a0185b9a26d2c790e1f1..fcbc0cf3ffefb724417e69d65a5512bcba3786b0 100644 --- a/plugins/Intl/lang/zh-tw.json +++ b/plugins/Intl/lang/zh-tw.json @@ -63,7 +63,7 @@ "Country_CW": "庫拉索", "Country_CX": "è–誕島", "Country_CY": "賽普勒斯", - "Country_CZ": "æ·å…‹å…±å’Œåœ‹", + "Country_CZ": "æ·å…‹", "Country_DE": "德國", "Country_DJ": "å‰å¸ƒåœ°", "Country_DK": "丹麥", @@ -305,6 +305,8 @@ "Format_Date_Day_Month": "M月dæ—¥ E", "Format_Date_Long": "yå¹´M月dæ—¥ EEEE", "Format_Date_Short": "yå¹´M月dæ—¥", + "Format_Hour_12": "ah時", + "Format_Hour_24": "H時", "Format_Interval_Long_D": "yå¹´M月d日至dæ—¥", "Format_Interval_Long_M": "yå¹´M月d日至M月dæ—¥", "Format_Interval_Long_Y": "yå¹´M月d日至yå¹´M月dæ—¥", diff --git a/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml b/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml index 748c4b2023db985dabfee61d34582e4385c0d643..ee022684bbdbac40797a3ead78eae4432d575648 100644 --- a/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml +++ b/plugins/UserCountry/tests/System/expected/test___UserCountry.getCountryCodeMapping.xml @@ -56,7 +56,7 @@ <cw>Curaçao</cw> <cx>Christmas Island</cx> <cy>Cyprus</cy> - <cz>Czech Republic</cz> + <cz>Czechia</cz> <de>Germany</de> <dj>Djibouti</dj> <dk>Denmark</dk> diff --git a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml index 61ae72efc38d14e4a3c50bffae8244ac4cb33de3..ad365afbfdaedba27f71c9e606691bc7e6270719 100644 --- a/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml @@ -73,7 +73,7 @@ <segment>languageCode==zh-sg</segment> </row> <row> - <label>Czech - Czech Republic (cs-cz)</label> + <label>Czech - Czechia (cs-cz)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/plugins/VisitTime/functions.php b/plugins/VisitTime/functions.php index 5a9162c6ed1b84e2fc6675837e025a4720e213e5..14625ceebfe15166f83611c4f823414493b69b50 100644 --- a/plugins/VisitTime/functions.php +++ b/plugins/VisitTime/functions.php @@ -9,11 +9,20 @@ namespace Piwik\Plugins\VisitTime; +use Piwik\Container\StaticContainer; +use Piwik\Date; use Piwik\Piwik; function getTimeLabel($label) { - return sprintf(Piwik::translate('Intl_NHoursShort'), $label); + $date = Date::factory(mktime($label)); + $dateTimeProvider = StaticContainer::get('Piwik\Intl\Data\Provider\DateTimeFormatProvider'); + + if ($dateTimeProvider->uses12HourClock()) { + return $date->getLocalized(Piwik::translate('Intl_Format_Hour_12')); + } + + return $date->getLocalized(Piwik::translate('Intl_Format_Hour_24')); } /** diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 73bdb32cdc9787b7b5d0e5b395abfa2dd98a8bd6..582e1707d19929324f22b6c4d932199280baad4a 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -142,6 +142,10 @@ class BackwardsCompatibility1XTest extends SystemTestCase // we test VisitFrequency explicitly 'VisitFrequency.get', + // do not test as label formats have changed + 'VisitTime.getVisitInformationPerLocalTime', + 'VisitTime.getVisitInformationPerServerTime', + // the Action.getPageTitles test fails for unknown reason, so skipping it // eg. https://travis-ci.org/piwik/piwik/jobs/24449365 'Action.getPageTitles', diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 46f45bc7b393e8bd42b0a3d6acc5fe187f384559..79a0caae72089a6bf0883f0985bb1789566b1c6b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -13,7 +13,7 @@ <segment>visitLocalHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -25,7 +25,7 @@ <segment>visitLocalHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -37,7 +37,7 @@ <segment>visitLocalHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -49,7 +49,7 @@ <segment>visitLocalHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -61,7 +61,7 @@ <segment>visitLocalHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -73,7 +73,7 @@ <segment>visitLocalHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -85,7 +85,7 @@ <segment>visitLocalHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -97,7 +97,7 @@ <segment>visitLocalHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> <max_actions>1</max_actions> @@ -109,7 +109,7 @@ <segment>visitLocalHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -121,7 +121,7 @@ <segment>visitLocalHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -133,7 +133,7 @@ <segment>visitLocalHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> <max_actions>2</max_actions> @@ -145,7 +145,7 @@ <segment>visitLocalHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> <max_actions>1</max_actions> @@ -157,7 +157,7 @@ <segment>visitLocalHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> <max_actions>1</max_actions> @@ -169,7 +169,7 @@ <segment>visitLocalHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -181,7 +181,7 @@ <segment>visitLocalHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -193,7 +193,7 @@ <segment>visitLocalHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -205,7 +205,7 @@ <segment>visitLocalHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_visits>8</nb_visits> <nb_actions>11</nb_actions> <max_actions>3</max_actions> @@ -217,7 +217,7 @@ <segment>visitLocalHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> <max_actions>3</max_actions> @@ -229,7 +229,7 @@ <segment>visitLocalHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -241,7 +241,7 @@ <segment>visitLocalHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> <max_actions>1</max_actions> @@ -253,7 +253,7 @@ <segment>visitLocalHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -265,7 +265,7 @@ <segment>visitLocalHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -277,7 +277,7 @@ <segment>visitLocalHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 09be75ee7402a244d091f2556496b7db777b6acd..d4bcc2ab0c56339a18485dd74399ae33b8ae9e99 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -13,7 +13,7 @@ <segment>visitServerHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -34,7 +34,7 @@ <segment>visitServerHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -46,7 +46,7 @@ <segment>visitServerHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -58,7 +58,7 @@ <segment>visitServerHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -79,7 +79,7 @@ <segment>visitServerHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -91,7 +91,7 @@ <segment>visitServerHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -103,7 +103,7 @@ <segment>visitServerHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -124,7 +124,7 @@ <segment>visitServerHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> <max_actions>1</max_actions> @@ -145,7 +145,7 @@ <segment>visitServerHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -157,7 +157,7 @@ <segment>visitServerHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -169,7 +169,7 @@ <segment>visitServerHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> <max_actions>2</max_actions> @@ -190,7 +190,7 @@ <segment>visitServerHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -211,7 +211,7 @@ <segment>visitServerHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> <max_actions>1</max_actions> @@ -232,7 +232,7 @@ <segment>visitServerHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -244,7 +244,7 @@ <segment>visitServerHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -265,7 +265,7 @@ <segment>visitServerHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -286,7 +286,7 @@ <segment>visitServerHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_visits>8</nb_visits> <nb_actions>11</nb_actions> <max_actions>3</max_actions> @@ -307,7 +307,7 @@ <segment>visitServerHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> <max_actions>3</max_actions> @@ -328,7 +328,7 @@ <segment>visitServerHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <max_actions>2</max_actions> @@ -349,7 +349,7 @@ <segment>visitServerHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> <max_actions>1</max_actions> @@ -370,7 +370,7 @@ <segment>visitServerHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -391,7 +391,7 @@ <segment>visitServerHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -403,7 +403,7 @@ <segment>visitServerHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index cee8ad2d779ad760b4707f2b0618721643893e80..b6cff4f6c8ecb70234cf453229f2acc0242e69e1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -55,7 +55,7 @@ </columns> <reportData> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>20</nb_actions> @@ -66,7 +66,7 @@ <bounce_rate>0%</bounce_rate> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> @@ -77,7 +77,7 @@ <bounce_rate>100%</bounce_rate> </row> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -88,7 +88,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -99,7 +99,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -110,7 +110,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -121,7 +121,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -132,7 +132,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -143,7 +143,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -154,7 +154,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -165,7 +165,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -176,7 +176,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -187,7 +187,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -198,7 +198,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -209,7 +209,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -220,7 +220,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -231,7 +231,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -242,7 +242,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -253,7 +253,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -264,7 +264,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -275,7 +275,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -286,7 +286,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -297,7 +297,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -308,7 +308,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml index 0b6712aa1b8c2b0f61506ee6ed732c4889bf20f3..a35c24e46c258a347f39b3cc07e4f9442f52e0f6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -12,7 +12,7 @@ <segment>visitLocalHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -23,7 +23,7 @@ <segment>visitLocalHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -34,7 +34,7 @@ <segment>visitLocalHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -45,7 +45,7 @@ <segment>visitLocalHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -56,7 +56,7 @@ <segment>visitLocalHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -67,7 +67,7 @@ <segment>visitLocalHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -78,7 +78,7 @@ <segment>visitLocalHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -89,7 +89,7 @@ <segment>visitLocalHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -100,7 +100,7 @@ <segment>visitLocalHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -111,7 +111,7 @@ <segment>visitLocalHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -122,7 +122,7 @@ <segment>visitLocalHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -133,7 +133,7 @@ <segment>visitLocalHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> @@ -144,7 +144,7 @@ <segment>visitLocalHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -155,7 +155,7 @@ <segment>visitLocalHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -166,7 +166,7 @@ <segment>visitLocalHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -177,7 +177,7 @@ <segment>visitLocalHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -188,7 +188,7 @@ <segment>visitLocalHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -199,7 +199,7 @@ <segment>visitLocalHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -210,7 +210,7 @@ <segment>visitLocalHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -221,7 +221,7 @@ <segment>visitLocalHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -232,7 +232,7 @@ <segment>visitLocalHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -243,7 +243,7 @@ <segment>visitLocalHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -254,7 +254,7 @@ <segment>visitLocalHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml index 6626c3ffafd9890fbeb3e09f5eb52b97a0d023e3..91608ad1d55bf4e5cd4bd5622f45da0fe93c10fc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -12,7 +12,7 @@ <segment>visitServerHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -23,7 +23,7 @@ <segment>visitServerHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -34,7 +34,7 @@ <segment>visitServerHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -45,7 +45,7 @@ <segment>visitServerHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -56,7 +56,7 @@ <segment>visitServerHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -67,7 +67,7 @@ <segment>visitServerHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -78,7 +78,7 @@ <segment>visitServerHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -89,7 +89,7 @@ <segment>visitServerHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -100,7 +100,7 @@ <segment>visitServerHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -111,7 +111,7 @@ <segment>visitServerHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -122,7 +122,7 @@ <segment>visitServerHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>7</nb_actions> @@ -141,7 +141,7 @@ <segment>visitServerHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -160,7 +160,7 @@ <segment>visitServerHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -171,7 +171,7 @@ <segment>visitServerHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -182,7 +182,7 @@ <segment>visitServerHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -193,7 +193,7 @@ <segment>visitServerHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -204,7 +204,7 @@ <segment>visitServerHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -215,7 +215,7 @@ <segment>visitServerHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -226,7 +226,7 @@ <segment>visitServerHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -237,7 +237,7 @@ <segment>visitServerHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -248,7 +248,7 @@ <segment>visitServerHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -259,7 +259,7 @@ <segment>visitServerHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -270,7 +270,7 @@ <segment>visitServerHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml index 2fcd4a341fd7638fdc2d9f9b5cff41893a4f2c81..92feaea19acb569ea2a3d03d86d9f9adae3de3c0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml @@ -34,122 +34,122 @@ </columns> <reportData> <row> - <label>0h</label> + <label>00</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>1h</label> + <label>01</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>2h</label> + <label>02</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>3h</label> + <label>03</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>4h</label> + <label>04</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>5h</label> + <label>05</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>6h</label> + <label>06</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>7h</label> + <label>07</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>8h</label> + <label>08</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>9h</label> + <label>09</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>10h</label> + <label>10</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>11h</label> + <label>11</label> <nb_visits>1</nb_visits> <revenue>$ 42</revenue> </row> <row> - <label>12h</label> + <label>12</label> <nb_visits>1</nb_visits> <revenue>$ 1</revenue> </row> <row> - <label>13h</label> + <label>13</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>14h</label> + <label>14</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>15h</label> + <label>15</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>16h</label> + <label>16</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>17h</label> + <label>17</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>18h</label> + <label>18</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>19h</label> + <label>19</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>20h</label> + <label>20</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>21h</label> + <label>21</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>22h</label> + <label>22</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> <row> - <label>23h</label> + <label>23</label> <nb_visits>0</nb_visits> <revenue>$ 0</revenue> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml index c89a8a6d255b726dd5882368dad963f78cc51224..dfc1858282d9bc7249c50155afaaaa1be44924bf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -13,7 +13,7 @@ <segment>visitLocalHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -25,7 +25,7 @@ <segment>visitLocalHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -37,7 +37,7 @@ <segment>visitLocalHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -49,7 +49,7 @@ <segment>visitLocalHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -61,7 +61,7 @@ <segment>visitLocalHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -73,7 +73,7 @@ <segment>visitLocalHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -85,7 +85,7 @@ <segment>visitLocalHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -97,7 +97,7 @@ <segment>visitLocalHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -109,7 +109,7 @@ <segment>visitLocalHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -121,7 +121,7 @@ <segment>visitLocalHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -133,7 +133,7 @@ <segment>visitLocalHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -145,7 +145,7 @@ <segment>visitLocalHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> @@ -157,7 +157,7 @@ <segment>visitLocalHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -169,7 +169,7 @@ <segment>visitLocalHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -181,7 +181,7 @@ <segment>visitLocalHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -193,7 +193,7 @@ <segment>visitLocalHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -205,7 +205,7 @@ <segment>visitLocalHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -217,7 +217,7 @@ <segment>visitLocalHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -229,7 +229,7 @@ <segment>visitLocalHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -241,7 +241,7 @@ <segment>visitLocalHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -253,7 +253,7 @@ <segment>visitLocalHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -265,7 +265,7 @@ <segment>visitLocalHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -277,7 +277,7 @@ <segment>visitLocalHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index 944821160baffe2693a7b8387fbb56bc89c7bedf..f6e2db96de0213b0d22b982d2b3ceb2caced11fc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -13,7 +13,7 @@ <segment>visitServerHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -25,7 +25,7 @@ <segment>visitServerHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -37,7 +37,7 @@ <segment>visitServerHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -49,7 +49,7 @@ <segment>visitServerHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -61,7 +61,7 @@ <segment>visitServerHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -73,7 +73,7 @@ <segment>visitServerHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -85,7 +85,7 @@ <segment>visitServerHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -97,7 +97,7 @@ <segment>visitServerHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -109,7 +109,7 @@ <segment>visitServerHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -121,7 +121,7 @@ <segment>visitServerHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -133,7 +133,7 @@ <segment>visitServerHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>8</nb_actions> @@ -153,7 +153,7 @@ <segment>visitServerHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -173,7 +173,7 @@ <segment>visitServerHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -185,7 +185,7 @@ <segment>visitServerHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -197,7 +197,7 @@ <segment>visitServerHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -209,7 +209,7 @@ <segment>visitServerHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -221,7 +221,7 @@ <segment>visitServerHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -233,7 +233,7 @@ <segment>visitServerHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -245,7 +245,7 @@ <segment>visitServerHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -257,7 +257,7 @@ <segment>visitServerHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -269,7 +269,7 @@ <segment>visitServerHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -281,7 +281,7 @@ <segment>visitServerHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -293,7 +293,7 @@ <segment>visitServerHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 41f56d803adbe6870768848ab7ba1ac6f4b8e852..893a066066319a21463906c59344993289bee4a2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -173,57 +173,57 @@ nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_ret Visits per local time label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -0h,0,0,0%,0,00:00:00,0% -1h,0,0,0%,0,00:00:00,0% -2h,0,0,0%,0,00:00:00,0% -3h,0,0,0%,0,00:00:00,0% -4h,0,0,0%,0,00:00:00,0% -5h,0,0,0%,0,00:00:00,0% -6h,0,0,0%,0,00:00:00,0% -7h,0,0,0%,0,00:00:00,0% -8h,0,0,0%,0,00:00:00,0% -9h,0,0,0%,0,00:00:00,0% -10h,0,0,0%,0,00:00:00,0% -11h,0,0,0%,0,00:00:00,0% -12h,11,43,0%,3.9,00:10:55,27% -13h,0,0,0%,0,00:00:00,0% -14h,0,0,0%,0,00:00:00,0% -15h,0,0,0%,0,00:00:00,0% -16h,0,0,0%,0,00:00:00,0% -17h,0,0,0%,0,00:00:00,0% -18h,0,0,0%,0,00:00:00,0% -19h,0,0,0%,0,00:00:00,0% -20h,0,0,0%,0,00:00:00,0% -21h,0,0,0%,0,00:00:00,0% -22h,0,0,0%,0,00:00:00,0% -23h,0,0,0%,0,00:00:00,0% +00,0,0,0%,0,00:00:00,0% +01,0,0,0%,0,00:00:00,0% +02,0,0,0%,0,00:00:00,0% +03,0,0,0%,0,00:00:00,0% +04,0,0,0%,0,00:00:00,0% +05,0,0,0%,0,00:00:00,0% +06,0,0,0%,0,00:00:00,0% +07,0,0,0%,0,00:00:00,0% +08,0,0,0%,0,00:00:00,0% +09,0,0,0%,0,00:00:00,0% +10,0,0,0%,0,00:00:00,0% +11,0,0,0%,0,00:00:00,0% +12,11,43,0%,3.9,00:10:55,27% +13,0,0,0%,0,00:00:00,0% +14,0,0,0%,0,00:00:00,0% +15,0,0,0%,0,00:00:00,0% +16,0,0,0%,0,00:00:00,0% +17,0,0,0%,0,00:00:00,0% +18,0,0,0%,0,00:00:00,0% +19,0,0,0%,0,00:00:00,0% +20,0,0,0%,0,00:00:00,0% +21,0,0,0%,0,00:00:00,0% +22,0,0,0%,0,00:00:00,0% +23,0,0,0%,0,00:00:00,0% Visits per server time label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -0h,1,1,1,00:00:00,100%,$ 0 -1h,0,0,0,00:00:00,0%,$ 0 -2h,0,0,0,00:00:00,0%,$ 0 -3h,0,0,0,00:00:00,0%,$ 0 -4h,0,0,0,00:00:00,0%,$ 0 -5h,0,0,0,00:00:00,0%,$ 0 -6h,0,0,0,00:00:00,0%,$ 0 -7h,0,0,0,00:00:00,0%,$ 0 -8h,0,0,0,00:00:00,0%,$ 0 -9h,0,0,0,00:00:00,0%,$ 0 -10h,0,0,0,00:00:00,0%,$ 0 -11h,8,40,5,00:15:01,0%,$ 0 -12h,1,1,1,00:00:00,100%,$ 0 -13h,0,0,0,00:00:00,0%,$ 0 -14h,0,0,0,00:00:00,0%,$ 0 -15h,0,0,0,00:00:00,0%,$ 0 -16h,0,0,0,00:00:00,0%,$ 0 -17h,0,0,0,00:00:00,0%,$ 0 -18h,0,0,0,00:00:00,0%,$ 0 -19h,0,0,0,00:00:00,0%,$ 0 -20h,0,0,0,00:00:00,0%,$ 0 -21h,0,0,0,00:00:00,0%,$ 0 -22h,0,0,0,00:00:00,0%,$ 0 -23h,1,1,1,00:00:00,100%,$ 0 +00,1,1,1,00:00:00,100%,$ 0 +01,0,0,0,00:00:00,0%,$ 0 +02,0,0,0,00:00:00,0%,$ 0 +03,0,0,0,00:00:00,0%,$ 0 +04,0,0,0,00:00:00,0%,$ 0 +05,0,0,0,00:00:00,0%,$ 0 +06,0,0,0,00:00:00,0%,$ 0 +07,0,0,0,00:00:00,0%,$ 0 +08,0,0,0,00:00:00,0%,$ 0 +09,0,0,0,00:00:00,0%,$ 0 +10,0,0,0,00:00:00,0%,$ 0 +11,8,40,5,00:15:01,0%,$ 0 +12,1,1,1,00:00:00,100%,$ 0 +13,0,0,0,00:00:00,0%,$ 0 +14,0,0,0,00:00:00,0%,$ 0 +15,0,0,0,00:00:00,0%,$ 0 +16,0,0,0,00:00:00,0%,$ 0 +17,0,0,0,00:00:00,0%,$ 0 +18,0,0,0,00:00:00,0%,$ 0 +19,0,0,0,00:00:00,0%,$ 0 +20,0,0,0,00:00:00,0%,$ 0 +21,0,0,0,00:00:00,0%,$ 0 +22,0,0,0,00:00:00,0%,$ 0 +23,1,1,1,00:00:00,100%,$ 0 Visits by Day of Week label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index c08c9b38e3c4967420a1c86fe030ffa747eced22..e057bf8431c47abd2e283c8c5e99312327ee5b46 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -2867,7 +2867,7 @@ </h2> <img alt="" - src="data:image/png;base64,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Mh88tvt333n4B/85/vQzyY7U7xwpP/bxt0699OoXvvGDVJm9G0rf/JP3Zln2sc89vZDsbST7+uPv7llomdfsnIbnnnuu9mnPP//8PffcE5nlCy+8cODAgb6+vrYWuLHx8fHh4eHBwcGEmS+99NL8/PyuXbsSZr766quXLl3av39/wszXX3+9Wq0eOXIkYWaWZadPn963b9/GjRsTZp4/f35wcHDr1q0JMy9evDg3N7d79+6EmbOzs9PT03fddVfCzPn5+VOnTh09ejRhZpZlL7744u7duzdv3pwwc3JyctOmTdu2bUuY+fLLL9+4cWPPnj0JM69fvz41NXXw4MGEmVmWnTx58siRI6VSyl2wZ86c2bVrV7lcTpg5NTXV19e3Y8eOhJlXr16dmZnZu3dvwsybN2+Oj48fOnQoYWaWZadOnapUKr29yf7pzbLs3Llz27dvHxgYSJg5PT1dKpV27tyZMHNmZubKlSv79u1LmDk3N3f27NnDhw9HntzmL/2hhx5qcbPV/Hp777777rTvRkNDQzt27BgZGUmYOTExMT8/n3bFXL169cKFC2nf4Ofm5vr7+x944IGEmVmW9ff3Hzp0KO270fDw8PDw8Pbt2xNmTk1Nvfbaa2l72MzMzPnz59O+wd+6datUKp04cSJhZpZlmzZtOnDgwJYtWxJmbtu2rVwup63L09PTs7OzaXvYtWvXRkZGjh07ljBz0fHjxzds2JAwsFwu7927N+1/NefOnevv709bly9dunTlypXay+Xyu379+uDg4H333ZcwM8uyUql07733pv3nc2BgYHR0NO1/NePj46VSaWxsLGHm5cuXL168GHyDD7p58+bmzZvvvz+079A5DQBAyAp7GqrVqs9pAACyyOEJRQEAyByeAACCVrh6AgBgUaf3NKQ9Nbe4zIJiZa6J2LWSWWi49bVuMwuKXSuZBcW+aTJTXufaevYJz41YjE17skURi1roOaSpvgdk+SaS/OUX8ftMmNzlq3751p4/vOEIyj+sOrOoBb38pYeSZCbZVluspvYCG8YWtKjdvOrrEnLGNps8z4Dq2HK2k7lQmIMHDy6/WXdn27G1OakyW8yiSzJr05ai0i5nksyGCalee11gF66mhJkrbu1thDecJP+w6syiFvTylx5qb1gFf3upVlPbmc1i7+gJkUm6edW3TrjT2GYrKM+A6thytpdZ7J6GZvKU5WaTFJGZJ7aIzKXJ6y6FzZ/ZbEbtZbb4dy3Vci7/rNIksXWzWPXMO5p1MLzho/nX1/In5B8CnclcmrztYdWZ1ZRkWLV+QnvDqmNbaSczg7HNHsqzpu5ohHY+cxVKQ+12mXAfe/LMgmJzZjacJH/m0s8Nc7oks8W8um01dSyz0PD1s74Mq4bz6rbV1LHMgmLfHJmrUBrS/q1Mnln7O8ofu7yv5clstk3kyaybdmkWOV973f8rSTKXBy6f152qNvn4si7fSjsTbli1nWlYdfmwWvH9tY3YjmXmHE0r7k9qnbk6hye6U57zVpopogPW/lzo+9B6sHz85P+VVpft5V7PDKt1qJuHVREbZMcyc86o4eR3OpqUhl9ZE38pko/DtWhNvPCGRX4dWosrq/sXuAhr4oXnH1ZFvMyOZeacUarl9ImQWVbYWk8bWJC1spxr1Jr4W1wQw4qCtLdpaQzL72wjqsA9Dc0Oa+W0lJl2j1Ddry/5zrSufecoYjmLe+3Jh2jRW2nOwOVbe/4FbjiC8g+r1rHtLW3HXn5OnVnOJNtqs9WU8w0p+aK23pxy7p+vXbCEi1qbkHMza53Z3qKmeu0+RhoACHF4AgAIURoAgJBfAtdu82d7VDsiAAAAAElFTkSuQmCC" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAALtUlEQVR4nO3dfWzcd30H8K8vtpO4dmrnQXlwQtKcQ5qmVdulnbROIB7Eg0B0Q2hCbBL7A3X7A6ZtUqdJZeNBaEhFAm2TBggJihDiDwR/VKoA8fRHK8SgaAiYaLPmmmSO7Xh1Hlw7Thw39v6w5F7s8/nTu+/Puatfr798v7t73+/8u59/b9/v+73rWFhYSAAAaynd6hUAANqD0gAAhCgNAECI0gAAhCgNAECI0gAAhNzi0lAul1dbWPOqOvcCAArVuu80VCqVNa/SHgBg3dzi0lCpVJYd+Mvlcp26AADcKp3r8Bif/eqvli157CMPrHmvpfZQ3SqWliy1jaVrl/UPzQMA8lqP0vDC8Mtzc3NLF7u6ukZGRgYHByP3XfbGQ/XFxZZQfapitVsCAM1bp9MTM1VSSqOjo0tXVb9DsOaRPt4DNAYAyKt1B0IuWqwUkQGP8VsCAA1Yj9MTTaoe2RB5HyJySwDgtVqn0tDT01Pn2qUzFGtOs4yMVIjfEgCIW4/S8P63lUdHRhq7b/zYryUAQKHWozQ8/OaDKR1s7L71J1JWX2vKJQAUqmNhYeFWrwMA0AZaffYEANAilAYAIERpAABClAYAIERpAABCbppyWXPKonmMAECqLg01vyXSV0cCAItePT2hDQAAdRjTAACE1P4Y6TVPQ4zc/F0S4+Pje/bsybleAECLWV4afK80AFDT8tkTwbowODhY5yIA8Prz6pgGMyMAgDpe/ZbL6s9jWLTYIXxOAwCQfDU2ABBkyiUAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAEKI0AAAhSgMAENJ5q1cAaGN/9ekfZEz7yiffnTENyE5pABp08szFictXMwa+PD27rXdzxkAgL6cnAICQ5e80lMvllFKlUlm2ZFH1cgBgQ7mpNJTL5UqlUt0SFpesdhEA2DhuOj2hEAAAqzGmAQAIaXD2xOTkZPXF6enpbdu25VgfoG3MzMzkDZyenu5YuJ43E8iowdIwOjpaffH06dPVIyGAjWBiInNpOH/+/NRW88ChdTW4fx47dqzORWBD2HwxpTMZ84aGhnxOA7QyYxoAgJDlUy6rf6hUKstmYJpeAQAb1k2loWYnUBQAgOT0BAAQpDQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACFKAwAQojQAACGda96iXC4v/VypVIpcGQCgda1RGsrlcnVRWHYRANg4nJ4AAEKUBgAgZO0xDUGf/vLPpq7M5kr78/cc/4Nju7/1vd///sWJXJn3HNn1wXcd++V/j33nh8/nyuzv2/LYI3906eVrf/f4T3JllkodT3zmPSmlRz71/RvzC7liH//7t+wa6PncE7+4cPlqrsw/eeuRh+4b/O6PT/76ufFcmW88tP3D77v7t//zf088+btcmb093Z/56Jtmrs195BPfy5XZ0dHxrccfTil97LM/mntlPlfsP//1Q/t39/3bN391/sKVXJnvfOiOtz74hqeePvXz34zmyjy07/ZHPnBvrrRqN27M/9mjT+ZK6+hI3/3C+1NKj37+p7PXb+SK/du/eGDoDQNf+vavh8+/nCvzzScOvPuPD//4P8/85Jdnc2Xu29X7Nx86cWZ08nNf+0WuzO6uTf/6j29PKX3wH7JtppTSN/7lvZu7Oz/+709fuTaXK/ORD9x7vLzz60/+7tT/XsqV+cDxvX/6tiPP/NfwU09nO1O/a6Dn0b/8w7GXpj/xxWdyZXZuKn3pn96VUvrwx59ayHYYSf/x2Ds6FurmrTam4dlnn62+2fPPP3/XXXdFHvKFF144dOhQV1dXQytc2/DwcH9/f19fX8bMl156aX5+fvfu3Rkzp6enL1y4cPDgwYyZr7zySqVSOXr0aMbMlNKpU6cOHDiwefPmjJnnzp3r6+u7/fbbM2ZOTEzMzc3t3bs3Y+bMzMz4+Pgdd9yRMXN+fv7kyZPHjh3LmJlSevHFF/fu3bt169aMmaOjo1u2bNm+fXvGzIsXL167dm3fvn0ZM69evTo2Nnb48OGMmSml55577ujRo6VSzrdgT58+vXv37p6enoyZY2NjXV1dO3fuzJg5OTk5NTW1f//+jJmzs7PDw8NDQ0MZM1NKJ0+eLJfLnZ3Z/ulNKZ09e3bHjh29vb0ZM8fHx0ul0q5duzJmTk1NXb58+cCBAxkz5+bmzpw5c+TIkciNG/ylP/jgg3Uu1nu8zs4777wz79Fo27ZtO3fuHBgYyJg5MjIyPz+fd8NMTk6eP38+7wF+bm6uu7v7/vvvz5iZUuru7h4aGsp7NOrv7+/v79+xY0fGzLGxsevXr+ftYVNTU+fOnct7gL9x40apVDpx4kTGzJTSli1bDh06dNttt2XM3L59e09PT966PD4+PjMzk7eHXblyZWBg4Pjx4xkzF913332bNm3KGNjT07N///68/9WcPXu2u7s7b12+cOHC5cuXq6fLNe/q1at9fX333HNPxsyUUqlUuvvuu/P+89nb27tnz568/9UMDw+XSqXBwcGMmZcuXZqYmAge4INmZ2e3bt16772h9w6NaQAAQtZ4p6FSqficBgAgRU5PKAoAQHJ6AgAIWmP2BADAopxTVlaqOR6iyUESq919cXnDJ1PWbVULevpL12bJXDmC+rXG1t9MDQSuFlvQqrbgpk+1XuRFZK62sNXWM8twqzrPtOFPzV+W2fxLdGXmsuRWXs+CNlML7qEb5di0UJjDhw+vvFhzYZOZq4U3GVvEqhb09JcuNvAbiKxnlsziYtdc+FozW3DT18wpInO1ha22ns1n1oytvipXZpMv+5qZzceuuZVbeTO14B66cY5Nr5MxDUWM1myXzEWt/11i67CGrf9LaMa6vSCbfKCVd29+zYvIrBPSzAtpfTZT8y/1+ndvLL+gvS977Hr+bS9iM93azGJPT7A+ijhYFjHV1vRdWp+9CepQGkLy/h1p8kzkyrSim3iuhyj0a9YzBvp4kuK08q6U7E2501p/VyqoIxbxTGvGNvlYK78pYvGHOplKwxqaHMNSU/XAk1y9ofrnFtwz28tqX7nSjGV/PTegttiVkr0pqyJ2pZRpbyriBVlE5mqx2Ucrp9gOpTTU0xZ/Mgr9971dtMUTX23s90bQFhso2Zva51k3uTd5g6Hhu79OBkIWoehTm62sXdazTbXL3+VcNvKulNpqVdtRA68ujaFmZvDuxX640y2ZYJorto0+AKD62laespxrsv7K2CZ3oZqZKxfmymz+uadar9Im17NmZgOxK++ed1dKmZ77arHV1xbxK23xzFy7Uip4MzWzN632gmxmVSOZuWKb3KGafPo+ERIACHF6AgAIURoAgJD/B/J2C+MFWR0XAAAAAElFTkSuQmCC" height="200" width="700" margin="0 auto"/> @@ -2903,7 +2903,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2926,7 +2926,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2949,7 +2949,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2972,7 +2972,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2995,7 +2995,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3018,7 +3018,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3041,7 +3041,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3064,7 +3064,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3087,7 +3087,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3110,7 +3110,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3133,7 +3133,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3156,7 +3156,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3179,7 +3179,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 11 </td> @@ -3202,7 +3202,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3225,7 +3225,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3248,7 +3248,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3271,7 +3271,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3294,7 +3294,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3317,7 +3317,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3340,7 +3340,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3363,7 +3363,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3386,7 +3386,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3409,7 +3409,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3432,7 +3432,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3464,7 +3464,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -3500,7 +3500,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3523,7 +3523,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3546,7 +3546,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3569,7 +3569,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3592,7 +3592,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3615,7 +3615,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3638,7 +3638,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3661,7 +3661,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3684,7 +3684,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3707,7 +3707,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3730,7 +3730,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3753,7 +3753,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 8 </td> @@ -3776,7 +3776,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3799,7 +3799,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3822,7 +3822,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3845,7 +3845,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3868,7 +3868,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3891,7 +3891,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3914,7 +3914,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3937,7 +3937,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3960,7 +3960,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3983,7 +3983,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4006,7 +4006,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -4029,7 +4029,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 4129e1960699c4cc93f19e2156569ad0c9a9bca7..4ccc27edec433ac45c66eded27d38a469a96bde6 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -2728,7 +2728,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2751,7 +2751,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2774,7 +2774,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2797,7 +2797,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2820,7 +2820,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2843,7 +2843,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2866,7 +2866,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2889,7 +2889,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2912,7 +2912,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2935,7 +2935,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2958,7 +2958,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2981,7 +2981,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3004,7 +3004,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 11 </td> @@ -3027,7 +3027,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3050,7 +3050,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3073,7 +3073,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3096,7 +3096,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3119,7 +3119,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3142,7 +3142,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3165,7 +3165,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3188,7 +3188,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3211,7 +3211,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3234,7 +3234,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3257,7 +3257,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3318,7 +3318,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3341,7 +3341,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3364,7 +3364,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3387,7 +3387,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3410,7 +3410,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3433,7 +3433,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3456,7 +3456,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3479,7 +3479,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3502,7 +3502,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3525,7 +3525,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3548,7 +3548,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3571,7 +3571,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 8 </td> @@ -3594,7 +3594,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3617,7 +3617,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3640,7 +3640,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3663,7 +3663,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3686,7 +3686,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3709,7 +3709,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3732,7 +3732,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3755,7 +3755,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3778,7 +3778,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3801,7 +3801,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3824,7 +3824,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3847,7 +3847,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf index f1a9297d724e39431ec4e8c40d6bf8ac3637fe6b..ad7646551bd55b1aac2416460d986eaf5541cd15 100644 Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index 6806c5300d30aaba707e12de786cb13eba310668..6c39c185b3bdcacd42014a5f5a00f268d48a0206 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -55,7 +55,7 @@ </columns> <reportData> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> @@ -66,7 +66,7 @@ <bounce_rate>0%</bounce_rate> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -77,7 +77,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> @@ -88,7 +88,7 @@ <bounce_rate>0%</bounce_rate> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -99,7 +99,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -110,7 +110,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -121,7 +121,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -132,7 +132,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> @@ -143,7 +143,7 @@ <bounce_rate>0%</bounce_rate> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -154,7 +154,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -165,7 +165,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -176,7 +176,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -187,7 +187,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -198,7 +198,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -209,7 +209,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -220,7 +220,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -231,7 +231,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -242,7 +242,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -253,7 +253,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -264,7 +264,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -275,7 +275,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -286,7 +286,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -297,7 +297,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -308,7 +308,7 @@ <revenue>$ 0</revenue> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml index 845699c6d28ccf64879a4fc42820f347a80f7578..fafbc7d0ea36bdf2e7035fcb2bf663bb94d5d48f 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -13,7 +13,7 @@ <segment>visitLocalHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -25,7 +25,7 @@ <segment>visitLocalHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -37,7 +37,7 @@ <segment>visitLocalHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -49,7 +49,7 @@ <segment>visitLocalHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -61,7 +61,7 @@ <segment>visitLocalHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -73,7 +73,7 @@ <segment>visitLocalHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -85,7 +85,7 @@ <segment>visitLocalHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -97,7 +97,7 @@ <segment>visitLocalHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -109,7 +109,7 @@ <segment>visitLocalHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -121,7 +121,7 @@ <segment>visitLocalHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -133,7 +133,7 @@ <segment>visitLocalHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -145,7 +145,7 @@ <segment>visitLocalHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>3</nb_visits> <nb_actions>13</nb_actions> @@ -157,7 +157,7 @@ <segment>visitLocalHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -169,7 +169,7 @@ <segment>visitLocalHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -181,7 +181,7 @@ <segment>visitLocalHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -193,7 +193,7 @@ <segment>visitLocalHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -205,7 +205,7 @@ <segment>visitLocalHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -217,7 +217,7 @@ <segment>visitLocalHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -229,7 +229,7 @@ <segment>visitLocalHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -241,7 +241,7 @@ <segment>visitLocalHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -253,7 +253,7 @@ <segment>visitLocalHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -265,7 +265,7 @@ <segment>visitLocalHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -277,7 +277,7 @@ <segment>visitLocalHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml index 84a48688b804fea2b3a06a2eba1eec66df91c87a..242bd1e8b23b028d2a8ea8b88beb7793a0b5cd25 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__VisitTime.getVisitInformationPerServerTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> @@ -21,7 +21,7 @@ <segment>visitServerHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -33,7 +33,7 @@ <segment>visitServerHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> @@ -64,7 +64,7 @@ <segment>visitServerHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -76,7 +76,7 @@ <segment>visitServerHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -88,7 +88,7 @@ <segment>visitServerHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -100,7 +100,7 @@ <segment>visitServerHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -112,7 +112,7 @@ <segment>visitServerHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> @@ -133,7 +133,7 @@ <segment>visitServerHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -145,7 +145,7 @@ <segment>visitServerHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -157,7 +157,7 @@ <segment>visitServerHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -169,7 +169,7 @@ <segment>visitServerHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -181,7 +181,7 @@ <segment>visitServerHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -193,7 +193,7 @@ <segment>visitServerHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -205,7 +205,7 @@ <segment>visitServerHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -217,7 +217,7 @@ <segment>visitServerHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -229,7 +229,7 @@ <segment>visitServerHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -241,7 +241,7 @@ <segment>visitServerHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -253,7 +253,7 @@ <segment>visitServerHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -265,7 +265,7 @@ <segment>visitServerHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -277,7 +277,7 @@ <segment>visitServerHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -289,7 +289,7 @@ <segment>visitServerHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -301,7 +301,7 @@ <segment>visitServerHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -313,7 +313,7 @@ <segment>visitServerHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index 78902751cb7e100c5873a31be627670d2b39dd01..2bdb10b6cb870be0e1979c15a82611acf8896aca 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -163,57 +163,57 @@ nb_uniq_visitors_returning,nb_users_returning,nb_visits_returning,nb_actions_ret Visits per local time label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -0h,0,0,0%,0,00:00:00,0% -1h,0,0,0%,0,00:00:00,0% -2h,0,0,0%,0,00:00:00,0% -3h,0,0,0%,0,00:00:00,0% -4h,0,0,0%,0,00:00:00,0% -5h,0,0,0%,0,00:00:00,0% -6h,0,0,0%,0,00:00:00,0% -7h,0,0,0%,0,00:00:00,0% -8h,0,0,0%,0,00:00:00,0% -9h,0,0,0%,0,00:00:00,0% -10h,0,0,0%,0,00:00:00,0% -11h,0,0,0%,0,00:00:00,0% -12h,5,16,80%,3.2,00:22:49,20% -13h,0,0,0%,0,00:00:00,0% -14h,0,0,0%,0,00:00:00,0% -15h,0,0,0%,0,00:00:00,0% -16h,0,0,0%,0,00:00:00,0% -17h,0,0,0%,0,00:00:00,0% -18h,0,0,0%,0,00:00:00,0% -19h,0,0,0%,0,00:00:00,0% -20h,0,0,0%,0,00:00:00,0% -21h,0,0,0%,0,00:00:00,0% -22h,0,0,0%,0,00:00:00,0% -23h,0,0,0%,0,00:00:00,0% +00,0,0,0%,0,00:00:00,0% +01,0,0,0%,0,00:00:00,0% +02,0,0,0%,0,00:00:00,0% +03,0,0,0%,0,00:00:00,0% +04,0,0,0%,0,00:00:00,0% +05,0,0,0%,0,00:00:00,0% +06,0,0,0%,0,00:00:00,0% +07,0,0,0%,0,00:00:00,0% +08,0,0,0%,0,00:00:00,0% +09,0,0,0%,0,00:00:00,0% +10,0,0,0%,0,00:00:00,0% +11,0,0,0%,0,00:00:00,0% +12,5,16,80%,3.2,00:22:49,20% +13,0,0,0%,0,00:00:00,0% +14,0,0,0%,0,00:00:00,0% +15,0,0,0%,0,00:00:00,0% +16,0,0,0%,0,00:00:00,0% +17,0,0,0%,0,00:00:00,0% +18,0,0,0%,0,00:00:00,0% +19,0,0,0%,0,00:00:00,0% +20,0,0,0%,0,00:00:00,0% +21,0,0,0%,0,00:00:00,0% +22,0,0,0%,0,00:00:00,0% +23,0,0,0%,0,00:00:00,0% Visits per server time label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -0h,1,4,$ 10,4,00:12:01,0% -1h,0,0,$ 0,0,00:00:00,0% -2h,2,9,$ 3111.11,4.5,00:42:01,0% -3h,0,0,$ 0,0,00:00:00,0% -4h,0,0,$ 0,0,00:00:00,0% -5h,0,0,$ 0,0,00:00:00,0% -6h,1,0,$ 10240,0,00:06:03,100% -7h,1,3,$ 0,3,00:12:01,0% -8h,0,0,$ 0,0,00:00:00,0% -9h,0,0,$ 0,0,00:00:00,0% -10h,0,0,$ 0,0,00:00:00,0% -11h,0,0,$ 0,0,00:00:00,0% -12h,0,0,$ 0,0,00:00:00,0% -13h,0,0,$ 0,0,00:00:00,0% -14h,0,0,$ 0,0,00:00:00,0% -15h,0,0,$ 0,0,00:00:00,0% -16h,0,0,$ 0,0,00:00:00,0% -17h,0,0,$ 0,0,00:00:00,0% -18h,0,0,$ 0,0,00:00:00,0% -19h,0,0,$ 0,0,00:00:00,0% -20h,0,0,$ 0,0,00:00:00,0% -21h,0,0,$ 0,0,00:00:00,0% -22h,0,0,$ 0,0,00:00:00,0% -23h,0,0,$ 0,0,00:00:00,0% +00,1,4,$ 10,4,00:12:01,0% +01,0,0,$ 0,0,00:00:00,0% +02,2,9,$ 3111.11,4.5,00:42:01,0% +03,0,0,$ 0,0,00:00:00,0% +04,0,0,$ 0,0,00:00:00,0% +05,0,0,$ 0,0,00:00:00,0% +06,1,0,$ 10240,0,00:06:03,100% +07,1,3,$ 0,3,00:12:01,0% +08,0,0,$ 0,0,00:00:00,0% +09,0,0,$ 0,0,00:00:00,0% +10,0,0,$ 0,0,00:00:00,0% +11,0,0,$ 0,0,00:00:00,0% +12,0,0,$ 0,0,00:00:00,0% +13,0,0,$ 0,0,00:00:00,0% +14,0,0,$ 0,0,00:00:00,0% +15,0,0,$ 0,0,00:00:00,0% +16,0,0,$ 0,0,00:00:00,0% +17,0,0,$ 0,0,00:00:00,0% +18,0,0,$ 0,0,00:00:00,0% +19,0,0,$ 0,0,00:00:00,0% +20,0,0,$ 0,0,00:00:00,0% +21,0,0,$ 0,0,00:00:00,0% +22,0,0,$ 0,0,00:00:00,0% +23,0,0,$ 0,0,00:00:00,0% Visits by Day of Week label,nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,nb_actions diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 7af97958ce5436e37765ea705a25fbc55b1b0114..7de861d54e2459ed937aed1ec749817587fd0a8d 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -2722,7 +2722,7 @@ </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAItElEQVR4nO3dP4sb6R0HcDmsY7zYu3DB4NstDlsEYl/KLKRKcc11gTR5A8k7SJXUR6o0aQ9S5q1c45AqYMNFLOSyC8ZF8GEfBBebwkQ7O9oZfXfmeeTR6fOpdiTNb34azSN9NX+0ty4uLmYAAOv84EM3AABsB6EBAIgIDQBARGgAACJCAwAQERoAgMjmQsN8Pu+68dq7euYCADZvEnsaFovF2rukBwD4sDYXGhaLReuDfz6f98QFAGBS9sqW++Nf/ta65Q+/+dnauZbpoZkqlrcs08by3lb+kDwAYAMKh4avv/n23bt3y8nbt2+fnZ0dHx8n87Z2PDQn36eE5qGKrkcCAJWUPzzxXcNsNjs/P1/e1dxDsPaTPs8BEgMAbMAkToR8732kSE54zB8JAJRS+PDESM0zG5L9EMkjAYAiyoeG/f39nnuXRyjWXmaZnKmQPxIAGKlwaPjVZ/Pzs7Nh8+af/VICAGxe4dDwy198Mpt9Mmze/gspm/e65BIANu/WxcXFh+4BANgCE7p6AgCYMqEBAIgIDQBARGgAACJCAwAQaV9y2byscePNAADTdSU0+NEkAKDL5eEJiQEA6NHe07D8W4AAAJquhIZmUFjueDi7+r8kXr58+fDhw800BwBMh6snAIDI+n9YdXx83DMJAOwIexoAgMiV/3LpREgAoIt/jQ0ARByeAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAyN6HbgDYPv/4+lXBaj/98YOC1YB6hAbgZr748qu/P39ZsODvf/vzk08/LlgQqMThCQAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBkrzkxn8+Xfy8Wi403AwBM12VomM/nzaDQmgQAdtzl4QkRAQDo4ZwGACCy15pentZgxwMA0NQODcussDyn4fnz580HnJ6eNs+XBHbN27dvyxY8+/fZwd63ZWsCNbRDw6qjo6Pm5MHBwcHBQbV+gKm7c+flbPamYMGPfvTR0dGDggWBSjqvnlg6PDzsmQR2zd7e+i8bN3L37t379++XrQnUcDn4F4uF32kAALpc+cYgKAAAXVxyCQBEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACCy15yYz+fLvxeLxcabAQCm6zI0zOfzZlBoTQIAO87hCQAgIjQAAJG99Q9Z8cWXX71+899SHfz685+cfPrxP//1nz//9Vmpmnd+uPen330206pWtVqh1RqsVa1qdStavXVxcfF+uuuchmfPrizyxYsXT58+TRZwenr64MGDe/fulep4Npu9efPm1atXjx49KlhzplWtalWrWtWqVgPr9zScnJz0TPbY398/Ojo6PDwMH594/fr1+fn5kydPCtacaVWrWtWqVrWq1YBzGgCAyOWehsVi4XcaAIAuVw5PCAoAQBeHJwCAyOXVEwAAPSruaWieITHlmttVVqs73mrt4ju+erW6461WKvt9anXIjzutXVLBcyPely17skXVVouXXRYvVXN1myheeeKtTn8DWN3sixS/djSNHGIba3V82Z5nOmZ8tcoW2Wh7XqlhBa8tW6nViW8ArQojy3bNXmRYtcrWaHVIzYsSHj9+vDrZunFw2WadUjV7FjGpsstqy1LFW61XttTTbxUcWXb6G8DazX5Y8WvnGjnENtbq+LI9s4wZX+EKHN/q+PG1dqUVWasT3wD6K9y0bNdrVGRYbaDVYTWL7WnoMiYdd81So+Y0y87+/x2o9Z2g+Hf6kWV7vqiVanX1F0uLlG0tonjNAWVvtPS8+LUPGPmqrd5bZCDUKNvzTMeMrxov1uq9RcZX/wOGja9Nbqsjyw54T1s7Y9ddxYdV/yyDWx1Ws25oaG6IpXaw16g52bLXzjK+1a79VCNbLV6zZ1k7vl1VLb47q9f46lrWjmwAmyz7vWm1bmgo+xZZvGZzdZRa161qY8p2bQEjW23NvlxKwbKlaq4WXF3WTS06fsSsxrZar2zV4jVeNePL+Bpcs39xA+Za++E6LCkWr9lVduTIWrtXqb9m9cMT0zTyLJUuNRJf8++qn0A7YnXAFFmri5Vd3LvM+NpZEx9fNbbMSlv7tWWLnF/Zmv2mw2oXQ8O2vDvUGHvbaFue+7XhfQdt6eu1FT3XsC3Pffz4qvFMK629tTsYStUcYOd+EbLea1y8ZiVb1OqW2pZ34RqMry1qdUsNPtFEYli9cUCpMnsauo5jjbSsWXb/T2tN1dh7NuXPjBqt1nv6xYdl1VaL1Fzd7Iv0fO1oGjnE+msO7rbGGqj9ZlK11aobwMiPok22Oqbm7Lots+CL1awwfmPrL9u8cUzNYU/fz0gDAJGdOzwBAAwjNAAAkf8BMK3qmIzXVQ8AAAAASUVORK5CYII=" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAIPklEQVR4nO3dP28caR0H8AlyAJmQ0ERKYqRTvMXhXEskKopr6JBoeAPwDqigPlHR0J5EyQuhuSaIlkiwssTJK0XRHZhYhCiRlsJoPd6/X3ueZzwjfz7VzszOb3+7ntn9euaZ3Tvz+bwBANjlGzfdAAAwDkIDABARGgCAiNAAAESEBgAgIjQAAJH+QsNkMtk0c+2iLWsBAP0bxJGG6XS6c5H0AAA3q7/QMJ1Olz74J5PJlrgAAAzKXtlyv/3Dn5fm/OYXP9y51iI9tFPFYs4ibSyWLuUPyQMAelA4NPzty3+/f/9+MXn37t2Tk5ODg4Nk3aUDD+3J85TQPlWx6Z4AQCXlT0/8p6VpmtlstljUPkKw85M+zwESAwD0YBADIc+dR4pkwGN+TwCglMKnJzpqj2xIjkMk9wQAiigfGvb397csXZyh2HmZZTJSIb8nANBR4dDws08ns5OT662bf/ZLCQDQv8Kh4ac//qhpPrreutsvpGwvdcklAPTvznw+v+keAIARGNDVEwDAkAkNAEBEaAAAIkIDABARGgCAyPIll+3LGntvBgAYrkuhwZcmAQCbXJyekBgAgC2WjzQsbgsQAEDbpdDQDgqLAw8nl39L4tWrV48ePeqnOQBgOFw9AQBEdv9g1cHBwZZJAOCWcKQBAIhc+pVLAyEBgE38NDYAEHF6AgCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIns33QAwPv9689+C1b733W8XrAbUIzQAV/PZ51/85a+vChb89S9/9PyTxwULApU4PQEARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQGSvPTGZTBa3p9Np780AAMN1ERomk0k7KCxNAgC33MXpCREBANjCmAYAILK3NL0Y1rA48HB6etq+w9nZ2f3793voDBimDx8+lC349u3bN2/elK0J1LAcGhZZYTGmYTabte9wfHzcHi8J3Dbv3r0rW/Drr76ezd6XrQnUsBwaVh0dHW2ZBG6b7/zpq6Y5K1jw4PsHH3/8uGBBoJKLMQ2OHwAAW1wcaZhOp76nAQDY5NLpCUEBANjEJZcAQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAIkIDABARGgCAiNAAAESEBgAgIjQAABGhAQCICA0AQERoAAAiQgMAEBEaAICI0AAARIQGACAiNAAAEaEBAIgIDQBARGgAACJCAwAQERoAgIjQAABEhAYAICI0AAARoQEAiAgNAEBEaAAAInvticlksrg9nU57bwYAGK6L0DCZTNpBYWkSALjlnJ4AACJCAwAQ2dt9lxWfff7F6dm7Uh38/Cc/eP7J47//45+//+OLUjW/9c293/3q00arWtVqhVZr8KpqVaujaPXOfD4/n940puHFi0sP+fLly2fPniUPcHx8/PDhw3v37pXquGmas7Oz169fP336tGDNRqta1apWtapVrQZ2H2l4/vz5lskt9vf3nzx58uDBg/D+idPT09lsdnR0VLBmo1WtalWrWtWqVgPGNAAAkYsjDdPp1Pc0AACbXDo9ISgAAJs4PQEARC6ungAA2OI639Ow1trxEN0HSWyqcD6/YM1KrXYsu331a3/V92rZ9pxND3fVmkvzB97qMDeAZt2mXqPmppkdyw7z6a8t215UpNXuG+raskvFB97qMDcAn1adys5LODw8XJ1cO7N72U31u9Ss1GrHsttXPzw8rPcKFKlZr+zOmVetOcwNYG2dGjU3zexYdphPf23Z9qJSNTtu/JvKdq+8829d6RUYyAbg06pj2VGOaSg+YLPSCNB6A0tH8XNiPTQ5itehixrPbm3N7g+0WmGYNbcU6bI59fYe0n2b3776tev3tq0OsOaWsl0errdd9Upli52eoDeVPilrXHDrIl7GosZuVWn7t1txg4SGZcXfOzqefVyt1kP6LvUoVX9svWBBX1JSW9m/ftl9qqmzW1Xap5qau1XZasPfrer9A1YjgNY47LT68xHnN7aUFRoudB8ItlZ7mEmp3NC+PcBdcXQ2/fBKR0tvmrdTjd2q+D7V2K0qqLFbldqnKr3b1yjb27DlJtuzhIb/G8vbRNX/3UdkLM9906jvW2Kkf6ZR9FzcWJ54933KAYYuFUY5ELK4HkYJDNyIWh2psbwjF1R7lMDAjajVkbreBiYxbCobrl7sy51u6nLSa1Sucen/2rKbZnas2V46nGt/e94Auh+XW625OrNg2e41m3Wba8e/1Nqapcp2361qPP1NZdtLa7yqw98Aun8UrS27NKdgzSIv6WrZ61VOyl618tqaxXer5oqvgG+EBAAiTk8AABGhAQCI/A/drgNhpxvGcgAAAABJRU5ErkJggg==" height="200" width="700" margin="0 auto"/> @@ -2758,7 +2758,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2781,7 +2781,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2804,7 +2804,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2827,7 +2827,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2850,7 +2850,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2873,7 +2873,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2896,7 +2896,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2919,7 +2919,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2942,7 +2942,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2965,7 +2965,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2988,7 +2988,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3011,7 +3011,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3034,7 +3034,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 5 </td> @@ -3057,7 +3057,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3080,7 +3080,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3103,7 +3103,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3126,7 +3126,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3149,7 +3149,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3172,7 +3172,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3195,7 +3195,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3218,7 +3218,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3241,7 +3241,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3264,7 +3264,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3287,7 +3287,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3319,7 +3319,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -3355,7 +3355,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3378,7 +3378,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3401,7 +3401,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 2 </td> @@ -3424,7 +3424,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3447,7 +3447,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3470,7 +3470,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3493,7 +3493,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3516,7 +3516,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3539,7 +3539,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3562,7 +3562,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3585,7 +3585,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3608,7 +3608,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3631,7 +3631,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3654,7 +3654,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3677,7 +3677,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3700,7 +3700,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3723,7 +3723,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3746,7 +3746,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3769,7 +3769,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3792,7 +3792,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3815,7 +3815,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3838,7 +3838,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3861,7 +3861,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3884,7 +3884,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index ab685ce1f2b318bf8a73d7290772442df4f3a17e..6177dda553864d3de72c242c50628b62a3494ccd 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -2576,7 +2576,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2599,7 +2599,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2622,7 +2622,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2645,7 +2645,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2668,7 +2668,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2691,7 +2691,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2714,7 +2714,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2737,7 +2737,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2760,7 +2760,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2783,7 +2783,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2806,7 +2806,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2829,7 +2829,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2852,7 +2852,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 5 </td> @@ -2875,7 +2875,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2898,7 +2898,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2921,7 +2921,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2944,7 +2944,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2967,7 +2967,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -2990,7 +2990,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3013,7 +3013,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3036,7 +3036,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3059,7 +3059,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3082,7 +3082,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3105,7 +3105,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3166,7 +3166,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 0h </td> + 00 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3189,7 +3189,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 1h </td> + 01 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3212,7 +3212,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 2h </td> + 02 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 2 </td> @@ -3235,7 +3235,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 3h </td> + 03 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3258,7 +3258,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 4h </td> + 04 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3281,7 +3281,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 5h </td> + 05 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3304,7 +3304,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 6h </td> + 06 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3327,7 +3327,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 7h </td> + 07 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 1 </td> @@ -3350,7 +3350,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 8h </td> + 08 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3373,7 +3373,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 9h </td> + 09 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3396,7 +3396,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 10h </td> + 10 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3419,7 +3419,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 11h </td> + 11 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3442,7 +3442,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 12h </td> + 12 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3465,7 +3465,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 13h </td> + 13 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3488,7 +3488,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 14h </td> + 14 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3511,7 +3511,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 15h </td> + 15 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3534,7 +3534,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 16h </td> + 16 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3557,7 +3557,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 17h </td> + 17 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3580,7 +3580,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 18h </td> + 18 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3603,7 +3603,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 19h </td> + 19 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3626,7 +3626,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 20h </td> + 20 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3649,7 +3649,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 21h </td> + 21 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3672,7 +3672,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 22h </td> + 22 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> @@ -3695,7 +3695,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - 23h </td> + 23 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> 0 </td> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf index 909cc51c3676ca88968c2f8802eb8e9f51b52f56..54f8ef015bb972f84dfe7de1cca2f7e6e04773e2 100644 Binary files a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml index 4f4de53b6e0d2ed4545cc57ed4e648fb76cbae4c..ce6918c3055775f717db632fc50ff98868f840a1 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -13,7 +13,7 @@ <segment>visitServerHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> <max_actions>2</max_actions> @@ -25,7 +25,7 @@ <segment>visitServerHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> <max_actions>1</max_actions> @@ -37,7 +37,7 @@ <segment>visitServerHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -49,7 +49,7 @@ <segment>visitServerHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -61,7 +61,7 @@ <segment>visitServerHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -73,7 +73,7 @@ <segment>visitServerHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -85,7 +85,7 @@ <segment>visitServerHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -97,7 +97,7 @@ <segment>visitServerHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -109,7 +109,7 @@ <segment>visitServerHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -121,7 +121,7 @@ <segment>visitServerHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -133,7 +133,7 @@ <segment>visitServerHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -145,7 +145,7 @@ <segment>visitServerHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -157,7 +157,7 @@ <segment>visitServerHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -169,7 +169,7 @@ <segment>visitServerHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -181,7 +181,7 @@ <segment>visitServerHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -193,7 +193,7 @@ <segment>visitServerHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -205,7 +205,7 @@ <segment>visitServerHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -217,7 +217,7 @@ <segment>visitServerHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -229,7 +229,7 @@ <segment>visitServerHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -241,7 +241,7 @@ <segment>visitServerHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -253,7 +253,7 @@ <segment>visitServerHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -265,7 +265,7 @@ <segment>visitServerHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> @@ -277,7 +277,7 @@ <segment>visitServerHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <max_actions>0</max_actions> diff --git a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml index aff3a51e64d47eecaf65b51820d338f7728549d4..02554e3e245550bd9caab7c00c7f1f3847fdf392 100644 --- a/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>0h</label> + <label>00</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> @@ -41,7 +41,7 @@ <segment>visitServerHour==0</segment> </row> <row> - <label>1h</label> + <label>01</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -53,7 +53,7 @@ <segment>visitServerHour==1</segment> </row> <row> - <label>2h</label> + <label>02</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -65,7 +65,7 @@ <segment>visitServerHour==2</segment> </row> <row> - <label>3h</label> + <label>03</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -77,7 +77,7 @@ <segment>visitServerHour==3</segment> </row> <row> - <label>4h</label> + <label>04</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -89,7 +89,7 @@ <segment>visitServerHour==4</segment> </row> <row> - <label>5h</label> + <label>05</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -101,7 +101,7 @@ <segment>visitServerHour==5</segment> </row> <row> - <label>6h</label> + <label>06</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -113,7 +113,7 @@ <segment>visitServerHour==6</segment> </row> <row> - <label>7h</label> + <label>07</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -125,7 +125,7 @@ <segment>visitServerHour==7</segment> </row> <row> - <label>8h</label> + <label>08</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -137,7 +137,7 @@ <segment>visitServerHour==8</segment> </row> <row> - <label>9h</label> + <label>09</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -149,7 +149,7 @@ <segment>visitServerHour==9</segment> </row> <row> - <label>10h</label> + <label>10</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -161,7 +161,7 @@ <segment>visitServerHour==10</segment> </row> <row> - <label>11h</label> + <label>11</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -173,7 +173,7 @@ <segment>visitServerHour==11</segment> </row> <row> - <label>12h</label> + <label>12</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -185,7 +185,7 @@ <segment>visitServerHour==12</segment> </row> <row> - <label>13h</label> + <label>13</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -197,7 +197,7 @@ <segment>visitServerHour==13</segment> </row> <row> - <label>14h</label> + <label>14</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -209,7 +209,7 @@ <segment>visitServerHour==14</segment> </row> <row> - <label>15h</label> + <label>15</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -221,7 +221,7 @@ <segment>visitServerHour==15</segment> </row> <row> - <label>16h</label> + <label>16</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -233,7 +233,7 @@ <segment>visitServerHour==16</segment> </row> <row> - <label>17h</label> + <label>17</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -245,7 +245,7 @@ <segment>visitServerHour==17</segment> </row> <row> - <label>18h</label> + <label>18</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -257,7 +257,7 @@ <segment>visitServerHour==18</segment> </row> <row> - <label>19h</label> + <label>19</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -269,7 +269,7 @@ <segment>visitServerHour==19</segment> </row> <row> - <label>20h</label> + <label>20</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -281,7 +281,7 @@ <segment>visitServerHour==20</segment> </row> <row> - <label>21h</label> + <label>21</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -293,7 +293,7 @@ <segment>visitServerHour==21</segment> </row> <row> - <label>22h</label> + <label>22</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> @@ -305,7 +305,7 @@ <segment>visitServerHour==22</segment> </row> <row> - <label>23h</label> + <label>23</label> <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index 6f6fa331dd34638e061f5ce190a1504bfa576b15..c2864caaddc96b6b1a6bf526d4cdf6ebeb053009 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png and b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png index d754da9cffa47c232f4c480ab57279da02563167..be31bc07278b89be96f34b9fb07e010c63b3c0d2 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png and b/tests/UI/expected-screenshots/UIIntegrationTest_period_select_date_range_click.png differ diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png index 20c5c6697595dd18dd471a4dfcf77effc8c7a4a9..c31420a10e52bbe9770f6a94a64c3d39f42d2c7f 100644 Binary files a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png and b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_times.png differ