-- more fixes for CRM-12191

diff --git a/CRM/Campaign/Form/Task/Interview.php b/CRM/Campaign/Form/Task/Interview.php
index a1b214fb3b3019d24f2ae0b39327c96acfc166b5..1f60d11d9882475a1c958dcf193e338c2810b7c6 100755 (executable)
--- a/CRM/Campaign/Form/Task/Interview.php
+++ b/CRM/Campaign/Form/Task/Interview.php
@@ -537,14 +537,8 @@ WHERE {$clause}
     $activity->activity_date_time = date('YmdHis');
     $activity->status_id = $statusId;
 
-    if (CRM_Utils_Array::value('details', $params)) {
-      $activity->details = $params['details'];
-    }
-    if ($result = CRM_Utils_Array::value('result', $params)) {
-      $activity->result = $result;
-    }
-    if (CRM_Utils_Array::value('activity_engagement_level', $params)) {
-      $activity->engagement_level = $params['activity_engagement_level'];
+    if (CRM_Utils_Array::value('activity_date_time', $params)) {
+      $activity->activity_date_time = CRM_Utils_Date::processDate($params['activity_date_time'], $params['activity_date_time_time']);
     }
 
     $subject = '';
@@ -556,6 +550,23 @@ WHERE {$clause}
     $subject .= ts('Respondent Interview');
 
     $activity->subject = $subject;
+    $activityParams = array(
+      'details' => 'details',
+      'result' => 'result',
+      'engagement_level' => 'activity_engagement_level', 
+      'subject' => 'activity_subject',
+      'status_id' => 'activity_status_id',
+      'source_contact_id' => 'source_contact', 
+      'location' => 'activity_location', 
+      'campaign_id' => 'activity_campaign_id',
+      'duration' => 'activity_duration'
+    );
+    foreach ($activityParams as $key => $field) {
+      if (CRM_Utils_Array::value($field, $params)) {
+        $activity->$key = $params[$field];
+      }
+    }
+  
     $activity->save();
     //really this should use Activity BAO& not be here but refactoring will have to be later
     //actually the whole ajax call could be done as an api ajax call & post hook would be sorted

diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl
index d852b078b1e849b2c0a0244ffbfaa1263e6e3a18..55a29d4b17caff4147f659e4959c99e6560c38ef 100644 (file)
--- a/templates/CRM/Campaign/Form/Task/Interview.tpl
+++ b/templates/CRM/Campaign/Form/Task/Interview.tpl
@@ -293,8 +293,9 @@ function registerInterview( voterId ) {
   }
 
   //carry contact related profile field data.
-  fieldName = 'field_' + voterId;
-  cj('[id^="'+ fieldName +'"]').each(function( ) {
+  var fieldName = 'field_' + voterId;
+  var checkBoxFieldName = 'field[' + voterId + ']';
+  cj('[id^="'+ fieldName +'"], [id^="'+ checkBoxFieldName +'"]').each(function( ) { 
     fldId = cj(this).attr('id');
     if (fldId.indexOf('_custom_') == -1 &&
       fldId.indexOf('_result') == -1  &&