From d7c5e6c363d13f82727501eacbe4a0c8146cba9a Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 8 Jan 2019 13:18:12 -0500
Subject: [PATCH] dev/core#561 - Convert activity followup form date field

---
 CRM/Activity/BAO/Activity.php            | 4 +---
 CRM/Activity/Form/Activity.php           | 4 ++--
 CRM/Contact/Form/Task/EmailCommon.php    | 3 +--
 templates/CRM/Activity/Form/FollowUp.tpl | 5 +++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 423b86a7dd..d24c024803 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2409,9 +2409,7 @@ AND cl.modified_id  = c.id
       $followupParams['target_contact_id'] = $params['target_contact_id'];
     }
 
-    $followupParams['activity_date_time'] = CRM_Utils_Date::processDate($params['followup_date'],
-      $params['followup_date_time']
-    );
+    $followupParams['activity_date_time'] = $params['followup_date'];
     $followupActivity = self::create($followupParams);
 
     return $followupActivity;
diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 2e9ea0d333..0b0a1b564b 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -757,7 +757,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     );
 
     // Add followup date.
-    $this->addDateTime('followup_date', ts('in'), FALSE, array('formatType' => 'activityDateTime'));
+    $this->add('datepicker', 'followup_date', ts('in'));
 
     // Only admins and case-workers can change the activity source
     if (!CRM_Core_Permission::check('administer CiviCRM') && $this->_context != 'caseActivity') {
@@ -872,7 +872,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     }
 
     if (!empty($fields['followup_activity_type_id']) && empty($fields['followup_date'])) {
-      $errors['followup_date_time'] = ts('Followup date is a required field.');
+      $errors['followup_date'] = ts('Followup date is a required field.');
     }
     // Activity type is mandatory if subject or follow-up date is specified for an Follow-up activity, CRM-4515.
     if ((!empty($fields['followup_activity_subject']) || !empty($fields['followup_date'])) && empty($fields['followup_activity_type_id'])) {
diff --git a/CRM/Contact/Form/Task/EmailCommon.php b/CRM/Contact/Form/Task/EmailCommon.php
index bc9f59326f..60d7f653c5 100644
--- a/CRM/Contact/Form/Task/EmailCommon.php
+++ b/CRM/Contact/Form/Task/EmailCommon.php
@@ -316,7 +316,7 @@ class CRM_Contact_Form_Task_EmailCommon {
     );
 
     //add followup date
-    $form->addDateTime('followup_date', ts('in'), FALSE, array('formatType' => 'activityDateTime'));
+    $form->add('datepicker', 'followup_date', ts('in'));
 
     foreach ($fields as $field => $values) {
       if (!empty($fields[$field])) {
@@ -502,7 +502,6 @@ class CRM_Contact_Form_Task_EmailCommon {
         $params['followup_activity_type_id'] = $formValues['followup_activity_type_id'];
         $params['followup_activity_subject'] = $formValues['followup_activity_subject'];
         $params['followup_date'] = $formValues['followup_date'];
-        $params['followup_date_time'] = $formValues['followup_date_time'];
         $params['target_contact_id'] = $form->_contactIds;
         $params['followup_assignee_contact_id'] = explode(',', $formValues['followup_assignee_contact_id']);
         $followupActivity = CRM_Activity_BAO_Activity::createFollowupActivity($activityId, $params);
diff --git a/templates/CRM/Activity/Form/FollowUp.tpl b/templates/CRM/Activity/Form/FollowUp.tpl
index 59684543a5..c2f292c1c5 100644
--- a/templates/CRM/Activity/Form/FollowUp.tpl
+++ b/templates/CRM/Activity/Form/FollowUp.tpl
@@ -6,8 +6,9 @@
     <table class="form-layout-compressed">
       <tr class="crm-{$type}activity-form-block-followup_activity_type_id">
 	<td class="label">{ts}Schedule Follow-up Activity{/ts}</td>
-        <td>{$form.followup_activity_type_id.html}&nbsp;&nbsp;{ts}on{/ts}
-        {include file="CRM/common/jcalendar.tpl" elementName=followup_date}
+        <td>
+          {$form.followup_activity_type_id.html}&nbsp;&nbsp;
+          {ts}on{/ts} {$form.followup_date.html}
         </td>
       </tr>
       <tr class="crm-{$type}activity-form-block-followup_activity_subject">
-- 
2.25.1