forked from apache/ofbiz
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
With the suppression of all jar to download them form jcenter, the jpim.jar isn't present. To resolve this issue we can convert the current use for import/export vcard by an other api ez-vcard (https://github.com/mangstadt/ez-vcard) under bsd licence and present on jcenter. The refactoring raise some problem on existant code, we will try with Gil to improve the import/export to grow data conversion to functional framework. Some improve on import : * check if more than one email is present before check the prefered else take the one * check if more than one phone is present before check the prefered else take the one * check if more than one address is present before check the prefered else take the one * When you load a party by vcard, initialize a reference by fn attribute on PartyIndentification to escape the second loading Will need continue improve the import like correct Organization loading, update process, add service to detect already party present I also improve the screen result to display all parties loaded by the import and all already present. The solution isn't perfect but it's work and compile, first purpose to delete jpim.jar is done :) Related issue OFBIZ-7961 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1756949 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
Showing
9 changed files
with
277 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
329 changes: 158 additions & 171 deletions
329
applications/marketing/src/main/java/org/apache/ofbiz/sfa/vcard/VCard.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
|
|
||
| <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd"> | ||
|
|
||
| <grid name="ViewPartiesCreatedByVCard" list-name="partiesCreated" header-row-style="header-row" default-table-style="basic-table"> | ||
| <row-actions> | ||
| <entity-one entity-name="Party" value-field="party" use-cache="true"/> | ||
| <set field="partyName" value="${groovy:org.apache.ofbiz.party.party.PartyHelper.getPartyName(party, true)}"/> | ||
| <entity-and entity-name="PartyAndContactMech" list="emailAddresses"> | ||
| <field-map field-name="partyId"/> | ||
| <field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/> | ||
| </entity-and> | ||
| <entity-and entity-name="PartyAndContactMech" list="telecomNumbers"> | ||
| <field-map field-name="partyId"/> | ||
| <field-map field-name="contactMechTypeId" value="TELECOM_NUMBER"/> | ||
| </entity-and> | ||
| <set field="telecomNumber" from-field="telecomNumbers[0]" type="Object"/> | ||
| <entity-and entity-name="PartyAndContactMech" list="postalAddresses"> | ||
| <field-map field-name="partyId"/> | ||
| <field-map field-name="contactMechTypeId" value="POSTAL_ADDRESS"/> | ||
| </entity-and> | ||
| <set field="postalAddress" from-field="postalAddresses[0]" type="Object"/> | ||
| </row-actions> | ||
| <field name="partyId" title="${uiLabelMap.PartyPartyId}"> | ||
| <hyperlink target="viewprofile" description="${partyName} [${partyId}]" target-window="_blank"> | ||
| <parameter param-name="partyId"/> | ||
| <parameter param-name="roleTypeId"/> | ||
| </hyperlink> | ||
| </field> | ||
| <field name="emailAddress"><display description="${emailAddresses[0].infoString}"/></field> | ||
| <field name="telecomNumber" title="${uiLabelMap.PartyPhoneNumber}"> | ||
| <display description="${telecomNumber.tnCountryCode} ${telecomNumber.tnAreaCode} ${telecomNumber.tnContactNumber} ${telecomNumber.tnAskForName}"/> | ||
| </field> | ||
| <field name="city"><display description="${postalAddress.paCity}"/></field> | ||
| </grid> | ||
| <grid name="ViewPartiesExistInVCard" list-name="partiesExist" extends="ViewPartiesCreatedByVCard"/> | ||
|
|
||
| </forms> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.