From a24b36946ce08cd2e43839923927b0a3d254da98 Mon Sep 17 00:00:00 2001 From: yashodha Date: Sun, 21 Apr 2013 00:24:18 +0530 Subject: [PATCH] more-CRM-12274 --- CRM/Activity/BAO/Activity.php | 75 ++++++++++++++++--------- CRM/Activity/BAO/ActivityAssignment.php | 13 ++++- CRM/Activity/BAO/ActivityContact.php | 6 +- CRM/Activity/BAO/ActivityTarget.php | 15 +++-- CRM/Activity/BAO/Query.php | 12 ++-- CRM/Activity/Page/AJAX.php | 10 +++- CRM/Activity/Selector/Search.php | 12 ++-- sql/GenerateData.php | 33 ++++++----- sql/civicrm_generated.mysql | 4 +- xml/schema/Activity/ActivityContact.xml | 22 ++++---- 10 files changed, 127 insertions(+), 75 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 79c3904e72..0fda13100f 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -249,11 +249,11 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { * @return null * @access public */ - public static function deleteActivityContact($activityId, $recordType = NULL) { + public static function deleteActivityContact($activityId, $recordTypeID = NULL) { $activityContact = new CRM_Activity_BAO_ActivityContact(); $activityContact->activity_id = $activityId; - if ($recordType) { - $activityContact->record_type = $recordType; + if ($recordTypeID) { + $activityContact->record_type_id = $recordTypeID; } $activityContact->delete(); } @@ -341,12 +341,16 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { } $activityId = $activity->id; + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); if (isset($params['source_contact_id'])) { $acParams = array( 'activity_id' => $activityId, 'contact_id' => $params['source_contact_id'], - 'record_type' => 'Source' + 'record_type_id' => $sourceID ); CRM_Activity_BAO_ActivityContact::create($acParams); } @@ -354,7 +358,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { // check and attach and files as needed CRM_Core_BAO_File::processAttachment($params, 'civicrm_activity', $activityId); - // attempt to save activity assignment $resultAssignment = NULL; if (CRM_Utils_Array::value('assignee_contact_id', $params)) { @@ -364,19 +367,19 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { if (is_array($params['assignee_contact_id'])) { if (CRM_Utils_Array::value('deleteActivityAssignment', $params, TRUE)) { // first delete existing assignments if any - self::deleteActivityContact($activityId, 'Assignee'); + self::deleteActivityContact($activityId, $assigneeID); } $values = array(); foreach ($params['assignee_contact_id'] as $acID) { if ($acID) { - $values[] = "( $activityId, $acID, 'Assignee' )"; + $values[] = "( $activityId, $acID, $assigneeID )"; } } while (!empty($values)) { $input = array_splice($values, 0, CRM_Core_DAO::BULK_INSERT_COUNT); $str = implode(',', $input); - $sql = "INSERT IGNORE INTO civicrm_activity_contact ( activity_id, contact_id, record_type ) VALUES $str;"; + $sql = "INSERT IGNORE INTO civicrm_activity_contact ( activity_id, contact_id, record_type_id ) VALUES $str;"; CRM_Core_DAO::executeQuery($sql); } } @@ -400,7 +403,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { } else { if (CRM_Utils_Array::value('deleteActivityAssignment', $params, TRUE)) { - self::deleteActivityContact($activityId, 'Assignee'); + self::deleteActivityContact($activityId, $assigneeID); } } @@ -418,20 +421,20 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { if (is_array($params['target_contact_id'])) { if (CRM_Utils_Array::value('deleteActivityTarget', $params, TRUE)) { // first delete existing targets if any - self::deleteActivityContact($activityId, 'Target'); + self::deleteActivityContact($activityId, $targetID ); } $values = array(); foreach ($params['target_contact_id'] as $tid) { if ($tid) { - $values[] = "( $activityId, $tid, 'Target' )"; + $values[] = "( $activityId, $tid, $targetID )"; } } while (!empty($values)) { $input = array_splice($values, 0, CRM_Core_DAO::BULK_INSERT_COUNT); $str = implode(',', $input); - $sql = "INSERT IGNORE INTO civicrm_activity_contact ( activity_id, contact_id, record_type ) VALUES $str;"; + $sql = "INSERT IGNORE INTO civicrm_activity_contact ( activity_id, contact_id, record_type_id ) VALUES $str;"; CRM_Core_DAO::executeQuery($sql); } } @@ -455,7 +458,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { } else { if (CRM_Utils_Array::value('deleteActivityTarget', $params, TRUE)) { - self::deleteActivityContact($activityId, 'Target'); + self::deleteActivityContact($activityId, $targetID ); } } @@ -737,17 +740,17 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.ac // create temp table for target contacts $activityContactTempTable = "civicrm_temp_activity_contact_{$randomNum}"; $query = "CREATE TEMPORARY TABLE {$activityContactTempTable} ( - activity_id int unsigned, contact_id int unsigned, record_type varchar(16), contact_name varchar(255) ) + activity_id int unsigned, contact_id int unsigned, record_type_id varchar(16), contact_name varchar(255) ) ENGINE=MYISAM DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"; CRM_Core_DAO::executeQuery($query); // note that we ignore bulk email for targets, since we don't show it in selector $query = " -INSERT INTO {$activityContactTempTable} ( activity_id, contact_id, record_type, contact_name ) +INSERT INTO {$activityContactTempTable} ( activity_id, contact_id, record_type_id, contact_name ) SELECT ac.activity_id, ac.contact_id, - ac.record_type + ac.record_type_id c.sort_name FROM civicrm_activity_contact ac INNER JOIN {$activityTempTable} ON ( ac.activity_id = {$activityTempTable}.activity_id @@ -763,7 +766,7 @@ WHERE c.is_deleted = 0 $query = " SELECT {$activityTempTable}.*, {$activityContactTempTable}.contact_id, - {$activityContactTempTable}.record_type, + {$activityContactTempTable}.record_type_id, {$activityContactTempTable}.contact_name, FROM {$activityTempTable} INNER JOIN {$activityContactTempTable} on {$activityTempTable}.activity_id = {$activityContactTempTable}.activity_id @@ -784,6 +787,12 @@ INNER JOIN {$activityContactTempTable} on {$activityTempTable}.activity_id = {$a $allCampaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE); $values = array(); + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + + while ($dao->fetch()) { $activityID = $dao->activity_id; $values[$activityID]['activity_id'] = $dao->activity_id; @@ -807,17 +816,17 @@ INNER JOIN {$activityContactTempTable} on {$activityTempTable}.activity_id = {$a $values[$activityID]['target_contact_name'] = array(); } - if ($dao->record_type == 'Source' && $dao->contact_id) { + if ($dao->record_type_id == $sourceID && $dao->contact_id) { $values[$activityID]['source_contact_id'] = $dao->contact_id; $values[$activityID]['source_contact_name'] = $dao->contact_name; } if (!$bulkActivityTypeID || ($bulkActivityTypeID != $dao->activity_type_id)) { // build array of target / assignee names - if ($dao->record_type == 'Target' && $dao->contact_id) { + if ($dao->record_type_id == $targetID && $dao->contact_id) { $values[$activityID]['target_contact_name'][$dao->contact_id] = $dao->contact_name; } - if ($dao->record_type == 'Assignee' && $dao->contact_id) { + if ($dao->record_type_id == $assigneeID && $dao->contact_id) { $values[$activityID]['assignee_contact_name'][$dao->contact_id] = $dao->contact_name; } @@ -1043,7 +1052,7 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id null as case_id, null as case_subject, civicrm_activity.campaign_id as campaign_id, activityContact.contact_id as contact_id, - activityContact.record_type as record_type, + activityContact.record_type_id as record_type_id, contact.sort_name as sort_name '; @@ -1481,11 +1490,15 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id return FALSE; } + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + + // add activity target record for every sms that is send $activityTargetParams = array( 'activity_id' => $activityID, 'contact_id' => $toID, - 'record_type' => 'Target' + 'record_type_id' => $targetID ); CRM_Activity_BAO_ActivityContact::create($activityTargetParams); @@ -1532,6 +1545,11 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id $toDisplayName = $toEmail; } + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + //$sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + //$assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + // create the params array $mailParams = array( 'groupName' => 'Activity Email Sender', @@ -1554,7 +1572,7 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id $activityTargetParams = array( 'activity_id' => $activityID, 'contact_id' => $toID, - 'record_type' => 'Target' + 'record_type_id' => $targetID ); CRM_Activity_BAO_ActivityContact::create($activityTargetParams); return TRUE; @@ -1629,19 +1647,24 @@ INNER JOIN civicrm_contact contact ON ac.contact_id = contact.id */ static function getContactActivity($contactId) { $activities = array(); + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + // First look for activities where contactId is one of the targets $query = " -SELECT activity_id +SELECT activity_id, record_type_id FROM civicrm_activity_contact WHERE contact_id = $contactId "; $dao = CRM_Core_DAO::executeQuery($query); while ($dao->fetch()) { - if ($dao->record_type == 'Target') { + if ($dao->record_type_id == $targetID ) { $activities[$dao->activity_id]['targets'][$contactId] = $contactId; } - else if ($dao->record_type == 'Assignee') { + else if ($dao->record_type_id == $assigneeID) { $activities[$dao->activity_id]['asignees'][$contactId] = $contactId; } else { diff --git a/CRM/Activity/BAO/ActivityAssignment.php b/CRM/Activity/BAO/ActivityAssignment.php index 34e8bf5c48..db7b9873b1 100644 --- a/CRM/Activity/BAO/ActivityAssignment.php +++ b/CRM/Activity/BAO/ActivityAssignment.php @@ -58,9 +58,11 @@ class CRM_Activity_BAO_ActivityAssignment extends CRM_Activity_DAO_ActivityConta */ public static function create(&$params) { $assignment = new CRM_Activity_BAO_ActivityAssignment(); + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); $assignment->copyValues($params); - $assignment->record_type = 'Assignee'; + $assignment->record_type_id = $assigneeID; if (isset($assignment->assignee_contact_id)) { $assignment->contact_id = $assignment->assignee_contact_id; } @@ -83,12 +85,15 @@ class CRM_Activity_BAO_ActivityAssignment extends CRM_Activity_DAO_ActivityConta return $assigneeArray; } + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $sql = " SELECT contact_id FROM civicrm_activity_contact INNER JOIN civicrm_contact ON contact_id = civicrm_contact.id WHERE activity_id = %1 -AND record_type = 'Assignee' +AND record_type_id = $assigneeID AND civicrm_contact.is_deleted = 0 "; $assignment = CRM_Core_DAO::executeQuery($sql, array(1 => array($activity_id, 'Integer'))); @@ -116,6 +121,8 @@ AND civicrm_contact.is_deleted = 0 if (empty($activityID)) { return $assigneeNames; } + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); $whereClause = ""; if (!$skipDetails) { @@ -129,7 +136,7 @@ INNER JOIN civicrm_activity_contact ON civicrm_activity_contact.contact_id = con LEFT JOIN civicrm_email ce ON ce.contact_id = contact_a.id WHERE civicrm_activity_contact.activity_id = %1 AND contact_a.is_deleted = 0 -AND civicrm_activity_contact.record_type = 'Assignee' +AND civicrm_activity_contact.record_type_id = $assigneeID {$whereClause} "; diff --git a/CRM/Activity/BAO/ActivityContact.php b/CRM/Activity/BAO/ActivityContact.php index 0b8694e9f6..fb89c84af2 100644 --- a/CRM/Activity/BAO/ActivityContact.php +++ b/CRM/Activity/BAO/ActivityContact.php @@ -73,7 +73,7 @@ class CRM_Activity_BAO_ActivityContact extends CRM_Activity_DAO_ActivityContact * @access public * */ - static function getNames($activityID, $recordType, $alsoIDs = FALSE) { + static function getNames($activityID, $recordTypeID, $alsoIDs = FALSE) { $names = array(); $ids = array(); @@ -86,12 +86,12 @@ SELECT contact_a.id, contact_a.sort_name FROM civicrm_contact contact_a INNER JOIN civicrm_activity_contact ON civicrm_activity_contact.contact_id = contact_a.id WHERE civicrm_activity_contact.activity_id = %1 -AND civicrm_activity_contact.record_type = %2 +AND civicrm_activity_contact.record_type_id = %2 AND contact_a.is_deleted = 0 "; $params = array( 1 => array($activityID, 'Integer'), - 2 => array($recordType, 'String') + 2 => array($recordTypeID, 'Integer') ); $dao = CRM_Core_DAO::executeQuery($query, $params); diff --git a/CRM/Activity/BAO/ActivityTarget.php b/CRM/Activity/BAO/ActivityTarget.php index 55367b2aaa..cb804715ab 100644 --- a/CRM/Activity/BAO/ActivityTarget.php +++ b/CRM/Activity/BAO/ActivityTarget.php @@ -58,9 +58,11 @@ class CRM_Activity_BAO_ActivityTarget extends CRM_Activity_DAO_ActivityContact { */ public static function create(&$params) { $target = new CRM_Activity_BAO_ActivityContact(); - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + $target->copyValues($params); - $target->record_type = 'Target'; + $target->record_type_id = $targetID ; return $target->save(); } @@ -80,12 +82,15 @@ class CRM_Activity_BAO_ActivityTarget extends CRM_Activity_DAO_ActivityContact { return $targetArray; } + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + $sql = " SELECT contact_id FROM civicrm_activity_contact INNER JOIN civicrm_contact ON contact_id = civicrm_contact.id WHERE activity_id = %1 -AND record_type = 'Target' +AND record_type_id = $targetID AND civicrm_contact.is_deleted = 0 "; $target = CRM_Core_DAO::executeQuery($sql, array(1 => array($activity_id, 'Integer'))); @@ -111,13 +116,15 @@ AND civicrm_contact.is_deleted = 0 if (empty($activityID)) { return $targetNames; } + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); $query = " SELECT contact_a.id, contact_a.sort_name FROM civicrm_contact contact_a INNER JOIN civicrm_activity_contact ON civicrm_activity_contact.contact_id = contact_a.id WHERE civicrm_activity_contact.activity_id = %1 -AND civicrm_activity_contact.record_type = 'Target' +AND civicrm_activity_contact.record_type_id = $targetID AND contact_a.is_deleted = 0 "; $queryParam = array(1 => array($activityID, 'Integer')); diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 85ca36d96d..4c37690a55 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -242,19 +242,23 @@ class CRM_Activity_BAO_Query { case 'activity_role': CRM_Contact_BAO_Query::$_activityRole = $values[2]; - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + if ($values[2]) { $query->_tables['civicrm_activity_contact'] = $query->_whereTables['civicrm_activity_contact'] = 1; if ($values[2] == 1) { - $query->_where[$grouping][] = " civicrm_activity_contact.record_type = 'Source'"; + $query->_where[$grouping][] = " civicrm_activity_contact.record_type_id = $sourceID"; $query->_qill[$grouping][] = ts('Activity created by'); } else if ($values[2] == 2) { - $query->_where[$grouping][] = " civicrm_activity_contact.record_type = 'Assigneen'"; + $query->_where[$grouping][] = " civicrm_activity_contact.record_type_id = $assigneeID"; $query->_qill[$grouping][] = ts('Activity assigned to'); } else if ($values[2] == 3) { - $query->_where[$grouping][] = " civicrm_activity_contact.record_type = 'Target'"; + $query->_where[$grouping][] = " civicrm_activity_contact.record_type_id = $targetID"; $query->_qill[$grouping][] = ts('Activity targeted to'); } } diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index bcd6a06988..6f9db5c588 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -361,11 +361,17 @@ class CRM_Activity_Page_AJAX { if (!empty($params['targetContactIds'])) { $targetContacts = array_unique(explode(',', $params['targetContactIds'])); } + + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + foreach ($targetContacts as $key => $value) { $targ_params = array( 'activity_id' => $mainActivityId, 'contact_id' => $value, - 'record_type' => 'Target' + 'record_type_id' => $targetID ); CRM_Activity_BAO_ActivityContact::create($targ_params); } @@ -379,7 +385,7 @@ class CRM_Activity_Page_AJAX { $assigneeParams = array( 'activity_id' => $mainActivityId, 'contact_id' => $value, - 'record_type' => 'Assignee' + 'record_type_id' => $assigneeID ); CRM_Activity_BAO_ActivityContact::create($assigneeParams); } diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php index 463de81925..8d35861760 100644 --- a/CRM/Activity/Selector/Search.php +++ b/CRM/Activity/Selector/Search.php @@ -249,7 +249,11 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM $allCampaigns = CRM_Campaign_BAO_Campaign::getCampaigns(NULL, NULL, FALSE, FALSE, FALSE, TRUE); $engagementLevels = CRM_Campaign_PseudoConstant::engagementLevel(); - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); + $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts); + $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); + while ($result->fetch()) { $row = array(); @@ -270,9 +274,9 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM $contactId = CRM_Utils_Array::value('source_contact_id', $row); } - $row['target_contact_name'] = CRM_Activity_BAO_ActivityContact::getNames($row['activity_id'], 'Target'); - $row['assignee_contact_name'] = CRM_Activity_BAO_ActivityContact::getNames($row['activity_id'], 'Assignee'); - list($row['source_contact_name'], $row['source_contact_id']) = CRM_Activity_BAO_ActivityContact::getNames($row['activity_id'], 'Source', TRUE); + $row['target_contact_name'] = CRM_Activity_BAO_ActivityContact::getNames($row['activity_id'], $targetID); + $row['assignee_contact_name'] = CRM_Activity_BAO_ActivityContact::getNames($row['activity_id'], $assigneeID); + list($row['source_contact_name'], $row['source_contact_id']) = CRM_Activity_BAO_ActivityContact::getNames($row['activity_id'], $sourceID, TRUE); $row['source_contact_name'] = implode(',', array_values($row['source_contact_name'])); $row['source_contact_id'] = implode(',', $row['source_contact_id']); diff --git a/sql/GenerateData.php b/sql/GenerateData.php index bacfba091e..c3ac5ef702 100644 --- a/sql/GenerateData.php +++ b/sql/GenerateData.php @@ -1137,7 +1137,7 @@ class CRM_GCD { $contactDAO->find(); $count = 0; - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); while ($contactDAO->fetch()) { if ($count++ > 2) { break; @@ -1156,14 +1156,14 @@ class CRM_GCD { $activityContactDAO = new CRM_Activity_DAO_ActivityContact(); $activityContactDAO->activity_id = $activityDAO->id; $activityContactDAO->contact_id = $contactDAO->id; - $activityContactDAO->record_type = 'Source'; + $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Source', $activityContacts); $this->_insert($activityContactDAO); if (in_array($activityTypeID, array(6, 9))) { $activityContactDAO = new CRM_Activity_DAO_ActivityContact(); $activityContactDAO->activity_id = $activityDAO->id; $activityContactDAO->contact_id = mt_rand(1, 101); - $activityContactDAO->record_type = 'Target'; + $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Targets', $activityContacts); $this->_insert($activityContactDAO); } @@ -1171,7 +1171,7 @@ class CRM_GCD { $activityContactDAO = new CRM_Activity_DAO_ActivityContact(); $activityContactDAO->activity_id = $activityDAO->id; $activityContactDAO->contact_id = mt_rand(1, 101); - $activityContactDAO->record_type = 'Assignee'; + $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Assignees', $activityContacts); $this->_insert($activityContactDAO); } } @@ -1256,6 +1256,7 @@ class CRM_GCD { private function addMembership() { $contact = new CRM_Contact_DAO_Contact(); $contact->query("SELECT id FROM civicrm_contact where contact_type = 'Individual'"); + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); while ($contact->fetch()) { $contacts[] = $contact->id; } @@ -1282,16 +1283,17 @@ VALUES $activityContact = " INSERT INTO civicrm_activity_contact - (activity_id, contact_id, record_type) + (activity_id, contact_id, record_type_id) VALUES "; $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity"); + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); foreach ($randomContacts as $count => $dontCare) { $source = $this->randomItem($sources); $activitySourceId = $count + 1; $currentActivityID++; - $activityContact .= "( $currentActivityID, {$randomContacts[$count]}, 'Source' )"; + $activityContact .= "( $currentActivityID, {$randomContacts[$count]}, {$sourceID} )"; if ((($count + 1) % 11 == 0)) { // lifetime membership, status can be anything $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y'))); @@ -1621,15 +1623,16 @@ VALUES $activityContact = " INSERT INTO civicrm_activity_contact - (contact_id, activity_id, record_type) + (contact_id, activity_id, record_type_id) VALUES "; - + $activityContacts = CRM_Core_PseudoConstant::activityContacts('name'); $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity"); $currentActivityID -= 50; + $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts); for ($i = 0; $i < 50; $i++) { $currentActivityID++; - $activityContact .= "({$randomContacts[$i]}, $currentActivityID, 'Source')"; + $activityContact .= "({$randomContacts[$i]}, $currentActivityID, $sourceID)"; if ($i != 49) { $activityContact .= ", "; } @@ -1691,14 +1694,14 @@ VALUES $activityContact = " INSERT INTO civicrm_activity_contact - (contact_id, activity_id, record_type) + (contact_id, activity_id, record_type_id) VALUES "; $arbitraryNumbers = array(2, 4, 6, 8, 16, 19, 82, 92, 34, 71, 43, 32, 32); for ($i = 0; $i < count($arbitraryNumbers); $i++) { $currentActivityID++; - $activityContact .= "({$arbitraryNumbers[$i]}, $currentActivityID, 'Source')"; + $activityContact .= "({$arbitraryNumbers[$i]}, $currentActivityID, 2)"; if ($i != count($arbitraryNumbers) - 1) { $activityContact .= ", "; } @@ -1853,8 +1856,8 @@ WHERE cps.name = 'default_membership_type_amount'"; SELECT id, 6, CONCAT('$ ', total_amount, ' - ', source), now(), 2, 'Membership Payment' FROM civicrm_contribution WHERE id > $maxContribution"; $this->_query($sql); - $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type) -SELECT c.contact_id, a.id, 'Source' + $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type_id) +SELECT c.contact_id, a.id, 2 FROM civicrm_contribution c, civicrm_activity a WHERE c.id > $maxContribution AND a.source_record_id = c.id @@ -1884,8 +1887,8 @@ WHERE cc.id > $maxContribution"; SELECT id, 6, CONCAT('$ ', total_amount, ' - ', source), now(), 2, 'Participant' FROM `civicrm_contribution` WHERE id > $maxContribution"; $this->_query($sql); - $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type) -SELECT c.contact_id, a.id, 'Source' + $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type_id) +SELECT c.contact_id, a.id, 2 FROM civicrm_contribution c, civicrm_activity a WHERE c.id > $maxContribution AND a.source_record_id = c.id diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index ff7134109e..6228d12943 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -97,7 +97,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_activity_contact` WRITE; /*!40000 ALTER TABLE `civicrm_activity_contact` DISABLE KEYS */; -INSERT INTO `civicrm_activity_contact` (`id`, `activity_id`, `contact_id`, `record_type`) VALUES (269,175,1,'Target'),(49,32,2,'Target'),(132,84,2,'Target'),(299,195,2,'Target'),(668,451,2,'Source'),(263,171,3,'Assignee'),(428,282,4,'Assignee'),(669,452,4,'Source'),(681,464,4,'Source'),(711,494,4,'Source'),(364,242,5,'Target'),(661,445,5,'Target'),(779,562,5,'Source'),(55,36,6,'Assignee'),(92,60,6,'Target'),(670,453,6,'Source'),(252,163,7,'Assignee'),(790,573,7,'Source'),(228,148,8,'Assignee'),(291,190,8,'Assignee'),(437,288,8,'Assignee'),(671,454,8,'Source'),(769,552,8,'Source'),(33,23,9,'Assignee'),(99,64,9,'Assignee'),(170,110,9,'Target'),(187,121,9,'Target'),(203,132,9,'Assignee'),(234,152,9,'Target'),(751,534,9,'Source'),(345,227,10,'Assignee'),(13,10,11,'Assignee'),(60,40,11,'Target'),(686,469,11,'Source'),(716,499,11,'Source'),(443,291,12,'Target'),(469,311,12,'Target'),(497,331,12,'Target'),(550,368,12,'Target'),(747,530,12,'Source'),(239,155,13,'Assignee'),(441,290,13,'Assignee'),(693,476,13,'Source'),(723,506,13,'Source'),(41,27,14,'Target'),(477,317,14,'Target'),(750,533,14,'Source'),(196,126,15,'Assignee'),(403,267,15,'Assignee'),(474,315,15,'Target'),(16,12,16,'Assignee'),(137,87,16,'Target'),(672,455,16,'Source'),(11,9,17,'Assignee'),(347,228,17,'Assignee'),(221,144,18,'Assignee'),(371,246,18,'Assignee'),(417,275,18,'Target'),(758,541,18,'Source'),(125,80,19,'Assignee'),(673,456,19,'Source'),(8,7,20,'Target'),(111,71,20,'Target'),(295,192,20,'Target'),(271,176,21,'Target'),(409,270,21,'Target'),(94,61,22,'Assignee'),(176,113,22,'Assignee'),(530,355,22,'Target'),(590,399,22,'Target'),(209,137,23,'Assignee'),(432,285,24,'Target'),(226,147,25,'Target'),(588,398,25,'Assignee'),(783,566,25,'Source'),(331,217,26,'Assignee'),(385,255,26,'Assignee'),(103,66,27,'Assignee'),(192,124,27,'Target'),(400,265,27,'Target'),(97,63,28,'Assignee'),(785,568,28,'Source'),(415,274,29,'Target'),(333,218,30,'Assignee'),(20,14,31,'Target'),(293,191,31,'Target'),(635,427,31,'Assignee'),(172,111,32,'Target'),(250,162,32,'Assignee'),(679,462,32,'Source'),(680,463,32,'Source'),(145,92,33,'Assignee'),(213,139,33,'Target'),(486,323,33,'Assignee'),(606,410,33,'Target'),(609,412,33,'Target'),(676,459,34,'Source'),(763,546,34,'Source'),(101,65,35,'Assignee'),(167,108,36,'Target'),(242,157,36,'Assignee'),(325,212,36,'Target'),(73,48,37,'Target'),(312,203,37,'Target'),(411,271,37,'Target'),(615,415,37,'Assignee'),(595,403,38,'Target'),(52,34,39,'Assignee'),(489,325,39,'Target'),(514,342,39,'Assignee'),(340,223,42,'Target'),(434,286,42,'Target'),(508,339,42,'Target'),(613,414,42,'Assignee'),(632,425,42,'Target'),(248,161,43,'Assignee'),(646,435,43,'Target'),(678,461,43,'Source'),(39,26,44,'Target'),(426,281,44,'Target'),(504,336,44,'Target'),(149,95,45,'Assignee'),(405,268,46,'Target'),(707,490,47,'Source'),(737,520,47,'Source'),(744,527,47,'Source'),(525,351,48,'Assignee'),(535,358,48,'Target'),(638,429,48,'Target'),(689,472,48,'Source'),(719,502,48,'Source'),(379,251,49,'Assignee'),(777,560,49,'Source'),(310,202,50,'Assignee'),(446,293,50,'Target'),(455,301,50,'Target'),(539,361,50,'Target'),(649,437,50,'Target'),(22,15,51,'Target'),(194,125,51,'Assignee'),(30,21,52,'Target'),(119,76,52,'Assignee'),(682,465,52,'Source'),(712,495,52,'Source'),(117,75,53,'Assignee'),(315,205,53,'Assignee'),(460,305,53,'Target'),(628,423,53,'Assignee'),(658,443,53,'Assignee'),(165,107,54,'Assignee'),(189,122,54,'Assignee'),(369,245,54,'Target'),(84,55,55,'Assignee'),(283,184,55,'Target'),(575,390,55,'Assignee'),(542,363,56,'Assignee'),(70,46,57,'Assignee'),(18,13,58,'Assignee'),(255,165,58,'Target'),(611,413,58,'Assignee'),(280,182,59,'Target'),(655,441,60,'Assignee'),(63,42,61,'Assignee'),(174,112,61,'Assignee'),(218,142,61,'Target'),(391,259,62,'Assignee'),(749,532,62,'Source'),(106,68,64,'Target'),(139,88,64,'Assignee'),(546,365,64,'Assignee'),(768,551,64,'Source'),(123,79,65,'Assignee'),(178,114,66,'Assignee'),(619,417,66,'Assignee'),(79,52,67,'Target'),(237,154,67,'Assignee'),(684,467,67,'Source'),(714,497,67,'Source'),(407,269,68,'Target'),(759,542,68,'Source'),(423,279,70,'Assignee'),(564,380,70,'Target'),(677,460,71,'Source'),(224,146,72,'Target'),(463,307,72,'Target'),(360,239,73,'Target'),(770,553,73,'Source'),(134,85,74,'Target'),(303,198,74,'Target'),(773,556,74,'Source'),(65,43,75,'Target'),(113,72,75,'Target'),(128,82,75,'Target'),(257,166,75,'Assignee'),(215,140,76,'Target'),(232,151,76,'Source'),(233,152,76,'Source'),(235,153,76,'Source'),(236,154,76,'Source'),(238,155,76,'Source'),(240,156,76,'Source'),(241,157,76,'Source'),(243,158,76,'Source'),(245,159,76,'Source'),(246,160,76,'Source'),(247,161,76,'Source'),(249,162,76,'Source'),(251,163,76,'Source'),(253,164,76,'Source'),(254,165,76,'Source'),(256,166,76,'Source'),(258,167,76,'Source'),(259,168,76,'Source'),(260,169,76,'Source'),(261,170,76,'Source'),(262,171,76,'Source'),(264,172,76,'Source'),(265,173,76,'Source'),(266,174,76,'Source'),(268,175,76,'Source'),(270,176,76,'Source'),(272,177,76,'Source'),(274,178,76,'Source'),(275,179,76,'Source'),(277,180,76,'Source'),(278,181,76,'Source'),(279,182,76,'Source'),(281,183,76,'Source'),(282,184,76,'Source'),(284,185,76,'Source'),(286,186,76,'Source'),(287,187,76,'Source'),(288,188,76,'Source'),(289,189,76,'Source'),(290,190,76,'Source'),(292,191,76,'Source'),(294,192,76,'Source'),(296,193,76,'Source'),(297,194,76,'Source'),(298,195,76,'Source'),(300,196,76,'Source'),(301,197,76,'Source'),(302,198,76,'Source'),(304,199,76,'Source'),(306,200,76,'Source'),(308,201,76,'Source'),(309,202,76,'Source'),(311,203,76,'Source'),(313,204,76,'Source'),(314,205,76,'Source'),(316,206,76,'Source'),(317,207,76,'Source'),(318,208,76,'Source'),(319,209,76,'Source'),(321,210,76,'Source'),(323,211,76,'Source'),(324,212,76,'Source'),(326,213,76,'Source'),(327,214,76,'Source'),(328,215,76,'Source'),(329,216,76,'Source'),(330,217,76,'Source'),(332,218,76,'Source'),(334,219,76,'Source'),(335,220,76,'Source'),(337,221,76,'Source'),(338,222,76,'Source'),(339,223,76,'Source'),(341,224,76,'Source'),(342,225,76,'Source'),(343,226,76,'Source'),(344,227,76,'Source'),(346,228,76,'Source'),(348,229,76,'Source'),(349,230,76,'Source'),(350,231,76,'Source'),(351,232,76,'Source'),(352,233,76,'Source'),(353,234,76,'Source'),(355,235,76,'Source'),(356,236,76,'Source'),(357,237,76,'Source'),(358,238,76,'Source'),(359,239,76,'Source'),(361,240,76,'Source'),(362,241,76,'Source'),(363,242,76,'Source'),(365,243,76,'Source'),(367,244,76,'Source'),(368,245,76,'Source'),(370,246,76,'Source'),(372,247,76,'Source'),(373,248,76,'Source'),(375,249,76,'Source'),(376,250,76,'Source'),(378,251,76,'Source'),(380,252,76,'Source'),(381,253,76,'Source'),(383,254,76,'Source'),(384,255,76,'Source'),(386,256,76,'Source'),(388,257,76,'Source'),(389,258,76,'Source'),(390,259,76,'Source'),(392,260,76,'Source'),(394,261,76,'Source'),(395,262,76,'Source'),(396,263,76,'Source'),(398,264,76,'Source'),(399,265,76,'Source'),(401,266,76,'Source'),(402,267,76,'Source'),(404,268,76,'Source'),(406,269,76,'Source'),(408,270,76,'Source'),(410,271,76,'Source'),(412,272,76,'Source'),(413,273,76,'Source'),(414,274,76,'Source'),(416,275,76,'Source'),(418,276,76,'Source'),(419,277,76,'Source'),(420,278,76,'Source'),(422,279,76,'Source'),(424,280,76,'Source'),(425,281,76,'Source'),(427,282,76,'Source'),(429,283,76,'Source'),(430,284,76,'Source'),(431,285,76,'Source'),(433,286,76,'Source'),(435,287,76,'Source'),(436,288,76,'Source'),(438,289,76,'Source'),(439,289,76,'Target'),(440,290,76,'Source'),(442,291,76,'Source'),(444,292,76,'Source'),(445,293,76,'Source'),(447,294,76,'Source'),(448,295,76,'Source'),(449,296,76,'Source'),(450,297,76,'Source'),(451,298,76,'Source'),(452,299,76,'Source'),(453,300,76,'Source'),(664,447,76,'Target'),(27,19,78,'Assignee'),(305,199,78,'Assignee'),(479,318,78,'Assignee'),(700,483,78,'Source'),(730,513,78,'Source'),(584,396,79,'Assignee'),(604,409,79,'Assignee'),(685,468,79,'Source'),(715,498,79,'Source'),(68,45,80,'Assignee'),(336,220,80,'Target'),(483,321,80,'Assignee'),(109,70,81,'Target'),(157,101,81,'Target'),(495,330,81,'Target'),(35,24,82,'Assignee'),(674,457,82,'Source'),(698,481,82,'Source'),(728,511,82,'Source'),(159,102,83,'Assignee'),(320,209,83,'Assignee'),(742,525,83,'Source'),(581,394,84,'Target'),(211,138,85,'Target'),(544,364,86,'Assignee'),(767,550,86,'Source'),(273,177,87,'Target'),(421,278,87,'Assignee'),(43,28,88,'Assignee'),(183,118,88,'Assignee'),(366,243,88,'Assignee'),(517,344,88,'Target'),(82,54,89,'Assignee'),(143,91,89,'Assignee'),(512,341,89,'Assignee'),(577,391,89,'Assignee'),(374,248,90,'Assignee'),(393,260,90,'Target'),(130,83,91,'Assignee'),(230,149,91,'Assignee'),(510,340,91,'Assignee'),(710,493,91,'Source'),(740,523,91,'Source'),(267,174,92,'Target'),(377,250,92,'Assignee'),(465,308,92,'Assignee'),(675,458,92,'Source'),(285,185,93,'Target'),(322,210,93,'Assignee'),(586,397,93,'Assignee'),(617,416,93,'Assignee'),(626,422,93,'Target'),(690,473,93,'Source'),(720,503,93,'Source'),(387,256,94,'Assignee'),(397,263,94,'Target'),(622,419,94,'Target'),(630,424,94,'Target'),(276,179,95,'Assignee'),(533,357,96,'Assignee'),(558,375,96,'Assignee'),(154,99,97,'Assignee'),(597,404,97,'Assignee'),(602,408,97,'Target'),(46,30,98,'Target'),(244,158,98,'Assignee'),(652,439,98,'Assignee'),(772,555,98,'Source'),(37,25,99,'Assignee'),(76,50,99,'Assignee'),(88,57,99,'Assignee'),(307,200,99,'Assignee'),(382,253,99,'Target'),(86,56,100,'Assignee'),(354,234,100,'Assignee'),(641,431,100,'Target'),(692,475,100,'Source'),(722,505,100,'Source'),(754,537,100,'Source'),(500,333,101,'Target'),(687,470,107,'Source'),(717,500,107,'Source'),(786,569,108,'Source'),(699,482,112,'Source'),(729,512,112,'Source'),(697,480,113,'Source'),(727,510,113,'Source'),(788,571,114,'Source'),(745,528,115,'Source'),(755,538,116,'Source'),(782,565,122,'Source'),(775,558,131,'Source'),(702,485,133,'Source'),(732,515,133,'Source'),(764,547,136,'Source'),(760,543,139,'Source'),(694,477,140,'Source'),(724,507,140,'Source'),(752,535,141,'Source'),(688,471,142,'Source'),(718,501,142,'Source'),(701,484,143,'Source'),(731,514,143,'Source'),(781,564,143,'Source'),(691,474,151,'Source'),(721,504,151,'Source'),(704,487,152,'Source'),(734,517,152,'Source'),(789,572,152,'Source'),(709,492,153,'Source'),(739,522,153,'Source'),(771,554,154,'Source'),(708,491,155,'Source'),(738,521,155,'Source'),(756,539,157,'Source'),(753,536,158,'Source'),(784,567,159,'Source'),(774,557,161,'Source'),(761,544,162,'Source'),(703,486,164,'Source'),(733,516,164,'Source'),(1,1,166,'Source'),(2,2,166,'Source'),(3,3,166,'Source'),(4,4,166,'Source'),(5,5,166,'Source'),(6,6,166,'Source'),(7,7,166,'Source'),(9,8,166,'Source'),(10,9,166,'Source'),(12,10,166,'Source'),(14,11,166,'Source'),(15,12,166,'Source'),(17,13,166,'Source'),(19,14,166,'Source'),(21,15,166,'Source'),(23,16,166,'Source'),(24,17,166,'Source'),(25,18,166,'Source'),(26,19,166,'Source'),(28,20,166,'Source'),(29,21,166,'Source'),(31,22,166,'Source'),(32,23,166,'Source'),(34,24,166,'Source'),(36,25,166,'Source'),(38,26,166,'Source'),(40,27,166,'Source'),(42,28,166,'Source'),(44,29,166,'Source'),(45,30,166,'Source'),(47,31,166,'Source'),(48,32,166,'Source'),(50,33,166,'Source'),(51,34,166,'Source'),(53,35,166,'Source'),(54,36,166,'Source'),(56,37,166,'Source'),(57,38,166,'Source'),(58,39,166,'Source'),(59,40,166,'Source'),(61,41,166,'Source'),(62,42,166,'Source'),(64,43,166,'Source'),(66,44,166,'Source'),(67,45,166,'Source'),(69,46,166,'Source'),(71,47,166,'Source'),(72,48,166,'Source'),(74,49,166,'Source'),(75,50,166,'Source'),(77,51,166,'Source'),(78,52,166,'Source'),(80,53,166,'Source'),(81,54,166,'Source'),(83,55,166,'Source'),(85,56,166,'Source'),(87,57,166,'Source'),(89,58,166,'Source'),(90,59,166,'Source'),(91,60,166,'Source'),(93,61,166,'Source'),(95,62,166,'Source'),(96,63,166,'Source'),(98,64,166,'Source'),(100,65,166,'Source'),(102,66,166,'Source'),(104,67,166,'Source'),(105,68,166,'Source'),(107,69,166,'Source'),(108,70,166,'Source'),(110,71,166,'Source'),(112,72,166,'Source'),(114,73,166,'Source'),(115,74,166,'Source'),(116,75,166,'Source'),(118,76,166,'Source'),(120,77,166,'Source'),(121,78,166,'Source'),(122,79,166,'Source'),(124,80,166,'Source'),(126,81,166,'Source'),(127,82,166,'Source'),(129,83,166,'Source'),(131,84,166,'Source'),(133,85,166,'Source'),(135,86,166,'Source'),(136,87,166,'Source'),(138,88,166,'Source'),(140,89,166,'Source'),(141,90,166,'Source'),(142,91,166,'Source'),(144,92,166,'Source'),(146,93,166,'Source'),(147,94,166,'Source'),(148,95,166,'Source'),(150,96,166,'Source'),(151,97,166,'Source'),(152,98,166,'Source'),(153,99,166,'Source'),(155,100,166,'Source'),(156,101,166,'Source'),(158,102,166,'Source'),(160,103,166,'Source'),(161,104,166,'Source'),(162,105,166,'Source'),(163,106,166,'Source'),(164,107,166,'Source'),(166,108,166,'Source'),(168,109,166,'Source'),(169,110,166,'Source'),(171,111,166,'Source'),(173,112,166,'Source'),(175,113,166,'Source'),(177,114,166,'Source'),(179,115,166,'Source'),(180,116,166,'Source'),(181,117,166,'Source'),(182,118,166,'Source'),(184,119,166,'Source'),(185,120,166,'Source'),(186,121,166,'Source'),(188,122,166,'Source'),(190,123,166,'Source'),(191,124,166,'Source'),(193,125,166,'Source'),(195,126,166,'Source'),(197,127,166,'Source'),(198,128,166,'Source'),(199,129,166,'Source'),(200,130,166,'Source'),(201,131,166,'Source'),(202,132,166,'Source'),(204,133,166,'Source'),(205,134,166,'Source'),(206,135,166,'Source'),(207,136,166,'Source'),(208,137,166,'Source'),(210,138,166,'Source'),(212,139,166,'Source'),(214,140,166,'Source'),(216,141,166,'Source'),(217,142,166,'Source'),(219,143,166,'Source'),(220,144,166,'Source'),(222,145,166,'Source'),(223,146,166,'Source'),(225,147,166,'Source'),(227,148,166,'Source'),(229,149,166,'Source'),(231,150,166,'Source'),(776,559,167,'Source'),(696,479,172,'Source'),(726,509,172,'Source'),(780,563,172,'Source'),(706,489,181,'Source'),(736,519,181,'Source'),(743,526,182,'Source'),(766,549,183,'Source'),(762,545,184,'Source'),(454,301,187,'Source'),(456,302,187,'Source'),(457,303,187,'Source'),(458,304,187,'Source'),(459,305,187,'Source'),(461,306,187,'Source'),(462,307,187,'Source'),(464,308,187,'Source'),(466,309,187,'Source'),(467,310,187,'Source'),(468,311,187,'Source'),(470,312,187,'Source'),(471,313,187,'Source'),(472,314,187,'Source'),(473,315,187,'Source'),(475,316,187,'Source'),(476,317,187,'Source'),(478,318,187,'Source'),(480,319,187,'Source'),(481,320,187,'Source'),(482,321,187,'Source'),(484,322,187,'Source'),(485,323,187,'Source'),(487,324,187,'Source'),(488,325,187,'Source'),(490,326,187,'Source'),(491,327,187,'Source'),(492,328,187,'Source'),(493,329,187,'Source'),(494,330,187,'Source'),(496,331,187,'Source'),(498,332,187,'Source'),(499,333,187,'Source'),(501,334,187,'Source'),(502,335,187,'Source'),(503,336,187,'Source'),(505,337,187,'Source'),(506,338,187,'Source'),(507,339,187,'Source'),(509,340,187,'Source'),(511,341,187,'Source'),(513,342,187,'Source'),(515,343,187,'Source'),(516,344,187,'Source'),(518,345,187,'Source'),(519,346,187,'Source'),(520,347,187,'Source'),(521,348,187,'Source'),(522,349,187,'Source'),(523,350,187,'Source'),(524,351,187,'Source'),(526,352,187,'Source'),(527,353,187,'Source'),(528,354,187,'Source'),(529,355,187,'Source'),(531,356,187,'Source'),(532,357,187,'Source'),(534,358,187,'Source'),(536,359,187,'Source'),(537,360,187,'Source'),(538,361,187,'Source'),(540,362,187,'Source'),(541,363,187,'Source'),(543,364,187,'Source'),(545,365,187,'Source'),(547,366,187,'Source'),(548,367,187,'Source'),(549,368,187,'Source'),(551,369,187,'Source'),(552,370,187,'Source'),(553,371,187,'Source'),(554,372,187,'Source'),(555,373,187,'Source'),(556,374,187,'Source'),(557,375,187,'Source'),(559,376,187,'Source'),(560,377,187,'Source'),(561,378,187,'Source'),(562,379,187,'Source'),(563,380,187,'Source'),(565,381,187,'Source'),(566,382,187,'Source'),(567,383,187,'Source'),(568,384,187,'Source'),(569,385,187,'Source'),(570,386,187,'Source'),(571,387,187,'Source'),(572,388,187,'Source'),(573,389,187,'Source'),(574,390,187,'Source'),(576,391,187,'Source'),(578,392,187,'Source'),(579,393,187,'Source'),(580,394,187,'Source'),(582,395,187,'Source'),(583,396,187,'Source'),(585,397,187,'Source'),(587,398,187,'Source'),(589,399,187,'Source'),(591,400,187,'Source'),(592,401,187,'Source'),(593,402,187,'Source'),(594,403,187,'Source'),(596,404,187,'Source'),(598,405,187,'Source'),(599,406,187,'Source'),(600,407,187,'Source'),(601,408,187,'Source'),(603,409,187,'Source'),(605,410,187,'Source'),(607,411,187,'Source'),(608,412,187,'Source'),(610,413,187,'Source'),(612,414,187,'Source'),(614,415,187,'Source'),(616,416,187,'Source'),(618,417,187,'Source'),(620,418,187,'Source'),(621,419,187,'Source'),(623,420,187,'Source'),(624,421,187,'Source'),(625,422,187,'Source'),(627,423,187,'Source'),(629,424,187,'Source'),(631,425,187,'Source'),(633,426,187,'Source'),(634,427,187,'Source'),(636,428,187,'Source'),(637,429,187,'Source'),(639,430,187,'Source'),(640,431,187,'Source'),(642,432,187,'Source'),(643,433,187,'Source'),(644,434,187,'Source'),(645,435,187,'Source'),(647,436,187,'Source'),(648,437,187,'Source'),(650,438,187,'Source'),(651,439,187,'Source'),(653,440,187,'Source'),(654,441,187,'Source'),(656,442,187,'Source'),(657,443,187,'Source'),(659,444,187,'Source'),(660,445,187,'Source'),(662,446,187,'Source'),(663,447,187,'Source'),(665,448,187,'Source'),(666,449,187,'Source'),(667,450,187,'Source'),(683,466,187,'Source'),(713,496,187,'Source'),(695,478,190,'Source'),(725,508,190,'Source'),(787,570,190,'Source'),(791,574,191,'Source'),(705,488,193,'Source'),(735,518,193,'Source'),(748,531,193,'Source'),(757,540,194,'Source'),(746,529,197,'Source'),(778,561,198,'Source'),(765,548,201,'Source'); +INSERT INTO `civicrm_activity_contact` (`id`, `activity_id`, `contact_id`, `record_type_id`) VALUES (269,175,1,3),(49,32,2,3),(132,84,2,3),(299,195,2,3),(668,451,2,2),(263,171,3,1),(428,282,4,1),(669,452,4,2),(681,464,4,2),(711,494,4,2),(364,242,5,3),(661,445,5,3),(779,562,5,2),(55,36,6,1),(92,60,6,3),(670,453,6,2),(252,163,7,1),(790,573,7,2),(228,148,8,1),(291,190,8,1),(437,288,8,1),(671,454,8,2),(769,552,8,2),(33,23,9,1),(99,64,9,1),(170,110,9,3),(187,121,9,3),(203,132,9,1),(234,152,9,3),(751,534,9,2),(345,227,10,1),(13,10,11,1),(60,40,11,3),(686,469,11,2),(716,499,11,2),(443,291,12,3),(469,311,12,3),(497,331,12,3),(550,368,12,3),(747,530,12,2),(239,155,13,1),(441,290,13,1),(693,476,13,2),(723,506,13,2),(41,27,14,3),(477,317,14,3),(750,533,14,2),(196,126,15,1),(403,267,15,1),(474,315,15,3),(16,12,16,1),(137,87,16,3),(672,455,16,2),(11,9,17,1),(347,228,17,1),(221,144,18,1),(371,246,18,1),(417,275,18,3),(758,541,18,2),(125,80,19,1),(673,456,19,2),(8,7,20,3),(111,71,20,3),(295,192,20,3),(271,176,21,3),(409,270,21,3),(94,61,22,1),(176,113,22,1),(530,355,22,3),(590,399,22,3),(209,137,23,1),(432,285,24,3),(226,147,25,3),(588,398,25,1),(783,566,25,2),(331,217,26,1),(385,255,26,1),(103,66,27,1),(192,124,27,3),(400,265,27,3),(97,63,28,1),(785,568,28,2),(415,274,29,3),(333,218,30,1),(20,14,31,3),(293,191,31,3),(635,427,31,1),(172,111,32,3),(250,162,32,1),(679,462,32,2),(680,463,32,2),(145,92,33,1),(213,139,33,3),(486,323,33,1),(606,410,33,3),(609,412,33,3),(676,459,34,2),(763,546,34,2),(101,65,35,1),(167,108,36,3),(242,157,36,1),(325,212,36,3),(73,48,37,3),(312,203,37,3),(411,271,37,3),(615,415,37,1),(595,403,38,3),(52,34,39,1),(489,325,39,3),(514,342,39,1),(340,223,42,3),(434,286,42,3),(508,339,42,3),(613,414,42,1),(632,425,42,3),(248,161,43,1),(646,435,43,3),(678,461,43,2),(39,26,44,3),(426,281,44,3),(504,336,44,3),(149,95,45,1),(405,268,46,3),(707,490,47,2),(737,520,47,2),(744,527,47,2),(525,351,48,1),(535,358,48,3),(638,429,48,3),(689,472,48,2),(719,502,48,2),(379,251,49,1),(777,560,49,2),(310,202,50,1),(446,293,50,3),(455,301,50,3),(539,361,50,3),(649,437,50,3),(22,15,51,3),(194,125,51,1),(30,21,52,3),(119,76,52,1),(682,465,52,2),(712,495,52,2),(117,75,53,1),(315,205,53,1),(460,305,53,3),(628,423,53,1),(658,443,53,1),(165,107,54,1),(189,122,54,1),(369,245,54,3),(84,55,55,1),(283,184,55,3),(575,390,55,1),(542,363,56,1),(70,46,57,1),(18,13,58,1),(255,165,58,3),(611,413,58,1),(280,182,59,3),(655,441,60,1),(63,42,61,1),(174,112,61,1),(218,142,61,3),(391,259,62,1),(749,532,62,2),(106,68,64,3),(139,88,64,1),(546,365,64,1),(768,551,64,2),(123,79,65,1),(178,114,66,1),(619,417,66,1),(79,52,67,3),(237,154,67,1),(684,467,67,2),(714,497,67,2),(407,269,68,3),(759,542,68,2),(423,279,70,1),(564,380,70,3),(677,460,71,2),(224,146,72,3),(463,307,72,3),(360,239,73,3),(770,553,73,2),(134,85,74,3),(303,198,74,3),(773,556,74,2),(65,43,75,3),(113,72,75,3),(128,82,75,3),(257,166,75,1),(215,140,76,3),(232,151,76,2),(233,152,76,2),(235,153,76,2),(236,154,76,2),(238,155,76,2),(240,156,76,2),(241,157,76,2),(243,158,76,2),(245,159,76,2),(246,160,76,2),(247,161,76,2),(249,162,76,2),(251,163,76,2),(253,164,76,2),(254,165,76,2),(256,166,76,2),(258,167,76,2),(259,168,76,2),(260,169,76,2),(261,170,76,2),(262,171,76,2),(264,172,76,2),(265,173,76,2),(266,174,76,2),(268,175,76,2),(270,176,76,2),(272,177,76,2),(274,178,76,2),(275,179,76,2),(277,180,76,2),(278,181,76,2),(279,182,76,2),(281,183,76,2),(282,184,76,2),(284,185,76,2),(286,186,76,2),(287,187,76,2),(288,188,76,2),(289,189,76,2),(290,190,76,2),(292,191,76,2),(294,192,76,2),(296,193,76,2),(297,194,76,2),(298,195,76,2),(300,196,76,2),(301,197,76,2),(302,198,76,2),(304,199,76,2),(306,200,76,2),(308,201,76,2),(309,202,76,2),(311,203,76,2),(313,204,76,2),(314,205,76,2),(316,206,76,2),(317,207,76,2),(318,208,76,2),(319,209,76,2),(321,210,76,2),(323,211,76,2),(324,212,76,2),(326,213,76,2),(327,214,76,2),(328,215,76,2),(329,216,76,2),(330,217,76,2),(332,218,76,2),(334,219,76,2),(335,220,76,2),(337,221,76,2),(338,222,76,2),(339,223,76,2),(341,224,76,2),(342,225,76,2),(343,226,76,2),(344,227,76,2),(346,228,76,2),(348,229,76,2),(349,230,76,2),(350,231,76,2),(351,232,76,2),(352,233,76,2),(353,234,76,2),(355,235,76,2),(356,236,76,2),(357,237,76,2),(358,238,76,2),(359,239,76,2),(361,240,76,2),(362,241,76,2),(363,242,76,2),(365,243,76,2),(367,244,76,2),(368,245,76,2),(370,246,76,2),(372,247,76,2),(373,248,76,2),(375,249,76,2),(376,250,76,2),(378,251,76,2),(380,252,76,2),(381,253,76,2),(383,254,76,2),(384,255,76,2),(386,256,76,2),(388,257,76,2),(389,258,76,2),(390,259,76,2),(392,260,76,2),(394,261,76,2),(395,262,76,2),(396,263,76,2),(398,264,76,2),(399,265,76,2),(401,266,76,2),(402,267,76,2),(404,268,76,2),(406,269,76,2),(408,270,76,2),(410,271,76,2),(412,272,76,2),(413,273,76,2),(414,274,76,2),(416,275,76,2),(418,276,76,2),(419,277,76,2),(420,278,76,2),(422,279,76,2),(424,280,76,2),(425,281,76,2),(427,282,76,2),(429,283,76,2),(430,284,76,2),(431,285,76,2),(433,286,76,2),(435,287,76,2),(436,288,76,2),(438,289,76,2),(439,289,76,3),(440,290,76,2),(442,291,76,2),(444,292,76,2),(445,293,76,2),(447,294,76,2),(448,295,76,2),(449,296,76,2),(450,297,76,2),(451,298,76,2),(452,299,76,2),(453,300,76,2),(664,447,76,3),(27,19,78,1),(305,199,78,1),(479,318,78,1),(700,483,78,2),(730,513,78,2),(584,396,79,1),(604,409,79,1),(685,468,79,2),(715,498,79,2),(68,45,80,1),(336,220,80,3),(483,321,80,1),(109,70,81,3),(157,101,81,3),(495,330,81,3),(35,24,82,1),(674,457,82,2),(698,481,82,2),(728,511,82,2),(159,102,83,1),(320,209,83,1),(742,525,83,2),(581,394,84,3),(211,138,85,3),(544,364,86,1),(767,550,86,2),(273,177,87,3),(421,278,87,1),(43,28,88,1),(183,118,88,1),(366,243,88,1),(517,344,88,3),(82,54,89,1),(143,91,89,1),(512,341,89,1),(577,391,89,1),(374,248,90,1),(393,260,90,3),(130,83,91,1),(230,149,91,1),(510,340,91,1),(710,493,91,2),(740,523,91,2),(267,174,92,3),(377,250,92,1),(465,308,92,1),(675,458,92,2),(285,185,93,3),(322,210,93,1),(586,397,93,1),(617,416,93,1),(626,422,93,3),(690,473,93,2),(720,503,93,2),(387,256,94,1),(397,263,94,3),(622,419,94,3),(630,424,94,3),(276,179,95,1),(533,357,96,1),(558,375,96,1),(154,99,97,1),(597,404,97,1),(602,408,97,3),(46,30,98,3),(244,158,98,1),(652,439,98,1),(772,555,98,2),(37,25,99,1),(76,50,99,1),(88,57,99,1),(307,200,99,1),(382,253,99,3),(86,56,100,1),(354,234,100,1),(641,431,100,3),(692,475,100,2),(722,505,100,2),(754,537,100,2),(500,333,101,3),(687,470,107,2),(717,500,107,2),(786,569,108,2),(699,482,112,2),(729,512,112,2),(697,480,113,2),(727,510,113,2),(788,571,114,2),(745,528,115,2),(755,538,116,2),(782,565,122,2),(775,558,131,2),(702,485,133,2),(732,515,133,2),(764,547,136,2),(760,543,139,2),(694,477,140,2),(724,507,140,2),(752,535,141,2),(688,471,142,2),(718,501,142,2),(701,484,143,2),(731,514,143,2),(781,564,143,2),(691,474,151,2),(721,504,151,2),(704,487,152,2),(734,517,152,2),(789,572,152,2),(709,492,153,2),(739,522,153,2),(771,554,154,2),(708,491,155,2),(738,521,155,2),(756,539,157,2),(753,536,158,2),(784,567,159,2),(774,557,161,2),(761,544,162,2),(703,486,164,2),(733,516,164,2),(1,1,166,2),(2,2,166,2),(3,3,166,2),(4,4,166,2),(5,5,166,2),(6,6,166,2),(7,7,166,2),(9,8,166,2),(10,9,166,2),(12,10,166,2),(14,11,166,2),(15,12,166,2),(17,13,166,2),(19,14,166,2),(21,15,166,2),(23,16,166,2),(24,17,166,2),(25,18,166,2),(26,19,166,2),(28,20,166,2),(29,21,166,2),(31,22,166,2),(32,23,166,2),(34,24,166,2),(36,25,166,2),(38,26,166,2),(40,27,166,2),(42,28,166,2),(44,29,166,2),(45,30,166,2),(47,31,166,2),(48,32,166,2),(50,33,166,2),(51,34,166,2),(53,35,166,2),(54,36,166,2),(56,37,166,2),(57,38,166,2),(58,39,166,2),(59,40,166,2),(61,41,166,2),(62,42,166,2),(64,43,166,2),(66,44,166,2),(67,45,166,2),(69,46,166,2),(71,47,166,2),(72,48,166,2),(74,49,166,2),(75,50,166,2),(77,51,166,2),(78,52,166,2),(80,53,166,2),(81,54,166,2),(83,55,166,2),(85,56,166,2),(87,57,166,2),(89,58,166,2),(90,59,166,2),(91,60,166,2),(93,61,166,2),(95,62,166,2),(96,63,166,2),(98,64,166,2),(100,65,166,2),(102,66,166,2),(104,67,166,2),(105,68,166,2),(107,69,166,2),(108,70,166,2),(110,71,166,2),(112,72,166,2),(114,73,166,2),(115,74,166,2),(116,75,166,2),(118,76,166,2),(120,77,166,2),(121,78,166,2),(122,79,166,2),(124,80,166,2),(126,81,166,2),(127,82,166,2),(129,83,166,2),(131,84,166,2),(133,85,166,2),(135,86,166,2),(136,87,166,2),(138,88,166,2),(140,89,166,2),(141,90,166,2),(142,91,166,2),(144,92,166,2),(146,93,166,2),(147,94,166,2),(148,95,166,2),(150,96,166,2),(151,97,166,2),(152,98,166,2),(153,99,166,2),(155,100,166,2),(156,101,166,2),(158,102,166,2),(160,103,166,2),(161,104,166,2),(162,105,166,2),(163,106,166,2),(164,107,166,2),(166,108,166,2),(168,109,166,2),(169,110,166,2),(171,111,166,2),(173,112,166,2),(175,113,166,2),(177,114,166,2),(179,115,166,2),(180,116,166,2),(181,117,166,2),(182,118,166,2),(184,119,166,2),(185,120,166,2),(186,121,166,2),(188,122,166,2),(190,123,166,2),(191,124,166,2),(193,125,166,2),(195,126,166,2),(197,127,166,2),(198,128,166,2),(199,129,166,2),(200,130,166,2),(201,131,166,2),(202,132,166,2),(204,133,166,2),(205,134,166,2),(206,135,166,2),(207,136,166,2),(208,137,166,2),(210,138,166,2),(212,139,166,2),(214,140,166,2),(216,141,166,2),(217,142,166,2),(219,143,166,2),(220,144,166,2),(222,145,166,2),(223,146,166,2),(225,147,166,2),(227,148,166,2),(229,149,166,2),(231,150,166,2),(776,559,167,2),(696,479,172,2),(726,509,172,2),(780,563,172,2),(706,489,181,2),(736,519,181,2),(743,526,182,2),(766,549,183,2),(762,545,184,2),(454,301,187,2),(456,302,187,2),(457,303,187,2),(458,304,187,2),(459,305,187,2),(461,306,187,2),(462,307,187,2),(464,308,187,2),(466,309,187,2),(467,310,187,2),(468,311,187,2),(470,312,187,2),(471,313,187,2),(472,314,187,2),(473,315,187,2),(475,316,187,2),(476,317,187,2),(478,318,187,2),(480,319,187,2),(481,320,187,2),(482,321,187,2),(484,322,187,2),(485,323,187,2),(487,324,187,2),(488,325,187,2),(490,326,187,2),(491,327,187,2),(492,328,187,2),(493,329,187,2),(494,330,187,2),(496,331,187,2),(498,332,187,2),(499,333,187,2),(501,334,187,2),(502,335,187,2),(503,336,187,2),(505,337,187,2),(506,338,187,2),(507,339,187,2),(509,340,187,2),(511,341,187,2),(513,342,187,2),(515,343,187,2),(516,344,187,2),(518,345,187,2),(519,346,187,2),(520,347,187,2),(521,348,187,2),(522,349,187,2),(523,350,187,2),(524,351,187,2),(526,352,187,2),(527,353,187,2),(528,354,187,2),(529,355,187,2),(531,356,187,2),(532,357,187,2),(534,358,187,2),(536,359,187,2),(537,360,187,2),(538,361,187,2),(540,362,187,2),(541,363,187,2),(543,364,187,2),(545,365,187,2),(547,366,187,2),(548,367,187,2),(549,368,187,2),(551,369,187,2),(552,370,187,2),(553,371,187,2),(554,372,187,2),(555,373,187,2),(556,374,187,2),(557,375,187,2),(559,376,187,2),(560,377,187,2),(561,378,187,2),(562,379,187,2),(563,380,187,2),(565,381,187,2),(566,382,187,2),(567,383,187,2),(568,384,187,2),(569,385,187,2),(570,386,187,2),(571,387,187,2),(572,388,187,2),(573,389,187,2),(574,390,187,2),(576,391,187,2),(578,392,187,2),(579,393,187,2),(580,394,187,2),(582,395,187,2),(583,396,187,2),(585,397,187,2),(587,398,187,2),(589,399,187,2),(591,400,187,2),(592,401,187,2),(593,402,187,2),(594,403,187,2),(596,404,187,2),(598,405,187,2),(599,406,187,2),(600,407,187,2),(601,408,187,2),(603,409,187,2),(605,410,187,2),(607,411,187,2),(608,412,187,2),(610,413,187,2),(612,414,187,2),(614,415,187,2),(616,416,187,2),(618,417,187,2),(620,418,187,2),(621,419,187,2),(623,420,187,2),(624,421,187,2),(625,422,187,2),(627,423,187,2),(629,424,187,2),(631,425,187,2),(633,426,187,2),(634,427,187,2),(636,428,187,2),(637,429,187,2),(639,430,187,2),(640,431,187,2),(642,432,187,2),(643,433,187,2),(644,434,187,2),(645,435,187,2),(647,436,187,2),(648,437,187,2),(650,438,187,2),(651,439,187,2),(653,440,187,2),(654,441,187,2),(656,442,187,2),(657,443,187,2),(659,444,187,2),(660,445,187,2),(662,446,187,2),(663,447,187,2),(665,448,187,2),(666,449,187,2),(667,450,187,2),(683,466,187,2),(713,496,187,2),(695,478,190,2),(725,508,190,2),(787,570,190,2),(791,574,191,2),(705,488,193,2),(735,518,193,2),(748,531,193,2),(757,540,194,2),(746,529,197,2),(778,561,198,2),(765,548,201,2); /*!40000 ALTER TABLE `civicrm_activity_contact` ENABLE KEYS */; UNLOCK TABLES; @@ -1366,7 +1366,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_uf_field` WRITE; /*!40000 ALTER TABLE `civicrm_uf_field` DISABLE KEYS */; -INSERT INTO `civicrm_uf_field` (`id`, `uf_group_id`, `field_name`, `is_active`, `is_view`, `is_required`, `weight`, `help_post`, `help_pre`, `visibility`, `in_selector`, `is_searchable`, `location_type_id`, `phone_type_id`, `label`, `field_type`, `is_reserved`, `is_multi_summary`) VALUES (1,1,'first_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'First Name','Individual',0,0),(2,1,'last_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Last Name','Individual',0,0),(3,1,'street_address',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Street Address (Home)','Contact',0,0),(4,1,'city',1,0,0,4,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'City (Home)','Contact',0,0),(5,1,'postal_code',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Postal Code (Home)','Contact',0,0),(6,1,'country',1,0,0,6,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Country (Home)','Contact',0,0),(7,1,'state_province',1,0,0,7,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'State (Home)','Contact',0,0),(8,2,'first_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'First Name','Individual',0,0),(9,2,'last_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Last Name','Individual',0,0),(10,2,'email',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(11,3,'participant_status',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Participant Status','Participant',1,0),(12,4,'first_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'First Name','Individual',0,0),(13,4,'last_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Last Name','Individual',0,0),(14,4,'email',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(15,5,'organization_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Organization Name','Organization',0,0),(16,5,'email',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(17,6,'household_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Household Name','Household',0,0),(18,6,'email',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(19,7,'phone',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,1,1,'Home Phone','Contact',0,0),(20,7,'phone',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,1,2,'Home Mobile','Contact',0,0),(21,7,'street_address',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Primary Address','Contact',0,0),(22,7,'city',1,0,1,4,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'City','Contact',0,0),(23,7,'state_province',1,0,1,5,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'State','Contact',0,0),(24,7,'postal_code',1,0,1,6,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Postal Code','Contact',0,0),(25,7,'email',1,0,1,7,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Primary Email','Contact',0,0),(26,7,'group',1,0,1,8,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Groups','Contact',0,0),(27,7,'tag',1,0,1,9,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Tags','Contact',0,0),(28,7,'gender',1,0,1,10,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Gender','Individual',0,0),(29,7,'birth_date',1,0,1,11,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Date of Birth','Individual',0,0),(30,8,'street_address',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Street Address (Home)','Contact',1,0),(31,8,'city',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'City (Home)','Contact',1,0),(32,8,'postal_code',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Postal Code (Home)','Contact',0,0),(33,8,'country',1,0,0,4,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Country (Home)','Contact',0,0),(34,8,'state_province',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'State (Home)','Contact',0,0),(35,9,'organization_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Organization Name','Organization',0,0),(36,9,'phone',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,3,1,'Phone (Main) ','Contact',0,0),(37,9,'email',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Email (Main) ','Contact',0,0),(38,9,'street_address',1,0,1,4,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Street Address','Contact',0,0),(39,9,'city',1,0,1,5,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'City','Contact',0,0),(40,9,'postal_code',1,0,1,6,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Postal Code','Contact',0,0),(41,9,'country',1,0,1,7,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Country','Contact',0,0),(42,9,'state_province',1,0,1,8,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'State / Province','Contact',0,0),(43,10,'financial_type',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Type','Contribution',1,0),(44,10,'total_amount',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Amount','Contribution',1,0),(45,10,'contribution_status_id',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Status','Contribution',1,0),(46,10,'receive_date',1,0,1,4,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Received','Contribution',1,0),(47,10,'contribution_source',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Source','Contribution',0,0),(48,10,'payment_instrument',1,0,0,6,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Paid By','Contribution',0,0),(49,10,'check_number',1,0,0,7,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Check Number','Contribution',0,0),(50,10,'send_receipt',1,0,0,8,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Send Receipt','Contribution',0,0),(51,10,'invoice_id',1,0,0,9,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Invoice ID','Contribution',0,0),(52,11,'membership_type',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Type','Membership',1,0),(53,11,'join_date',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Member Since','Membership',1,0),(54,11,'membership_start_date',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Start Date','Membership',1,0),(55,11,'membership_end_date',1,0,0,4,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'End Date','Membership',1,0),(56,11,'membership_source',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Source','Membership',0,0),(57,11,'send_receipt',1,0,0,6,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Send Receipt','Membership',0,0),(58,11,'financial_type',1,0,1,7,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Financial Type','Membership',1,0),(59,11,'total_amount',1,0,1,8,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Amount','Membership',1,0),(60,11,'receive_date',1,0,1,9,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Received','Membership',1,0),(61,11,'payment_instrument',1,0,0,10,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Paid By','Membership',0,0),(62,11,'check_number',1,0,0,11,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Check Number','Membership',0,0),(63,11,'contribution_status_id',1,0,1,12,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Payment Status','Membership',1,0),(64,12,'email',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0); +INSERT INTO `civicrm_uf_field` (`id`, `uf_group_id`, `field_name`, `is_active`, `is_view`, `is_required`, `weight`, `help_post`, `help_pre`, `visibility`, `in_selector`, `is_searchable`, `location_type_id`, `phone_type_id`, `label`, `field_type`, `is_reserved`, `is_multi_summary`) VALUES (1,1,'first_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'First Name','Individual',0,0),(2,1,'last_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Last Name','Individual',0,0),(3,1,'street_address',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Street Address (Home)','Contact',0,0),(4,1,'city',1,0,0,4,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'City (Home)','Contact',0,0),(5,1,'postal_code',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Postal Code (Home)','Contact',0,0),(6,1,'country',1,0,0,6,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Country (Home)','Contact',0,0),(7,1,'state_province',1,0,0,7,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'State (Home)','Contact',0,0),(8,2,'first_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'First Name','Individual',0,0),(9,2,'last_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Last Name','Individual',0,0),(10,2,'email',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(11,3,'participant_status',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Participant Status','Participant',1,0),(12,4,'first_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'First Name','Individual',0,0),(13,4,'last_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Last Name','Individual',0,0),(14,4,'email',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(15,5,'organization_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Organization Name','Organization',0,0),(16,5,'email',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(17,6,'household_name',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Household Name','Household',0,0),(18,6,'email',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0),(19,7,'phone',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,1,1,'Home Phone','Contact',0,0),(20,7,'phone',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,1,2,'Home Mobile','Contact',0,0),(21,7,'street_address',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Primary Address','Contact',0,0),(22,7,'city',1,0,1,4,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'City','Contact',0,0),(23,7,'state_province',1,0,1,5,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'State','Contact',0,0),(24,7,'postal_code',1,0,1,6,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Postal Code','Contact',0,0),(25,7,'email',1,0,1,7,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Primary Email','Contact',0,0),(26,7,'group',1,0,1,8,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Groups','Contact',0,0),(27,7,'tag',1,0,1,9,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Tags','Contact',0,0),(28,7,'gender',1,0,1,10,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Gender','Individual',0,0),(29,7,'birth_date',1,0,1,11,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Date of Birth','Individual',0,0),(30,8,'street_address',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Street Address (Home)','Contact',1,0),(31,8,'city',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'City (Home)','Contact',1,0),(32,8,'postal_code',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Postal Code (Home)','Contact',0,0),(33,8,'country',1,0,0,4,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'Country (Home)','Contact',0,0),(34,8,'state_province',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,1,NULL,'State (Home)','Contact',0,0),(35,9,'organization_name',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Organization Name','Organization',0,0),(36,9,'phone',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,3,1,'Phone (Main) ','Contact',0,0),(37,9,'email',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Email (Main) ','Contact',0,0),(38,9,'street_address',1,0,1,4,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Street Address','Contact',0,0),(39,9,'city',1,0,1,5,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'City','Contact',0,0),(40,9,'postal_code',1,0,1,6,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Postal Code','Contact',0,0),(41,9,'country',1,0,1,7,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'Country','Contact',0,0),(42,9,'state_province',1,0,1,8,NULL,NULL,'User and User Admin Only',0,0,3,NULL,'State / Province','Contact',0,0),(43,10,'financial_type',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Type','Contribution',1,0),(44,10,'total_amount',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Amount','Contribution',1,0),(45,10,'contribution_status_id',1,0,1,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Status','Contribution',1,0),(46,10,'receive_date',1,0,1,4,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Received','Contribution',1,0),(47,10,'contribution_source',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,2,'Contribution',0,0),(48,10,'payment_instrument',1,0,0,6,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Paid By','Contribution',0,0),(49,10,'check_number',1,0,0,7,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Check Number','Contribution',0,0),(50,10,'send_receipt',1,0,0,8,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Send Receipt','Contribution',0,0),(51,10,'invoice_id',1,0,0,9,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Invoice ID','Contribution',0,0),(52,11,'membership_type',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Type','Membership',1,0),(53,11,'join_date',1,0,1,2,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Member Since','Membership',1,0),(54,11,'membership_start_date',1,0,0,3,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Start Date','Membership',1,0),(55,11,'membership_end_date',1,0,0,4,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'End Date','Membership',1,0),(56,11,'membership_source',1,0,0,5,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,2,'Membership',0,0),(57,11,'send_receipt',1,0,0,6,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Send Receipt','Membership',0,0),(58,11,'financial_type',1,0,1,7,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Financial Type','Membership',1,0),(59,11,'total_amount',1,0,1,8,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Amount','Membership',1,0),(60,11,'receive_date',1,0,1,9,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Received','Membership',1,0),(61,11,'payment_instrument',1,0,0,10,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Paid By','Membership',0,0),(62,11,'check_number',1,0,0,11,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Check Number','Membership',0,0),(63,11,'contribution_status_id',1,0,1,12,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Payment Status','Membership',1,0),(64,12,'email',1,0,1,1,NULL,NULL,'User and User Admin Only',0,0,NULL,NULL,'Email Address','Contact',0,0); /*!40000 ALTER TABLE `civicrm_uf_field` ENABLE KEYS */; UNLOCK TABLES; diff --git a/xml/schema/Activity/ActivityContact.xml b/xml/schema/Activity/ActivityContact.xml index 36268c9663..3f5138b694 100644 --- a/xml/schema/Activity/ActivityContact.xml +++ b/xml/schema/Activity/ActivityContact.xml @@ -51,21 +51,19 @@ CASCADE - record_type - enum - Record Type - Source, Assignee, Target - The record type for this row + record_type_id + int unsigned + Record Type ID + The record type id for this row 4.4 - UI_activity_contact - contact_id - activity_id - record_type - true - 4.4 + UI_activity_contact + contact_id + activity_id + record_type_id + true + 4.4 - -- 2.25.1