CRM-17283 Allow for searching on Registration Date in Participant Search

ErichBSchulz · Sep 28, 2015 · 5ae1e06 · 5ae1e06
1 parent 29cd1cd
commit 5ae1e06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -1531,12 +1531,17 @@ public static function convertFormValues(&$formValues, $wildcard = 0, $useEquals
       elseif (preg_match('/_date_relative$/', $id) ||
         $id == 'event_relative' ||
         $id == 'case_from_relative' ||
-        $id == 'case_to_relative'
+        $id == 'case_to_relative' ||
+        $id == 'participant_relative'
       ) {
         if ($id == 'event_relative') {
           $fromRange = 'event_start_date_low';
           $toRange = 'event_end_date_high';
         }
+        elseif ($id == 'participant_relative') {
+          $fromRange = 'participant_register_date_low';
+          $toRange = 'participant_register_date_high';
+        }
         elseif ($id == 'case_from_relative') {
           $fromRange = 'case_from_start_date_low';
           $toRange = 'case_from_start_date_high';

diff --git a/CRM/Event/BAO/Query.php b/CRM/Event/BAO/Query.php
@@ -381,6 +381,8 @@ public static function whereClauseSingle(&$values, &$query) {
         return;
 
       case 'participant_register_date':
+      case 'participant_register_date_high':
+      case 'participant_register_date_low':
         $query->dateQueryBuilder($values,
           'civicrm_participant', 'participant_register_date', 'register_date', 'Register Date'
         );
@@ -563,6 +565,8 @@ public static function buildSearchForm(&$form) {
     $form->add('text', 'participant_fee_id', ts('Fee Level'), array('class' => 'big crm-ajax-select'));
 
     CRM_Core_Form_Date::buildDateRange($form, 'event', 1, '_start_date_low', '_end_date_high', ts('From'), FALSE);
+
+    CRM_Core_Form_Date::buildDateRange($form, 'participant', 1, '_register_date_low', '_register_date_high', ts('From'), FALSE);
 
     $form->addElement('checkbox', "event_include_repeating_events", NULL, ts('Include participants from all events in the %1 series', array(1 => '<em>%1</em>')));
 

diff --git a/templates/CRM/Event/Form/Search/Common.tpl b/templates/CRM/Event/Form/Search/Common.tpl
@@ -38,6 +38,12 @@
 <tr>
 {include file="CRM/Core/DateRange.tpl" fieldName="event" from='_start_date_low' to='_end_date_high'}
 </tr>
+<tr>
+  <td><label>{ts}Registration Date{/ts}</label></td>
+</tr>
+<tr>
+{include file="CRM/Core/DateRange.tpl" fieldName="participant" from='_register_date_low' to='_register_date_high'}
+</tr>
 <tr>
   <td class="crm-event-form-block-participant_status"><label>{$form.participant_status_id.label}</label>
     <br />