Merge pull request #15208 from civicrm/5.17

[civicrm-core.git] / CRM / Case / Form / Activity / ChangeCaseType.php

diff --git a/CRM/Case/Form/Activity/ChangeCaseType.php b/CRM/Case/Form/Activity/ChangeCaseType.php
index 42c2f5bc59b6ff94aa0084fce82a301cf673120d..1e683a8beb71af863b4a100203cdd8adf451d592 100644 (file)
--- a/CRM/Case/Form/Activity/ChangeCaseType.php
+++ b/CRM/Case/Form/Activity/ChangeCaseType.php
@@ -57,12 +57,11 @@ class CRM_Case_Form_Activity_ChangeCaseType {
    * @return array
    */
   public static function setDefaultValues(&$form) {
-    $defaults = array();
+    $defaults = [];
 
     $defaults['is_reset_timeline'] = 1;
 
-    $defaults['reset_date_time'] = array();
-    list($defaults['reset_date_time'], $defaults['reset_date_time_time']) = CRM_Utils_Date::setDateDefaults(NULL, 'activityDateTime');
+    $defaults['reset_date_time'] = date('Y-m-d H:i:s');
     $defaults['case_type_id'] = $form->_caseTypeId;
 
     return $defaults;
@@ -85,11 +84,11 @@ class CRM_Case_Form_Activity_ChangeCaseType {
       $form->_caseType[$form->_caseTypeId] = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_CaseType', $form->_caseTypeId, 'title');
     }
 
-    $form->addField('case_type_id', array('context' => 'create', 'entity' => 'Case'));
+    $form->addField('case_type_id', ['context' => 'create', 'entity' => 'Case']);
 
     // timeline
-    $form->addYesNo('is_reset_timeline', ts('Reset Case Timeline?'), NULL, TRUE, array('onclick' => "return showHideByValue('is_reset_timeline','','resetTimeline','table-row','radio',false);"));
-    $form->addDateTime('reset_date_time', ts('Reset Start Date'), FALSE, array('formatType' => 'activityDateTime'));
+    $form->addYesNo('is_reset_timeline', ts('Reset Case Timeline?'), NULL, TRUE);
+    $form->add('datepicker', 'reset_date_time', ts('Reset Start Date'), NULL, FALSE, ['allowClear' => FALSE]);
   }
 
   /**
@@ -120,13 +119,9 @@ class CRM_Case_Form_Activity_ChangeCaseType {
       $params['id'] = $form->_id;
     }
 
-    if (CRM_Utils_Array::value('is_reset_timeline', $params) == 0) {
+    if (empty($params['is_reset_timeline'])) {
       unset($params['reset_date_time']);
     }
-    else {
-      // store the date with proper format
-      $params['reset_date_time'] = CRM_Utils_Date::processDate($params['reset_date_time'], $params['reset_date_time_time']);
-    }
   }
 
   /**
@@ -165,10 +160,10 @@ class CRM_Case_Form_Activity_ChangeCaseType {
 
     if ($activity->subject == 'null') {
       $activity->subject = ts('Case type changed from %1 to %2',
-        array(
+        [
           1 => CRM_Utils_Array::value($form->_defaults['case_type_id'], $allCaseTypes),
           2 => CRM_Utils_Array::value($params['case_type_id'], $allCaseTypes),
-        )
+        ]
       );
       $activity->save();
     }
@@ -176,7 +171,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
     // 1. initiate xml processor
     $xmlProcessor = new CRM_Case_XMLProcessor_Process();
     $caseId = CRM_Utils_Array::first($form->_caseId);
-    $xmlProcessorParams = array(
+    $xmlProcessorParams = [
       'clientID' => $form->_currentlyViewedContactId,
       'creatorID' => $form->_currentUserId,
       'standardTimeline' => 1,
@@ -184,7 +179,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
       'activity_date_time' => CRM_Utils_Array::value('reset_date_time', $params),
       'caseID' => $caseId,
       'resetTimeline' => CRM_Utils_Array::value('is_reset_timeline', $params),
-    );
+    ];
 
     $xmlProcessor->run($caseType, $xmlProcessorParams);
     // status msg