From a1a821bc5c88b66dada802f86dd041848fcfd0a1 Mon Sep 17 00:00:00 2001
From: unknown <priyanka.karan26@gmail.com>
Date: Sat, 13 Sep 2014 15:54:42 +0100
Subject: [PATCH] swap entity_status with start_action_date vice/versa

---
 CRM/Core/BAO/RecurringEntity.php              | 14 ++++++-------
 CRM/Core/Form/RecurringEntity.php             | 20 +++++++++----------
 CRM/Event/Form/ManageEvent/Repeat.php         | 10 +++++-----
 templates/CRM/Core/Form/RecurringEntity.tpl   | 18 ++++++++---------
 .../CRM/Core/BAO/RecurringEntityTest.php      |  6 +++---
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index e0adb5a10f..d6ef935b6e 100644
--- a/CRM/Core/BAO/RecurringEntity.php
+++ b/CRM/Core/BAO/RecurringEntity.php
@@ -388,7 +388,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
       }
       $repetition_start_date = new DateTime($repetitionStartDate);
       $repetition_start_date->modify('+1 day');
-      $dbParams['entity_status'] = CRM_Utils_Date::processDate($repetition_start_date->format('Y-m-d H:i:s'));
+      $dbParams['start_action_date'] = CRM_Utils_Date::processDate($repetition_start_date->format('Y-m-d H:i:s'));
     }
 
     if(CRM_Utils_Array::value('repetition_frequency_unit', $formParams)){
@@ -415,8 +415,8 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
         }
       }
       if($formParams['repeats_by'] == 2){
-        if(CRM_Utils_Array::value('start_action_date_1', $formParams) && CRM_Utils_Array::value('start_action_date_2', $formParams)){
-          $dbParams['start_action_date'] = $formParams['start_action_date_1']." ".$formParams['start_action_date_2'];
+        if(CRM_Utils_Array::value('entity_status_1', $formParams) && CRM_Utils_Array::value('entity_status_2', $formParams)){
+          $dbParams['entity_status'] = $formParams['entity_status_1']." ".$formParams['entity_status_2'];
         }
       }
     }
@@ -467,8 +467,8 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
     $r = new When();
     //If there is some data for this id
     if($scheduleReminderDetails['repetition_frequency_unit']){
-      if($scheduleReminderDetails['entity_status']){
-        $currDate = date('Y-m-d H:i:s', strtotime($scheduleReminderDetails['entity_status']));
+      if($scheduleReminderDetails['start_action_date']){
+        $currDate = date('Y-m-d H:i:s', strtotime($scheduleReminderDetails['start_action_date']));
       }else{
         $currDate = date("Y-m-d H:i:s");
       }
@@ -503,8 +503,8 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity {
 
       //month 
       if($scheduleReminderDetails['repetition_frequency_unit'] == 'month'){
-        if($scheduleReminderDetails['start_action_date']){
-          $startActionDate = explode(" ", $scheduleReminderDetails['start_action_date']);
+        if($scheduleReminderDetails['entity_status']){
+          $startActionDate = explode(" ", $scheduleReminderDetails['entity_status']);
           switch ($startActionDate[0]) {
           case 'first':
             $startActionDate1 = 1;
diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php
index fb809c9a92..667b238437 100644
--- a/CRM/Core/Form/RecurringEntity.php
+++ b/CRM/Core/Form/RecurringEntity.php
@@ -84,8 +84,8 @@ class CRM_Core_Form_RecurringEntity {
                             'fourth'=> 'Fourth',
                             'last'  => 'Last'
                          );
-    $form->add('select', 'start_action_date_1', ts(''), $dayOfTheWeekNo);
-    $form->add('select', 'start_action_date_2', ts(''), $dayOfTheWeek);
+    $form->add('select', 'entity_status_1', ts(''), $dayOfTheWeekNo);
+    $form->add('select', 'entity_status_2', ts(''), $dayOfTheWeek);
     $eoptionTypes = array('1' => ts('After'),
         '2' => ts('On'),
       );
@@ -172,20 +172,20 @@ class CRM_Core_Form_RecurringEntity {
         }
       }
       if($values['repeats_by'] == 2){
-        if($values['start_action_date_1'] != "" ) {
+        if($values['entity_status_1'] != "" ) {
           $dayOfTheWeekNo = array(first, second, third, fourth, last);
-          if(!in_array($values['start_action_date_1'], $dayOfTheWeekNo)){
-             $errors['start_action_date_1'] = ts('Invalid option');
+          if(!in_array($values['entity_status_1'], $dayOfTheWeekNo)){
+             $errors['entity_status_1'] = ts('Invalid option');
           }
         }else{
-          $errors['start_action_date_1'] = ts('Invalid option');
+          $errors['entity_status_1'] = ts('Invalid option');
         }
-        if($values['start_action_date_2'] != "" ) {
-          if(!in_array($values['start_action_date_2'], $dayOfTheWeek)){
-             $errors['start_action_date_2'] = ts('Invalid day name');
+        if($values['entity_status_2'] != "" ) {
+          if(!in_array($values['entity_status_2'], $dayOfTheWeek)){
+             $errors['entity_status_2'] = ts('Invalid day name');
           }
         }else{
-          $errors['start_action_date_2'] = ts('Invalid day name');
+          $errors['entity_status_2'] = ts('Invalid day name');
         }
       }
     }
diff --git a/CRM/Event/Form/ManageEvent/Repeat.php b/CRM/Event/Form/ManageEvent/Repeat.php
index 1334b8efcc..6072bb2272 100644
--- a/CRM/Event/Form/ManageEvent/Repeat.php
+++ b/CRM/Event/Form/ManageEvent/Repeat.php
@@ -132,7 +132,7 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
     list($defaults['repetition_start_date'], $defaults['repetition_start_date_time']) = CRM_Utils_Date::setDateDefaults($this->_parentEventStartDate, 'activityDateTime');
     // Check if there is id for this event in Reminder table
     if($this->_scheduleReminderId){
-      list($defaults['repetition_start_date'], $defaults['repetition_start_date_time']) = CRM_Utils_Date::setDateDefaults($this->_scheduleReminderDetails->entity_status, 'activityDateTime');
+      list($defaults['repetition_start_date'], $defaults['repetition_start_date_time']) = CRM_Utils_Date::setDateDefaults($this->_scheduleReminderDetails->start_action_date, 'activityDateTime');
       $defaults['repetition_frequency_unit'] = $this->_scheduleReminderDetails->repetition_frequency_unit;
       $defaults['repetition_frequency_interval'] = $this->_scheduleReminderDetails->repetition_frequency_interval;
       $defaults['start_action_condition'] = array_flip(explode(",",$this->_scheduleReminderDetails->start_action_condition));
@@ -154,10 +154,10 @@ class CRM_Event_Form_ManageEvent_Repeat extends CRM_Event_Form_ManageEvent {
         $defaults['repeats_by'] = 1;
       }
       $explodeStartActionCondition = array();
-      $explodeStartActionCondition = explode(" ", $this->_scheduleReminderDetails->start_action_date);
-      $defaults['start_action_date_1'] = $explodeStartActionCondition[0];
-      $defaults['start_action_date_2'] = $explodeStartActionCondition[1];
-      if($this->_scheduleReminderDetails->start_action_date){
+      $explodeStartActionCondition = explode(" ", $this->_scheduleReminderDetails->entity_status);
+      $defaults['entity_status_1'] = $explodeStartActionCondition[0];
+      $defaults['entity_status_2'] = $explodeStartActionCondition[1];
+      if($this->_scheduleReminderDetails->entity_status){
         $defaults['repeats_by'] = 2;
       }
       //echo "<pre>"; print_r($this->_excludeDateInfo);
diff --git a/templates/CRM/Core/Form/RecurringEntity.tpl b/templates/CRM/Core/Form/RecurringEntity.tpl
index 0086786240..34b6dac571 100644
--- a/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -59,7 +59,7 @@
           </tr>
           <tr class="crm-core-form-recurringentity-block-repeats_by">
             <td class="label"></td>
-            <td>{$form.repeats_by.2.html}&nbsp;&nbsp;{$form.start_action_date_1.html}&nbsp;&nbsp;{$form.start_action_date_2.html} {help id="id-repeats-by-week"}
+            <td>{$form.repeats_by.2.html}&nbsp;&nbsp;{$form.entity_status_1.html}&nbsp;&nbsp;{$form.entity_status_2.html} {help id="id-repeats-by-week"}
             </td>
           </tr>
           {*<tr class="crm-core-form-recurringentity-block-event_start_date">
@@ -145,13 +145,13 @@
     /******On Load set Repeats by section******************/
     if(cj('input:radio[name=repeats_by]:checked').val() == 1){
         cj('#limit_to').removeAttr('disabled').attr('enabled','enabled');
-        cj('#start_action_date_1, #start_action_date_2').removeAttr("enabled").attr('disabled','disabled');
+        cj('#entity_status_1, #entity_status_2').removeAttr("enabled").attr('disabled','disabled');
     }else if(cj('input:radio[name=repeats_by]:checked').val() == 2){
-        cj('#start_action_date_1, #start_action_date_2').removeAttr("disabled").attr('enabled','enabled');
+        cj('#entity_status_1, #entity_status_2').removeAttr("disabled").attr('enabled','enabled');
         cj('#limit_to').removeAttr('enabled').attr('disabled','disabled');
     }else{
         //Just in-case block shows up, disable it
-        cj('#limit_to, #start_action_date_1, #start_action_date_2').removeAttr('enabled').attr('disabled','disabled');
+        cj('#limit_to, #entity_status_1, #entity_status_2').removeAttr('enabled').attr('disabled','disabled');
     }
     
     cj('#repetition_frequency_unit').change(function () {
@@ -203,11 +203,11 @@
             cj('#limit_to').removeAttr('enabled').attr('disabled','disabled');
         }
         if(cj(this).val() == 2){
-            cj('#start_action_date_1').removeAttr('disabled').attr('enabled','enabled');
-            cj('#start_action_date_2').removeAttr('disabled').attr('enabled','enabled');
+            cj('#entity_status_1').removeAttr('disabled').attr('enabled','enabled');
+            cj('#entity_status_2').removeAttr('disabled').attr('enabled','enabled');
         }else{
-            cj('#start_action_date_1').removeAttr('enabled').attr('disabled','disabled');
-            cj('#start_action_date_2').removeAttr('enabled').attr('disabled','disabled');
+            cj('#entity_status_1').removeAttr('enabled').attr('disabled','disabled');
+            cj('#entity_status_2').removeAttr('enabled').attr('disabled','disabled');
         }
     });
     
@@ -369,7 +369,7 @@
             finalSummary += ' on day ' + cj('#limit_to').val();
         }
         if(cj('input:radio[name=repeats_by]:checked').val() == 2){
-            finalSummary += ' on ' + cj('#start_action_date_1').val().substr(0, 1).toUpperCase() + cj('#start_action_date_1').val().substr(1).toLowerCase() + ' ' + cj('#start_action_date_2').val().substr(0, 1).toUpperCase() + cj('#start_action_date_2').val().substr(1).toLowerCase();
+            finalSummary += ' on ' + cj('#entity_status_1').val().substr(0, 1).toUpperCase() + cj('#entity_status_1').val().substr(1).toLowerCase() + ' ' + cj('#entity_status_2').val().substr(0, 1).toUpperCase() + cj('#entity_status_2').val().substr(1).toLowerCase();
         }
     }
     
diff --git a/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php b/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php
index 54c8af9497..8e9bd7f6cb 100644
--- a/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php
+++ b/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php
@@ -78,8 +78,8 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
     $recursion->dateColumns  = array('activity_date_time');
     $recursion->scheduleDBParams = array(
       'entity_value'      => $daoActivity->id,
-      'entity_status'     => $daoActivity->activity_date_time,
-      'start_action_date' => 'fourth saturday',
+      'start_action_date'     => $daoActivity->activity_date_time,
+      'entity_status' => 'fourth saturday',
       'repetition_frequency_unit' => 'month',
       'repetition_frequency_interval' => 3,
       'start_action_offset' => 5,
@@ -128,7 +128,7 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase {
     $recursion->dateColumns  = array('start_date');
     $recursion->scheduleDBParams = array (
       'entity_value'                  => $daoEvent->id,
-      'entity_status'                 => $daoEvent->start_date,
+      'start_action_date'                 => $daoEvent->start_date,
       'start_action_condition'        => 'wednesday',
       'repetition_frequency_unit'     => 'week',
       'repetition_frequency_interval' => 1,
-- 
2.25.1