From 59f0af7e31f8220db42850772e16b276d7a31f8f Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Wed, 2 Jul 2014 12:32:23 -0700 Subject: [PATCH] CRM-14938 - add links and fix help for multi-value custom import. ---------------------------------------- * CRM-14938: https://issues.civicrm.org/jira/browse/CRM-14938 --- .../CRM/Contact/Import/Form/DataSource.hlp | 8 ++++++-- .../CRM/Custom/Import/Form/DataSource.hlp | 14 +++++++------ .../CRM/Custom/Import/Form/DataSource.tpl | 20 +++++++++---------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/templates/CRM/Contact/Import/Form/DataSource.hlp b/templates/CRM/Contact/Import/Form/DataSource.hlp index 9862904aac..5b41dff495 100644 --- a/templates/CRM/Contact/Import/Form/DataSource.hlp +++ b/templates/CRM/Contact/Import/Form/DataSource.hlp @@ -1,8 +1,8 @@ {* +--------------------------------------------------------------------+ - | CiviCRM version 4.4 | + | CiviCRM version 4.5 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2010 | + | Copyright CiviCRM LLC (c) 2004-2014 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -23,6 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} +{capture assign=multiURL}{crmURL p="civicrm/import/custom" q="reset=1"}{/capture} {htxt id='choose-data-source-intro-title'} {ts}Import Wizard{/ts} {/htxt} @@ -36,6 +37,9 @@

{ts}After importing contacts, you may also want to import contributions, membership info and/or event participation data for these contacts. If so, first make sure that the corresponding CiviCRM component is enabled from Administer CiviCRM » System Settings » Enable CiviCRM Components. Enable CiviContribute, CiviMember, and/or CiviEvent. Then navigate to the Import option found in each component's menu (e.g. CiviContribute » Import Contributions).{/ts}

+

+ {ts 1=$multiURL}If you need to import Multi-value Custom Data for contacts (such as employment or education history), you will need to do that as a separate step from here.{/ts} +

{/htxt} {htxt id='contact-type-title'} diff --git a/templates/CRM/Custom/Import/Form/DataSource.hlp b/templates/CRM/Custom/Import/Form/DataSource.hlp index c35b68df01..4683080a91 100644 --- a/templates/CRM/Custom/Import/Form/DataSource.hlp +++ b/templates/CRM/Custom/Import/Form/DataSource.hlp @@ -1,8 +1,8 @@ {* +--------------------------------------------------------------------+ - | CiviCRM version 4.4 | + | CiviCRM version 4.5 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2010 | + | Copyright CiviCRM LLC (c) 2004-2014 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -24,10 +24,12 @@ +--------------------------------------------------------------------+ *} {htxt id="upload-title"} - {ts}Import File Format{/ts} + {ts}Importing Multi-value Custom Data{/ts} {/htxt} - -{htxt id="id-onDuplicate-title"} - {ts}Duplicate Matching{/ts} +{htxt id="upload"} + {ts}The import file should contain a row for each set of custom data fields. For example, if you are importing employment + history for a group of contacts, each row might contain columns for Employer, Start Date, End Date, and Position. + You will also need a column containing the CiviCRM Internal Contact ID which is used to match each row to the corresponding + (existing) CiviCRM contact record. NOTE: Contact IDs are included by default when exporting contacts from CiviCRM.{/ts} {/htxt} diff --git a/templates/CRM/Custom/Import/Form/DataSource.tpl b/templates/CRM/Custom/Import/Form/DataSource.tpl index 5b391fd403..7ebacbe77c 100644 --- a/templates/CRM/Custom/Import/Form/DataSource.tpl +++ b/templates/CRM/Custom/Import/Form/DataSource.tpl @@ -24,25 +24,25 @@ +--------------------------------------------------------------------+ *} -{* API Import Wizard - Step 1 (upload data file) *} +{* Multi-value Custom Data Import Wizard - Step 1 (upload data file) *} {* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *} -
+
{* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *} {include file="CRM/common/WizardHeader.tpl"}
- {ts}The API Import Wizard allows you to easily upload data against any API create method from other applications into CiviCRM.{/ts} - {ts}Files to be imported must be in the 'comma-separated-values' format (CSV) and must contain data needed to match the data to an existing record in your CiviCRM database.{/ts} {help id='upload'} + {ts}The Multi-value Custom Data Import Wizard allows you to easily upload data to populate multi-value custom data records (such as employment or education history) for existing contacts.{/ts} + {ts}Files to be imported must be in the 'comma-separated-values' format (CSV) and must contain data needed to match the incoming data to an existing contact record in your CiviCRM database.{/ts} {help id='upload'}
{include file="CRM/common/formButtons.tpl" location="top"}
- + - + - + - + - + {include file="CRM/Core/Date.tpl"} {if $savedMapping} - + -- 2.25.1
{$form.entity.label} {$form.entity.html}
{$form.uploadFile.label} {$form.uploadFile.html}
@@ -62,11 +62,11 @@
{$form.multipleCustomData.label} {$form.multipleCustomData.html}
{$form.contactType.label} {$form.contactType.html}
@@ -75,11 +75,11 @@
{if $loadedMapping}{ts}Select a Different Field Mapping{/ts}{else}{ts}Load Saved Field Mapping{/ts}{/if} {$form.savedMapping.html}