From 66adc860cc410a3ab2aa57f80edacbb24faae981 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 Mar 2014 16:28:10 -0400
Subject: [PATCH] CRM-13966 - Simplify reassign case form with ajax framework
 and select2

---
 CRM/Case/Form/CaseView.php             | 21 ---------
 CRM/Case/Form/EditClient.php           | 56 ++++++++++++----------
 templates/CRM/Case/Form/CaseView.tpl   | 25 +---------
 templates/CRM/Case/Form/EditClient.tpl | 65 +++++---------------------
 4 files changed, 46 insertions(+), 121 deletions(-)

diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php
index 7302e9a3fd..903fa6abb3 100644
--- a/CRM/Case/Form/CaseView.php
+++ b/CRM/Case/Form/CaseView.php
@@ -315,17 +315,6 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form {
       }
     }
 
-    $this->add('text', 'change_client_id', ts('Assign to another Client'));
-    $this->add('hidden', 'contact_id', '', array('id' => 'contact_id'));
-    $this->addElement('submit',
-      $this->getButtonName('next', 'edit_client'),
-      ts('Reassign Case'),
-      array(
-        'class' => 'form-submit-inline',
-        'onclick' => "return checkSelection( this );",
-      )
-    );
-
     $activityStatus = CRM_Core_PseudoConstant::activityStatus();
     $this->add('select', 'status_id', ts('Status'), array("" => ts(' - any status - ')) + $activityStatus);
 
@@ -522,16 +511,6 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form {
       $session = CRM_Core_Session::singleton();
       $session->pushUserContext($url);
     }
-    elseif ($buttonName == '_qf_CaseView_next_edit_client') {
-      $mainCaseId = CRM_Case_BAO_Case::mergeCases($params['contact_id'], $this->_caseID, $this->_contactID, NULL, TRUE);
-
-      // user context
-      $url = CRM_Utils_System::url('civicrm/contact/view/case',
-        "reset=1&action=view&cid={$params['contact_id']}&id={$mainCaseId[0]}&show=1"
-      );
-      $session = CRM_Core_Session::singleton();
-      $session->pushUserContext($url);
-    }
   }
 }
 
diff --git a/CRM/Case/Form/EditClient.php b/CRM/Case/Form/EditClient.php
index 06844eeabf..a314700f6a 100644
--- a/CRM/Case/Form/EditClient.php
+++ b/CRM/Case/Form/EditClient.php
@@ -46,15 +46,15 @@ class CRM_Case_Form_EditClient extends CRM_Core_Form {
    * @access public
    */
   public function preProcess() {
-    $this->_contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
-    $this->_caseId    = CRM_Utils_Request::retrieve('id', 'Positive', $this);
-    $context          = CRM_Utils_Request::retrieve('context', 'String', $this);
+    $cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
+    CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE);
+    $context = CRM_Utils_Request::retrieve('context', 'String', $this);
 
     //get current client name.
-    $this->assign('currentClientName', CRM_Contact_BAO_Contact::displayName($this->_contactId));
+    $this->assign('currentClientName', CRM_Contact_BAO_Contact::displayName($cid));
 
     //set the context.
-    $url = CRM_Utils_System::url('civicrm/contact/view', "reset=1&force=1&cid={$this->_contactId}&selectedChild=case");
+    $url = CRM_Utils_System::url('civicrm/contact/view', "reset=1&force=1&cid={$cid}&selectedChild=case");
     if ($context == 'search') {
       $qfKey = CRM_Utils_Request::retrieve('key', 'String', $this);
       //validate the qfKey
@@ -82,24 +82,33 @@ class CRM_Case_Form_EditClient extends CRM_Core_Form {
    * @access public
    */
   public function buildQuickForm() {
-    $this->add('text', 'change_client_id', ts('Select Contact'));
-    $this->add('hidden', 'contact_id', '', array('id' => 'contact_id'));
-    $this->addElement('submit',
-      $this->getButtonName('next', 'edit_client'),
-      ts('Reassign Case'),
+    $this->addEntityRef('reassign_contact_id', ts('Select Contact'), array('create' => TRUE), TRUE);
+    $this->addButtons(array(
       array(
-        'class' => 'form-submit-inline',
-        'onclick' => "return checkSelection( this );",
-      )
-    );
+        'type' => 'cancel',
+        'name' => ts('Cancel'),
+      ),
+      array(
+        'type' => 'done',
+        'name' => ts('Reassign Case'),
+      ),
+    ));
+
+    // This form may change the url structure so should not submit via ajax
+    $this->preventAjaxSubmit();
+  }
 
-    $this->addElement('submit',
-      $this->getButtonName('cancel', 'edit_client'),
-      ts('Cancel'),
-      array('class' => 'form-submit-inline')
-    );
 
-    $this->assign('contactId', $this->_contactId);
+  function addRules() {
+    $this->addFormRule(array(get_class($this), 'formRule'), $this);
+  }
+
+  static function formRule($vals, $rule, $form) {
+    $errors = array();
+    if (empty($vals['reassign_contact_id']) || $vals['reassign_contact_id'] == $form->get('cid')) {
+      $errors['reassign_contact_id'] = ts("Please select a different contact.");
+    }
+    return $errors;
   }
 
   /**
@@ -112,14 +121,13 @@ class CRM_Case_Form_EditClient extends CRM_Core_Form {
     $params = $this->controller->exportValues($this->_name);
 
     //assign case to another client.
-    $mainCaseId = CRM_Case_BAO_Case::mergeCases($params['contact_id'], $this->_caseId, $this->_contactId, NULL, TRUE);
+    $mainCaseId = CRM_Case_BAO_Case::mergeCases($params['reassign_contact_id'], $this->get('id'), $this->get('cid'), NULL, TRUE);
 
     // user context
     $url = CRM_Utils_System::url('civicrm/contact/view/case',
-      "reset=1&action=view&cid={$params['contact_id']}&id={$mainCaseId[0]}&show=1"
+      "reset=1&action=view&cid={$params['reassign_contact_id']}&id={$mainCaseId[0]}&show=1"
     );
-    $session = CRM_Core_Session::singleton();
-    $session->pushUserContext($url);
+    CRM_Core_Session::singleton()->pushUserContext($url);
   }
 }
 
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index dceb9e4311..4f0402b89e 100644
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -130,10 +130,8 @@
 
   {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
     <tr class="crm-case-caseview-form-block-change_client_id">
-      <td colspan='2'><a href="#" onClick='cj("#change_client").toggle( ); return false;'>{ts}Assign to Another Contact{/ts}</a>
-          <span id='change_client' class='hide-block'>
-            {$form.change_client_id.html|crmAddClass:twenty}&nbsp;{$form._qf_CaseView_next_edit_client.html}
-          </span>
+      <td colspan='2'>
+        <a class="crm-popup" href="{crmURL p='civicrm/contact/view/case/editClient' h=0 q="reset=1&action=update&id=$caseID&cid=$contactID"}"><span class="icon swap-icon"></span> {ts}Assign to Another Contact{/ts}</a>
       </td>
     </tr>
   {/if}
@@ -282,12 +280,6 @@
 
 {literal}
 <script type="text/javascript">
-  var selectedContact = '';
-  var caseID = {/literal}"{$caseID}"{literal};
-  var contactUrl = {/literal}"{crmURL p='civicrm/ajax/rest' q='className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=newcontact' h=0 }"{literal};
-  cj( "#change_client_id").autocomplete( contactUrl, { width : 250, selectFirst : false, matchContains:true
-  }).result( function(event, data, formatted) { cj( "#contact_id" ).val( data[1] ); selectedContact = data[0];
-    }).bind( 'click', function( ) { cj( "#contact_id" ).val(''); });
 
   cj("#dialog").hide( );
 
@@ -945,8 +937,6 @@ function checkSelection( field ) {
   var successAction     = '';
   var forceValidation   = false;
 
-  var clientName = new Array( );
-  clientName = selectedContact.split('::');
   var fName = field.name;
 
   switch ( fName )  {
@@ -977,18 +967,7 @@ function checkSelection( field ) {
     validationMessage = '{/literal}{ts escape="js"}Please select a case from the list to merge with.{/ts}{literal}';
     validationField   = 'merge_case_id';
     break;
-
-  case '_qf_CaseView_next_edit_client' :
-    validationMessage = '{/literal}{ts escape="js"}Please select a client for this case.{/ts}{literal}';
-    if ( cj('#contact_id').val( ) == '{/literal}{$contactID}{literal}' ) {
-      forceValidation = true;
-      validationMessage = '{/literal}{ts 1="'+clientName[0]+'"}%1 is already assigned to this case. Please select some other client for this case.{/ts}{literal}';
-    }
-    validationField   = 'change_client_id';
-    successAction     = "confirm( '{/literal}{ts 1="'+clientName[0]+'"}Are you sure you want to reassign this case and all related activities and relationships to %1?{/ts}{literal}' )";
-    break;
   }
-
   if ( forceValidation || ( document.getElementById( validationField ).value == '' ) ) {
     cj('#'+validationField).crmError(validationMessage);
     return false;
diff --git a/templates/CRM/Case/Form/EditClient.tpl b/templates/CRM/Case/Form/EditClient.tpl
index 3e4633ac64..a3326f11ee 100644
--- a/templates/CRM/Case/Form/EditClient.tpl
+++ b/templates/CRM/Case/Form/EditClient.tpl
@@ -25,60 +25,19 @@
 *}
 {* template for assigning the current case to another client*}
 <div class="crm-block crm-form-block crm-case-editclient-form-block">
-<div class="messages status no-popup">
+  <div class="messages status no-popup">
     <div class="icon inform-icon"></div> {ts 1=$currentClientName}This is case is currently assigned to %1.{/ts}
-</div>
-<div class="crm-form-block">
-<table class="form-layout-compressed">
-    <tr class="crm-case-editclient-form-block-change_client_id">
+  </div>
+  <div class="crm-form-block">
+    <table class="form-layout-compressed">
+      <tr class="crm-case-editclient-form-block-change_client_id">
         <td class="label">
-            {$form.change_client_id.label}
+          {$form.reassign_contact_id.label}
         </td>
-  <td id='client'>
-      {$form.change_client_id.html|crmAddClass:big}
-  </td>
-    </tr>
-    <tr>
-        <td></td>
-        <td><span class="crm-button crm-button-type-submit">&nbsp;{$form._qf_EditClient_next_edit_client.html}</span>
-            <span class="crm-button crm-button-type-submit">&nbsp;{$form._qf_EditClient_cancel_edit_client.html}</span>
-  </td>
-    </tr>
-</table>
-</div>
+        <td>
+          {$form.reassign_contact_id.html}
+        </td>
+    </table>
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  </div>
 </div>
-{literal}
-<script type="text/javascript">
-var contactUrl = {/literal}"{crmURL p='civicrm/ajax/rest' q='className=CRM_Contact_Page_AJAX&fnName=getContactList&json=1&context=newcontact' h=0 }"{literal};
-var selectedContact = '';
-
-cj( "#change_client_id").autocomplete( contactUrl, { width : 250, selectFirst : false, matchContains:true
-                            }).result( function(event, data, formatted) { cj( "#contact_id" ).val( data[1] ); selectedContact = data[0];
-                            }).bind( 'click', function( ) { cj( "#contact_id" ).val(''); });
-
-function checkSelection( field ) {
-    var validationMessage = '';
-    var selectedContactName = cj('#change_client_id').val( );
-    var clientName = new Array( );
-    clientName = selectedContact.split('::');
-
-    if ( selectedContactName == '' ) {
-        validationMessage = '{/literal}{ts escape="js"}Please select another client for this case.{/ts}{literal}';
-        cj().crmError(validationMessage, '{/literal}{ts escape="js"}Client Selection{/ts}{literal}');
-        return false;
-    } else if ( cj('#contact_id').val( ) == {/literal}{$contactId}{literal} ) {
-        validationMessage = '{/literal}{ts escape="js" 1="'+clientName[0]+'"}%1 is already assigned to this case. Please select some other client for this case.{/ts}{literal}';
-        cj().crmError(validationMessage, '{/literal}{ts escape="js"}Client Selection{/ts}{literal}');
-        return false;
-    } else {
-        validationMessage = '{/literal}{ts escape="js" 1="'+clientName[0]+'"}Are you sure you want to reassign this case and all related activities and relationships to %1?{/ts}{literal}';
-        if ( confirm( validationMessage ) ) {
-          this.href+='&amp;confirmed=1';
-        } else {
-          return false;
-        }
-    }
-
-}
-</script>
-{/literal}
-- 
2.25.1