Skip to content
Snippets Groups Projects
Commit 4858d128 authored by Heinz Boesl's avatar Heinz Boesl Committed by Benjamin Ulrich
Browse files

small adjustments DuplicatsScanner

parent 578ba18d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
entity/Person_entity/Person_entity.aod
+ 19
− 43
View file @ 4858d128
......@@ -849,28 +849,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/onValidation.js</onValidation>
</entityField>
<entityParameter>
<name>OnlyShowContactIds_param</name>
<expose v="true" />
</entityParameter>
<entityProvider>
<name>SelfDuplicatesProvider</name>
<titlePlural>Duplicates</titlePlural>
<dependencies>
<entityDependency>
<name>f6d16008-1764-4920-8ea5-c95c6a67f508</name>
<entityName>Person_entity</entityName>
<fieldName>SelfDuplicates</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
<mandatory v="true" />
</entityParameter>
</children>
</entityProvider>
<entityParameter>
<name>DuplicateCurrentContactId_param</name>
<expose v="true" />
......@@ -885,10 +863,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>Country</title>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/standard_country/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OnlyOwnSupervised_param</name>
<expose v="true" />
</entityParameter>
<entityConsumer>
<name>SelfDuplicatesUncached</name>
<dependency>
......@@ -1202,15 +1176,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityProvider>
<entityParameter>
<name>DuplicateCurrentContactId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>DuplicateActionsControl_param</name>
<expose v="true" />
<mandatory v="false" />
</entityParameter>
<entityField>
<name>IndexCommunication</name>
</entityField>
......@@ -1226,10 +1191,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityField>
<name>IndexCity</name>
</entityField>
<entityField>
<name>STANDARD_COUNTRY</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/standard_country/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OnlyOwnSupervised_param</name>
<expose v="true" />
......@@ -1508,15 +1469,15 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/commrestrictions_active.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDRAD_ADDRESS.value</name>
<name>STANDARD_ADDRESS.value</name>
<recordfield>ADDRESS.ADDRESS</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDRAD_CITY.value</name>
<name>STANDARD_CITY.value</name>
<recordfield>ADDRESS.CITY</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDRAD_ZIP.value</name>
<name>STANDARD_ZIP.value</name>
<recordfield>ADDRESS.ZIP</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
......@@ -1585,7 +1546,12 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</additionalFieldNameAliases>
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_ADDRESS.displayValue</name>
<name>STANDARD_ADDRESS.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>address</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_COUNTRY.value</name>
......@@ -1597,9 +1563,19 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_ZIP.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>zip</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_CITY.value</name>
<indexFieldType>ADDRESS</indexFieldType>
<additionalFieldNameAliases>
<element>city</element>
</additionalFieldNameAliases>
<isMultiValued v="true" />
</indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>STANDARD_EMAIL_COMMUNICATION.value</name>
......
preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+ 1
− 1
View file @ 4858d128
<?xml version="1.0" encoding="UTF-8"?>
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.2.0">
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.2.1">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<customized />
......
process/DuplicateScanner_lib/process.js
+ 4
− 4
View file @ 4858d128
......@@ -344,7 +344,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
//If the contact id loading query has no results, stop.
//No ids should be deleted if an error has been made in this query.
if(pTargetRecordsData.length <= 0)
return null;
return foundDuplicateIds;
//First it gets checked if the current id has already been identified. If that's the case it'll continue with the next.
//Otherwise an object gets build in the form of ["FilterFieldName" = "FilterFieldValueFromQuery"] with which a scan for possible duplicates get's started
......@@ -747,7 +747,7 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
if(entityFieldValue == null)
entityFieldValue = "";
else
entityFieldValue = entityFieldValue.toLowerCase().replace(/[():\.\/!]/gi, "");
entityFieldValue = entityFieldValue.toLowerCase().replace(/[():\.\/!]/gi, "").trim();
let exclude = fieldConfig.exclude;
if ( exclude )
......@@ -763,8 +763,8 @@ DuplicateScannerUtils.BuildEntityFieldConfigValueRays = function(pDuplicateField
if ( valuelength )
entityFieldValue = entityFieldValue.substr(0, parseInt(valuelength)) + "*";
let emptyall = fieldConfig.emptyall;
if ( fieldConfig.emptyall && entityFieldValue == "")
let empty = fieldConfig.empty;
if ( !empty && entityFieldValue == "")
entityFieldValue = "*";
entityFieldValue = entityFieldValue.trim();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment