Skip to content

Enhancement/add way to name dateranges in analytics requests #10835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leonidasmi wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Enhancement/add way to name dateranges in analytics requests #10835

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a337d4
Allow naming dateranges in analytics reports
leonidasmi Apr 17, 2025
e3ef753
Cover the case where there's no date range passed
leonidasmi Apr 17, 2025
32dd66d
Merge branch 'develop' into enhancement/add-way-to-name-dateranges-in…
leonidasmi May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions includes/Modules/Analytics_4/Report/ReportParsers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,31 +80,38 @@ function ( $dimension_def ) {
* @return Google_Service_AnalyticsData_DateRange[] An array of AnalyticsData DateRange objects.
*/
public function parse_dateranges( Data_Request $data ) {
$date_ranges = array();
$start_date = $data['startDate'] ?? '';
$end_date = $data['endDate'] ?? '';
$date_ranges = array();
$start_date = $data['startDate'] ?? '';
$end_date = $data['endDate'] ?? '';
$date_range_name = $data['dateRangeName'] ?? '';
if ( strtotime( $start_date ) && strtotime( $end_date ) ) {
$compare_start_date = $data['compareStartDate'] ?? '';
$compare_end_date = $data['compareEndDate'] ?? '';
$date_ranges[] = array( $start_date, $end_date );
$compare_start_date = $data['compareStartDate'] ?? '';
$compare_end_date = $data['compareEndDate'] ?? '';
$compare_date_range_name = $data['compareDateRangeName'] ?? '';
$date_ranges[] = array( $start_date, $end_date, $date_range_name );

// When using multiple date ranges, it changes the structure of the response:
// Aggregate properties (minimum, maximum, totals) will have an entry per date range.
// The rows property will have additional row entries for each date range.
if ( strtotime( $compare_start_date ) && strtotime( $compare_end_date ) ) {
$date_ranges[] = array( $compare_start_date, $compare_end_date );
$date_ranges[] = array( $compare_start_date, $compare_end_date, $compare_date_range_name );
}
} else {
// Default the date range to the last 28 days.
$date_ranges[] = Date::parse_date_range( 'last-28-days', 1 );
$last_28_days = Date::parse_date_range( 'last-28-days', 1 );
$last_28_days[] = $date_range_name;
$date_ranges[] = $last_28_days;
}

$date_ranges = array_map(
function ( $date_range ) {
list ( $start_date, $end_date ) = $date_range;
list ( $start_date, $end_date, $date_range_name ) = $date_range;
$date_range = new Google_Service_AnalyticsData_DateRange();
$date_range->setStartDate( $start_date );
$date_range->setEndDate( $end_date );
if ( $date_range_name !== '' ) {
$date_range->setName( $date_range_name );
}

return $date_range;
},
Expand Down