From 1156155a38856a7315c5923e70b1adaf8a905bca Mon Sep 17 00:00:00 2001
From: Poonam <poonam@poonam.(none)>
Date: Thu, 10 Apr 2014 19:28:30 +0530
Subject: [PATCH] --HR-321 Simplify case-activity forms and add case_status as
 a url param

---
 CRM/Case/Form/Activity/ChangeCaseStatus.php |  9 ++++++-
 CRM/Case/Form/Activity/OpenCase.php         |  2 +-
 templates/CRM/Case/Form/Activity.tpl        | 28 ++++++++++++++-------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/CRM/Case/Form/Activity/ChangeCaseStatus.php b/CRM/Case/Form/Activity/ChangeCaseStatus.php
index 0d23cd3460..09f31ebac6 100644
--- a/CRM/Case/Form/Activity/ChangeCaseStatus.php
+++ b/CRM/Case/Form/Activity/ChangeCaseStatus.php
@@ -74,9 +74,16 @@ class CRM_Case_Form_Activity_ChangeCaseStatus {
         FALSE
       );
     }
-    $form->add('select', 'case_status_id', ts('Case Status'),
+    $element = $form->add('select', 'case_status_id', ts('Case Status'),
       $form->_caseStatus, TRUE
     );
+    // check if the case status id passed in url is a valid one, set as default and freeze
+    if (CRM_Utils_Request::retrieve('case_status_id', 'Positive', $form)) {
+      $caseStatusId = CRM_Utils_Request::retrieve('case_status_id', 'Positive', $form);
+      $caseStatus = CRM_Case_PseudoConstant::caseStatus();
+      $form->_defaultCaseStatus = array_key_exists($caseStatusId, $caseStatus) ? $caseStatusId : NULL;
+      $element->freeze();
+    }
   }
 
   /**
diff --git a/CRM/Case/Form/Activity/OpenCase.php b/CRM/Case/Form/Activity/OpenCase.php
index dd324fcfac..f5801502c1 100644
--- a/CRM/Case/Form/Activity/OpenCase.php
+++ b/CRM/Case/Form/Activity/OpenCase.php
@@ -75,7 +75,7 @@ class CRM_Case_Form_Activity_OpenCase {
     $form->_caseTypeId = array_key_exists($caseTypeId, $caseTypes) ? $caseTypeId : NULL;
 
     // check if the case status id passed in url is a valid one
-    $caseStatusId = CRM_Utils_Request::retrieve('cStatus', 'Positive', $form);
+    $caseStatusId = CRM_Utils_Request::retrieve('case_status_id', 'Positive', $form);
     $caseStatus = CRM_Case_PseudoConstant::caseStatus();
     $form->_caseStatusId = array_key_exists($caseStatusId, $caseStatus) ? $caseStatusId : NULL;
 
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index ad63f02997..7236c08767 100644
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -55,7 +55,10 @@
         <div id="help">{$activityTypeDescription}</div>
       </tr>
     {/if}
-    {if $activityTypeFile}
+    {* Block for change status, case type and start date. *}
+    {if $activityTypeFile EQ 'ChangeCaseStatus'
+    || $activityTypeFile EQ 'ChangeCaseType'
+    || $activityTypeFile EQ 'ChangeCaseStartDate'}
       {include file="CRM/Case/Form/Activity/$activityTypeFile.tpl"}
       <tr class="crm-case-activity-form-block-details">
         <td class="label">{ts}Notes{/ts}</td>
@@ -64,14 +67,16 @@
           {if $defaultWysiwygEditor eq 0}{$form.details.html|crmAddClass:huge}{else}{$form.details.html}{/if}
         </td>
       </tr>
+      {* Added Activity Details accordion tab *}
+      <tr class="crm-case-activity-form-block-activity-details">
+        <td colspan="2">
+          <div id="activity-details" class="crm-accordion-wrapper collapsed">
+            <div class="crm-accordion-header">
+              {ts} Activity Details{/ts}
+            </div><!-- /.crm-accordion-header -->
+            <div class="crm-accordion-body">
     {/if}
-    <tr class="crm-case-activity-form-block-activity-details">
-      <td colspan="2">
-        <div id="activity-details" class="crm-accordion-wrapper collapsed">
-          <div class="crm-accordion-header">
-            {ts} Activity Details{/ts}
-          </div><!-- /.crm-accordion-header -->
-          <div class="crm-accordion-body">
+    {* End block for change status, case type and start date. *}
             <table class="form-layout-compressed">
               <tbody>
                 <tr id="with-clients" class="crm-case-activity-form-block-client_name">
@@ -125,7 +130,7 @@
                 </tr>
 
               {* Include special processing fields if any are defined for this activity type (e.g. Change Case Status / Change Case Type). *}
-    
+
               {if $activityTypeFile neq 'ChangeCaseStartDate'}
                 <tr class="crm-case-activity-form-block-subject">
                   <td class="label">{$form.subject.label}</td><td class="view-value">{$form.subject.html|crmAddClass:huge}</td>
@@ -167,8 +172,13 @@
                 </td>
               </tr>
             </table>
+        {if $activityTypeFile EQ 'ChangeCaseStatus'
+        || $activityTypeFile EQ 'ChangeCaseType'
+        || $activityTypeFile EQ 'ChangeCaseStartDate'}
           </div><!-- /.crm-accordion-body -->
         </div><!-- /.crm-accordion-wrapper -->
+        {* End of Activity Details accordion tab *}
+      {/if}
       </td>
     </tr>
     <tr class="crm-case-activity-form-block-attachment">
-- 
2.25.1