From c71da91daf7fa5c98da621720963b6a71d90bcdf Mon Sep 17 00:00:00 2001
From: "Matthew Wire (MJW Consulting)" <mjw@mjwconsult.co.uk>
Date: Wed, 5 Sep 2018 11:58:08 +0100
Subject: [PATCH] Convert EventInfo to datepicker

---
 CRM/Event/Form/ManageEvent/EventInfo.php      | 23 +++++--------------
 .../CRM/Event/Form/ManageEvent/EventInfo.tpl  | 21 +++--------------
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
index 571071d39b..bb8d0fc22a 100644
--- a/CRM/Event/Form/ManageEvent/EventInfo.php
+++ b/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -112,12 +112,6 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
     $defaults['event_full_text'] = CRM_Utils_Array::value('event_full_text', $defaults, ts('This event is currently full.'));
 
     $defaults['waitlist_text'] = CRM_Utils_Array::value('waitlist_text', $defaults, ts('This event is currently full. However you can register now and get added to a waiting list. You will be notified if spaces become available.'));
-    list($defaults['start_date'], $defaults['start_date_time']) = CRM_Utils_Date::setDateDefaults(CRM_Utils_Array::value('start_date', $defaults), 'activityDateTime');
-
-    if (!empty($defaults['end_date'])) {
-      list($defaults['end_date'], $defaults['end_date_time']) = CRM_Utils_Date::setDateDefaults($defaults['end_date'], 'activityDateTime');
-    }
-
     $defaults['template_id'] = $this->_templateId;
     return $defaults;
   }
@@ -179,8 +173,8 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
     $this->addElement('checkbox', 'is_share', ts('Allow sharing through social media?'));
     $this->addElement('checkbox', 'is_map', ts('Include Map to Event Location'));
 
-    $this->addDateTime('start_date', ts('Start Date'), FALSE, array('formatType' => 'activityDateTime'));
-    $this->addDateTime('end_date', ts('End Date / Time'), FALSE, array('formatType' => 'activityDateTime'));
+    $this->add('datepicker', 'start_date', ts('Start Date'), [], FALSE, ['time' => TRUE]);
+    $this->add('datepicker', 'end_date', ts('End Date / Time'), [], FALSE, ['time' => TRUE]);
 
     $this->add('text', 'max_participants', ts('Max Number of Participants'),
       array('onchange' => "if (this.value != '') {cj('#id-waitlist').show(); showHideByValue('has_waitlist','0','id-waitlist-text','table-row','radio',false); showHideByValue('has_waitlist','0','id-event_full','table-row','radio',true); return;} else {cj('#id-event_full, #id-waitlist, #id-waitlist-text').hide(); return;}")
@@ -217,13 +211,11 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
     $errors = array();
 
     if (!$values['is_template']) {
-      if (CRM_Utils_System::isNull($values['start_date'])) {
+      if (empty($values['start_date'])) {
         $errors['start_date'] = ts('Start Date and Time are required fields');
       }
       else {
-        $start = CRM_Utils_Date::processDate($values['start_date']);
-        $end = CRM_Utils_Date::processDate($values['end_date']);
-        if (($end < $start) && ($end != 0)) {
+        if (($values['end_date'] < $values['start_date']) && !empty($values['end_date'])) {
           $errors['end_date'] = ts('End date should be after Start date.');
         }
       }
@@ -244,11 +236,8 @@ class CRM_Event_Form_ManageEvent_EventInfo extends CRM_Event_Form_ManageEvent {
     $params = $this->controller->exportValues($this->_name);
 
     //format params
-    $params['start_date'] = CRM_Utils_Date::processDate($params['start_date'], $params['start_date_time']);
-    $params['end_date'] = CRM_Utils_Date::processDate(CRM_Utils_Array::value('end_date', $params),
-      CRM_Utils_Array::value('end_date_time', $params),
-      TRUE
-    );
+    $params['start_date'] = CRM_Utils_Array::value('start_date', $params);
+    $params['end_date'] = CRM_Utils_Array::value('end_date', $params);
     $params['has_waitlist'] = CRM_Utils_Array::value('has_waitlist', $params, FALSE);
     $params['is_map'] = CRM_Utils_Array::value('is_map', $params, FALSE);
     $params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index a773eae125..19b3ded835 100644
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -78,11 +78,11 @@
     {if !$isTemplate}
       <tr class="crm-event-manage-eventinfo-form-block-start_date">
         <td class="label">{$form.start_date.label}</td>
-        <td>{include file="CRM/common/jcalendar.tpl" elementName=start_date}</td>
+        <td>{$form.start_date.html}</td>
       </tr>
       <tr class="crm-event-manage-eventinfo-form-block-end_date">
         <td class="label">{$form.end_date.label}</td>
-        <td>{include file="CRM/common/jcalendar.tpl" elementName=end_date}</td>
+        <td>{$form.end_date.html}</td>
       </tr>
     {/if}
     <tr class="crm-event-manage-eventinfo-form-block-max_participants">
@@ -146,22 +146,7 @@
       <td>&nbsp;</td>
     </tr>
   </table>
-  <div id="customData"></div>
-  {*include custom data js file*}
-  {include file="CRM/common/customData.tpl"}
-  {literal}
-  <script type="text/javascript">
-    CRM.$(function($) {
-      {/literal}
-      {if $customDataSubType}
-      CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
-      {else}
-      CRM.buildCustomData( '{$customDataType}' );
-      {/if}
-      {literal}
-    });
-  </script>
-  {/literal}
+  {include file="CRM/common/customDataBlock.tpl"}
   <div class="crm-submit-buttons">
     {include file="CRM/common/formButtons.tpl" location="bottom"}
   </div>
-- 
2.25.1