worked on CRM-12216, added option to create multiple activities for each 'with/target...

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 205d12616aeffe0f039fa4b6860bf322e5b76579..e47154efd45ac6833747513850198eaa9d78ee4f 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -46,6 +46,13 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
    */
   public $_activityId;
 
+  /**
+   * store activity ids when multiple activities are created
+   *
+   * @var int
+   */
+  public $_activityIds = array();
+
   /**
    * The id of activity type
    *
@@ -733,6 +740,11 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     }
     $this->assign('surveyActivity', $this->_isSurveyActivity);
 
+    // this option should be available only during add mode
+    if ($this->_action & CRM_Core_Action::ADD) {
+      $this->add('advcheckbox', 'is_multi_activity', ts('Create a separate activity for each selected contact?'));
+    }
+
     $this->addRule('duration',
       ts('Please enter the duration as number of minutes (integers only).'), 'positiveInteger'
     );
@@ -1017,6 +1029,32 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
       $params['target_contact_id'] = $this->_contactIds;
     }
 
+    $activity = array();
+    if (CRM_Utils_Array::value('is_multi_activity', $params) &&
+      !CRM_Utils_Array::crmIsEmptyArray($params['target_contact_id'])
+    ) {
+      $targetContacts = $params['target_contact_id'];
+      foreach($targetContacts as $targetContactId) {
+        $params['target_contact_id'] = array($targetContactId);
+        // save activity
+        $activity[] = $this->processActivity($params);
+      }
+    }
+    else {
+      // save activity
+      $activity = $this->processActivity($params);
+    }
+
+    return array('activity' => $activity);
+  }
+
+  /**
+   * Process activity creation
+   *
+   * @param array $params associated array of submitted values
+   * @access protected
+   */
+  protected function processActivity(&$params) {
     $activityAssigned = array();
     // format assignee params
     if (!CRM_Utils_Array::crmIsEmptyArray($params['assignee_contact_id'])) {
@@ -1056,12 +1094,17 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     $this->endPostProcess($params, $activity);
 
     // CRM-9590
-    $this->_activityId = $activity->id;
+    if (CRM_Utils_Array::value('is_multi_activity', $params)) {
+      $this->_activityIds[] = $activity->id;
+    }
+    else {
+      $this->_activityId = $activity->id;
+    }
 
     // create follow up activity if needed
     $followupStatus = '';
     if (CRM_Utils_Array::value('followup_activity_type_id', $params)) {
-      $followupActivity = CRM_Activity_BAO_Activity::createFollowupActivity($activity->id, $params);
+      CRM_Activity_BAO_Activity::createFollowupActivity($activity->id, $params);
       $followupStatus = ts('A followup activity has been scheduled.');
     }
 
@@ -1091,7 +1134,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
         $ics->addAttachment( $attachments, $mailToContacts );
 
         // CRM-8400 add param with _currentlyViewedContactId for URL link in mail
-        $result = CRM_Case_BAO_Case::sendActivityCopy(NULL, $activity->id, $mailToContacts, $attachments, NULL);
+        CRM_Case_BAO_Case::sendActivityCopy(NULL, $activity->id, $mailToContacts, $attachments, NULL);
 
         $ics->cleanup();
 
@@ -1105,14 +1148,14 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     }
 
     CRM_Core_Session::setStatus(ts('Activity %1 has been saved. %2. %3',
-        array(
-          1 => $params['subject'],
-          2 => $followupStatus,
-          3 => $mailStatus
-        )
-      ), ts('Saved'), 'success');
+      array(
+        1 => $params['subject'],
+        2 => $followupStatus,
+        3 => $mailStatus
+      )
+    ), ts('Saved'), 'success');
 
-    return array('activity' => $activity);
+    return $activity;
   }
 
   /**

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 4eb2c331bcf10e6b16569fc619b6ee826df0ac90..ec16caf04c41fddb3252f479c4a248b05a3b08cd 100644 (file)
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -132,6 +132,10 @@
       <td class="label">{ts}With Contact{/ts}</td>
       <td class="view-value">
         {include file="CRM/Contact/Form/NewContact.tpl" noLabel=true skipBreak=true multiClient=true}
+        {if $action eq 1}
+        <br/>
+        {$form.is_multi_activity.html}&nbsp;{$form.is_multi_activity.label}
+        {/if}
       </td>
       {else}
       <td class="label">{ts}With Contact{/ts}</td>