From d44f150feb382a0e103d8cde00e3d784f1af77ba Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 29 May 2019 14:20:30 -0400 Subject: [PATCH] Update pdf Only output event schedules if they are within the date range search. --- models/front/events/pdfCreator.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/models/front/events/pdfCreator.php b/models/front/events/pdfCreator.php index 9763652..58952bb 100644 --- a/models/front/events/pdfCreator.php +++ b/models/front/events/pdfCreator.php @@ -64,6 +64,7 @@ $totalEvents = count($events); $index = 0; $pdf->ezSetY( $this->pdf_top_y ); +// echo '
$_REQUEST: ' . print_r( $_REQUEST, true ) . '
'; foreach ( $events as $eventId => $event ) { $lineCount = 1; $eventTopY = $pdfY; @@ -72,6 +73,23 @@ foreach ( $events as $eventId => $event ) { $eventDates = ''; $recCounter = 0; foreach ( $event['recurrences'] as $rec ) { + if ( isset( $_REQUEST['glm_event_from'] ) ) { + $startingTime = strtotime( $_REQUEST['glm_event_from'] ); + } + // echo '
$startingTime: ' . print_r( $startingTime, true ) . '
'; + if ( isset( $_REQUEST['glm_event_from'] ) ) { + $endingTime = strtotime( $_REQUEST['glm_event_to'] ); + } + // echo '
$endingTime: ' . print_r( $endingTime, true ) . '
'; + if ( $startingTime && $endingTime && ( $rec['from_date']['timestamp'] > $endingTime || $rec['to_date']['timestamp'] < $startingTime ) ) { + continue; + } + if ( $startingTime && !$endingTime && $rec['to_date']['timestamp'] < $startingTime ) { + continue; + } + if ( !$startingTime && $endingTime && $rec['from_date']['timestamp'] > $endingTime ) { + continue; + } if ( $rec['name'] && !in_array( $rec['name'], array( 'Imported', 'Imported Event Schedule') ) ) { $eventDates .= $rec['name'] . ' '; } -- 2.17.1