diff --git a/CRM/Activity/Import/Field.php b/CRM/Activity/Import/Field.php deleted file mode 100644 index b3d4cbed04d8..000000000000 --- a/CRM/Activity/Import/Field.php +++ /dev/null @@ -1,108 +0,0 @@ -_name = $name; - $this->_title = $title; - $this->_type = $type; - $this->_headerPattern = $headerPattern; - $this->_dataPattern = $dataPattern; - - $this->_value = NULL; - } - - public function resetValue() { - $this->_value = NULL; - } - - /** - * The value is in string format. convert the value to the type of this field - * and set the field value with the appropriate type - * @param string $value - */ - public function setValue($value) { - $this->_value = $value; - } - - /** - * @return bool - */ - public function validate() { - - if (CRM_Utils_System::isNull($this->_value)) { - return TRUE; - } - return TRUE; - } - -} diff --git a/CRM/Activity/Import/Parser/Activity.php b/CRM/Activity/Import/Parser/Activity.php index 4b37a0fe045b..e9508a59e084 100644 --- a/CRM/Activity/Import/Parser/Activity.php +++ b/CRM/Activity/Import/Parser/Activity.php @@ -47,16 +47,6 @@ public static function getUserJobInfo(): array { */ public function init() { $this->setFieldMetadata(); - - foreach ($this->importableFieldsMetadata as $name => $field) { - $field['type'] = CRM_Utils_Array::value('type', $field, CRM_Utils_Type::T_INT); - $field['dataPattern'] = CRM_Utils_Array::value('dataPattern', $field, '//'); - $field['headerPattern'] = CRM_Utils_Array::value('headerPattern', $field, '//'); - if (!empty($field['custom_group_id'])) { - $field['title'] = $field["groupTitle"] . ' :: ' . $field["title"]; - } - $this->addField($name, $field['title'], $field['type'], $field['headerPattern'], $field['dataPattern']); - } } /** @@ -192,30 +182,6 @@ protected function getRequiredFields(): array { return [['activity_type_id' => ts('Activity Type'), 'activity_date_time' => ts('Activity Date')]]; } - /** - * @deprecated - these are just used in a couple of parent class functions now. - * @param string $name - * @param $title - * @param int $type - * @param string $headerPattern - * @param string $dataPattern - */ - public function addField($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') { - if (empty($name)) { - $this->_fields['doNotImport'] = new CRM_Activity_Import_Field($name, $title, $type, $headerPattern, $dataPattern); - } - else { - - $tempField = CRM_Contact_BAO_Contact::importableFields('Individual', NULL); - if (!array_key_exists($name, $tempField)) { - $this->_fields[$name] = new CRM_Activity_Import_Field($name, $title, $type, $headerPattern, $dataPattern); - } - else { - $this->_fields[$name] = new CRM_Contact_Import_Field($name, $title, $type, $headerPattern, $dataPattern, CRM_Utils_Array::value('hasLocationType', $tempField[$name])); - } - } - } - /** * Ensure metadata is loaded. */