diff --git a/src/Plugin/views/filter/DatePeriodFilter.php b/src/Plugin/views/filter/DatePeriodFilter.php index 272e068fd4907e1d7070c776085b9fc99eb0e153..e66b186453b436f6d7376bc16306242e082fe140 100644 --- a/src/Plugin/views/filter/DatePeriodFilter.php +++ b/src/Plugin/views/filter/DatePeriodFilter.php @@ -60,7 +60,7 @@ class DatePeriodFilter extends Equality { * Display the filter on the administrative summary. */ public function adminSummary() { - return $this->operator . ' ' . $this->value['year'] . '-' . $this->value['period']; + // return $this->operator . ' ' . $this->value['year'] . '-' . $this->value['period']; } /** @@ -76,6 +76,12 @@ class DatePeriodFilter extends Equality { "$this->tableAlias.$this->realField BETWEEN '$start' and '$end'", [] ); + + // $this->query->addMetaData('period-start', $start); + // $this->query->addMetaData('period-end', $end); + // $this->query->build_info['query']->addMetaData('period-start', $start); + $this->view->build_info['period-start'] = $start; + $this->view->build_info['period-end'] = $end; } } diff --git a/views_date_period.views.inc b/views_date_period.views.inc index 691c322a9d1ea796ebe5b90c8269a9b456f27624..954577e0bd3568a37365bc527bb36bd9367ec665 100644 --- a/views_date_period.views.inc +++ b/views_date_period.views.inc @@ -26,7 +26,7 @@ function views_date_period_views_data_alter(array &$data) { $base_field_definitions = $entity_field_manager->getBaseFieldDefinitions( $entity_type_id); /* $timestamp_field_types = ['timestamp', 'created', 'changed']; */ - $timestamp_field_types = ['datetime']; + $timestamp_field_types = ['datetime', 'daterange']; foreach ($base_field_definitions as $base_field_id => $base_field_definition) { if (in_array($base_field_definition->getType(), $timestamp_field_types)) { @@ -46,7 +46,7 @@ function views_date_period_views_data_alter(array &$data) { ], */ 'filter' => [ - 'field' => $base_field_id, + 'field' => $base_field_id . (($base_field_definition->getType() == 'daterange') ? '__value' : ''), 'id' => 'views_date_period_filter', ], ];