From dce43174674b660ea51210a75cc2e47e8de2d920 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 1 Nov 2019 20:02:18 +1300
Subject: [PATCH] Get rid of jcalendar range in custom data

---
 CRM/Contact/Form/Search/Criteria.php | 6 ++++--
 CRM/Core/BAO/Query.php               | 4 ++--
 templates/CRM/Custom/Form/Search.tpl | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 243286cdfc05..4beb17d3efcc 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -605,6 +605,8 @@ public static function notes(&$form) {
    * Generate the custom Data Fields based for those with is_searchable = 1.
    *
    * @param CRM_Contact_Form_Search $form
+   *
+   * @throws \CiviCRM_API3_Exception
    */
   public static function custom(&$form) {
     $form->add('hidden', 'hidden_custom', 1);
@@ -624,8 +626,8 @@ public static function custom(&$form) {
       foreach ($group['fields'] as $field) {
         $fieldId = $field['id'];
         $elementName = 'custom_' . $fieldId;
-        if ($field['data_type'] == 'Date' && $field['is_search_range']) {
-          CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+        if ($field['data_type'] === 'Date' && $field['is_search_range']) {
+          $form->addDatePickerRange($elementName, $field['label']);
         }
         else {
           CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
diff --git a/CRM/Core/BAO/Query.php b/CRM/Core/BAO/Query.php
index f6b3374890b3..818291aca332 100644
--- a/CRM/Core/BAO/Query.php
+++ b/CRM/Core/BAO/Query.php
@@ -47,8 +47,8 @@ public static function addCustomFormFields(&$form, $extends) {
         foreach ($group['fields'] as $field) {
           $fieldId = $field['id'];
           $elementName = 'custom_' . $fieldId;
-          if ($field['data_type'] == 'Date' && $field['is_search_range']) {
-            CRM_Core_Form_Date::buildDateRange($form, $elementName, 1, '_from', '_to', ts('From:'), FALSE);
+          if ($field['data_type'] === 'Date' && $field['is_search_range']) {
+            $form->addDatePickerRange($elementName, $field['label']);
           }
           else {
             CRM_Core_BAO_CustomField::addQuickFormElement($form, $elementName, $fieldId, FALSE, TRUE);
diff --git a/templates/CRM/Custom/Form/Search.tpl b/templates/CRM/Custom/Form/Search.tpl
index d4de6a6f7589..f8b98708032a 100644
--- a/templates/CRM/Custom/Form/Search.tpl
+++ b/templates/CRM/Custom/Form/Search.tpl
@@ -45,8 +45,7 @@
                     {$form.$element_name_from.html|crmAddClass:six}
                     &nbsp;&nbsp;{$form.$element_name_to.label}&nbsp;&nbsp;{$form.$element_name_to.html|crmAddClass:six}
                   {elseif $element.skip_calendar NEQ true }
-                    <td class="label"><label for='{$element_name}'>{$element.label}</label>
-                    {include file="CRM/Core/DateRange.tpl" fieldName=$element_name from='_from' to='_to'}</td><td>
+                    {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName=$element_name}<td>
                   {/if}
             {else}
                 <td class="label">{$form.$element_name.label}</td><td>