From b55790da0cf1329f7022448feedff9c53085b1c8 Mon Sep 17 00:00:00 2001 From: "Samueltoddwaite@gmail.com" Date: Mon, 17 Oct 2022 15:01:24 +0000 Subject: [PATCH 1/2] Added collection period in CrUX Real User Measurement title. --- www/include/CrUX.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/www/include/CrUX.php b/www/include/CrUX.php index 0e42a75e9f..ef37098b33 100644 --- a/www/include/CrUX.php +++ b/www/include/CrUX.php @@ -75,6 +75,29 @@ function PruneCruxCache() } } } +// returns a string of the Real User Measurement title for results.php if CrUX has collectionPeriod +function RealUserMeasurementCruxTitle($pageData){ + if( + isset($pageData['CrUX']['collectionPeriod']) && + isset($pageData['CrUX']['collectionPeriod']['firstDate']) && + isset($pageData['CrUX']['collectionPeriod']['lastDate']) + ) { + $firstDate = $pageData['CrUX']['collectionPeriod']['firstDate']; + $lastDate = $pageData['CrUX']['collectionPeriod']['lastDate']; + $startDate = date('F j\, Y', mktime(0, 0, 0, $firstDate['month'], $firstDate['day'], $firstDate['year'])); + $endDate = date('F j\, Y', mktime(0, 0, 0, $lastDate['month'], $lastDate['day'], $lastDate['year'])); + // Example: Real User Measurements (Collected anonymously by Chrome browser via Chrome User Experience Report, between October 15, 2022 and September 18, 2022) + return sprintf('

+ Real User Measurements + (Collected anonymously by Chrome browser via Chrome User Experience Report, between %s and %s) +

',$startDate, $endDate); + }else{ + return '

+ Real User Measurements + (Collected anonymously by Chrome browser via Chrome User Experience Report) +

'; + } +} function InsertCruxHTML($fvRunResults, $rvRunResults, $metric = '', $includeLabels = true, $includeMetricName = true) { @@ -108,7 +131,7 @@ function InsertCruxHTML($fvRunResults, $rvRunResults, $metric = '', $includeLabe $cruxStyles = true; } echo '
'; - echo '

Real User Measurements (Collected anonymously by Chrome browser via Chrome User Experience Report.)

'; + echo RealUserMeasurementCruxTitle($pageData); echo '
WPT\'s Metrics for comparison:'; if (isset($pageData) && (isset($pageData['chromeUserTiming.firstContentfulPaint']) || isset($pageData['chromeUserTiming.LargestContentfulPaint']) || isset($pageData['chromeUserTiming.CumulativeLayoutShift']))) { echo '   '; From d2e3b99ff4de5b6a84514f50563d1fb06f6e91ed Mon Sep 17 00:00:00 2001 From: "Samueltoddwaite@gmail.com" Date: Mon, 17 Oct 2022 21:06:55 +0000 Subject: [PATCH 2/2] composer format --- www/include/CrUX.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/www/include/CrUX.php b/www/include/CrUX.php index ef37098b33..3f80a8762d 100644 --- a/www/include/CrUX.php +++ b/www/include/CrUX.php @@ -76,9 +76,10 @@ function PruneCruxCache() } } // returns a string of the Real User Measurement title for results.php if CrUX has collectionPeriod -function RealUserMeasurementCruxTitle($pageData){ - if( - isset($pageData['CrUX']['collectionPeriod']) && +function RealUserMeasurementCruxTitle($pageData) +{ + if ( + isset($pageData['CrUX']['collectionPeriod']) && isset($pageData['CrUX']['collectionPeriod']['firstDate']) && isset($pageData['CrUX']['collectionPeriod']['lastDate']) ) { @@ -90,8 +91,8 @@ function RealUserMeasurementCruxTitle($pageData){ return sprintf('

Real User Measurements (Collected anonymously by Chrome browser via Chrome User Experience Report, between %s and %s) -

',$startDate, $endDate); - }else{ + ', $startDate, $endDate); + } else { return '

Real User Measurements (Collected anonymously by Chrome browser via Chrome User Experience Report)