From 685928079175146c0d70f58370cc4a5d18705cf2 Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Mon, 28 Aug 2017 13:55:50 -0400
Subject: [PATCH] CRM-21113: find case - search by id, subject

---
 CRM/Case/BAO/Query.php                    |  10 +++
 templates/CRM/Case/Form/Search.tpl        |   2 +-
 templates/CRM/Case/Form/Search/Common.tpl | 100 +++++++++++++---------
 3 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php
index 92358ef521..493a7cb298 100644
--- a/CRM/Case/BAO/Query.php
+++ b/CRM/Case/BAO/Query.php
@@ -716,6 +716,16 @@ case_relation_type.id = case_relationship.relationship_type_id )";
       $form->addElement('checkbox', 'case_deleted', ts('Deleted Cases'));
     }
 
+    $form->addElement( 'text',
+      'case_subject',
+      ts('Case Subject'),
+      array('class' => 'huge')
+    );
+    $form->addElement( 'text',
+      'case_id',
+      ts('Case ID')
+    );
+
     self::addCustomFormFields($form, array('Case'));
 
     $form->setDefaults(array('case_owner' => 1));
diff --git a/templates/CRM/Case/Form/Search.tpl b/templates/CRM/Case/Form/Search.tpl
index a07651ed40..630f1a3ffc 100644
--- a/templates/CRM/Case/Form/Search.tpl
+++ b/templates/CRM/Case/Form/Search.tpl
@@ -45,7 +45,7 @@
             {include file="CRM/Case/Form/Search/Common.tpl"}
 
             <tr>
-               <td colspan="2" class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</td>
+               <td colspan="3" class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</td>
             </tr>
             </table>
         {/strip}
diff --git a/templates/CRM/Case/Form/Search/Common.tpl b/templates/CRM/Case/Form/Search/Common.tpl
index 831985049f..b7fb19777f 100644
--- a/templates/CRM/Case/Form/Search/Common.tpl
+++ b/templates/CRM/Case/Form/Search/Common.tpl
@@ -24,56 +24,76 @@
  +--------------------------------------------------------------------+
 *}
 {if $notConfigured} {* Case types not present. Component is not configured for use. *}
-{include file="CRM/Case/Page/ConfigureError.tpl"}
+  {include file="CRM/Case/Page/ConfigureError.tpl"}
 {else}
-<tr>
-  <td><label>{ts}Case Start Date{/ts}</label></td>{include file="CRM/Core/DateRange.tpl" fieldName="case_from" from='_start_date_low' to='_start_date_high'}
-</tr>
-<tr>
-  <td><label>{ts}Case End Date{/ts}</label></td>{include file="CRM/Core/DateRange.tpl" fieldName="case_to" from='_end_date_low' to='_end_date_high'}
-</tr>
+  <tr>
+    <td class="crm-case-common-form-block-case_id">
+      {$form.case_id.label}<br />
+      {$form.case_id.html}
+    </td>
+    <td class="crm-case-common-form-block-case_subject">
+      {$form.case_subject.label}<br />
+      {$form.case_subject.html}
+    </td>
+    <td></td>
+  </tr>
+
+  <tr>
+    <td>
+      <label>{ts}Case Start Date{/ts}</label>
+    </td>
+    {include file="CRM/Core/DateRange.tpl" fieldName="case_from" from='_start_date_low' to='_start_date_high'}
+  </tr>
+  <tr>
+    <td>
+      <label>{ts}Case End Date{/ts}</label>
+    </td>
+    {include file="CRM/Core/DateRange.tpl" fieldName="case_to" from='_end_date_low' to='_end_date_high'}
+  </tr>
 
-<tr id='case_search_form'>
-  <td colspan="2" class="crm-case-common-form-block-case_type" width="25%">
-     <label>{$form.case_type_id.label}</label> <br />
+  <tr id='case_search_form'>
+    <td class="crm-case-common-form-block-case_type">
+      {$form.case_type_id.label}<br />
       {$form.case_type_id.html}
-  </td>
+    </td>
 
-  <td class="crm-case-common-form-block-case_status_id" width="25%">
-      <label>{$form.case_status_id.label}</label> <br />
+    <td class="crm-case-common-form-block-case_status_id">
+      {$form.case_status_id.label}<br />
       {$form.case_status_id.html}
-    {if $accessAllCases}
-      <br />
-      {$form.case_owner.html}
-    {/if}
-    {if $form.case_deleted}
-      <br />
-      {$form.case_deleted.html}
-      {$form.case_deleted.label}
-    {/if}
-  </td>
-  {if $form.case_tags}
+      {if $accessAllCases}
+        <br />
+        {$form.case_owner.html}
+      {/if}
+      {if $form.case_deleted}
+        <br />
+        {$form.case_deleted.html}
+        {$form.case_deleted.label}
+      {/if}
+    </td>
     <td class="crm-case-common-form-block-case_tags">
-      <label>{ts}Case Tag(s){/ts}</label>
-      <div id="Tag" class="listing-box">
-        {foreach from=$form.case_tags item="tag_val"}
-          <div class="{cycle values='odd-row,even-row'}">
-            {$tag_val.html}
-          </div>
-        {/foreach}
+      {if $form.case_tags}
+        <label>{ts}Case Tag(s){/ts}</label>
+        <div id="Tag" class="listing-box">
+          {foreach from=$form.case_tags item="tag_val"}
+            <div class="{cycle values='odd-row,even-row'}">
+              {$tag_val.html}
+            </div>
+          {/foreach}
+        </div>
+      {/if}
     </td>
-  {/if}
-</tr>
-
-<tr><td colspan="3">{include file="CRM/common/Tagset.tpl" tagsetType='case'}</td></tr>
+  </tr>
 
-  {if $caseGroupTree}
   <tr>
-    <td colspan="4">
-    {include file="CRM/Custom/Form/Search.tpl" groupTree=$caseGroupTree showHideLinks=false}
-    </td>
+    <td colspan="3">{include file="CRM/common/Tagset.tpl" tagsetType='case'}</td>
   </tr>
+
+  {if $caseGroupTree}
+    <tr>
+      <td colspan="3">
+        {include file="CRM/Custom/Form/Search.tpl" groupTree=$caseGroupTree showHideLinks=false}
+      </td>
+    </tr>
   {/if}
 
 {/if}
-
-- 
2.25.1