From d5e57df5a19ef1b3157a379007fc0ec7ca30dc0a Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 27 Aug 2019 15:30:32 +0200
Subject: [PATCH] Kleines Refactoring: Es wird nun nicht mehr nach TargetEntity
sondern die Strings werden je nach Ergebnis aus der Datenbank konkateniert
---
.../jditorecordcontainer/contentProcess.js | 26 ++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/entity/DuplicatesUnrelated_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/DuplicatesUnrelated_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index 80ea054419..7054a60fc2 100644
--- a/entity/DuplicatesUnrelated_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/DuplicatesUnrelated_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -4,8 +4,8 @@ import("system.db");
var INDEX_ID = 0;
var INDEX_SOURCE_INFO1 = 1;
-var INDEX_SOURCE_INFO2 = 2;
-var INDEX_UNRELATED_INFO1 = 3;
+var INDEX_SOURCE_INFO2 = 3;
+var INDEX_UNRELATED_INFO1 = 2;
var INDEX_UNRELATED_INFO2 = 4;
var INDEX_SOURCE_INFO = 1;
var INDEX_UNRELATED_INFO = 2;
@@ -20,8 +20,8 @@ let query = "";
if(targetEntity == 'Person_entity')
{
query = "select ud.ID,"
- + " pSource.FIRSTNAME, pSource.LASTNAME,"
- + " pUnrelated.FIRSTNAME, pUnrelated.LASTNAME"
+ + " pSource.FIRSTNAME, pUnrelated.FIRSTNAME,"
+ + " pSource.LASTNAME, pUnrelated.LASTNAME"
+ " from UNRELATEDDUPLICATES ud"
+ " join CONTACT cUnrelated on cUnrelated.CONTACTID = ud.UNRELATEDDUPLICATEID"
+ " join PERSON pUnrelated on pUnrelated.PERSONID = cUnrelated.PERSON_ID"
@@ -54,22 +54,18 @@ for (let i = 0; i < unrelatedDuplicates.length; i++)
let sourceInfo = "";
let unrelatedInfo = "";
- if(targetEntity == 'Person_entity')
- {
let sourceInfo1 = unrelatedDuplicates[i][INDEX_SOURCE_INFO1];
let sourceInfo2 = unrelatedDuplicates[i][INDEX_SOURCE_INFO2];
let unrelatedInfo1 = unrelatedDuplicates[i][INDEX_UNRELATED_INFO1];
let unrelatedInfo2 = unrelatedDuplicates[i][INDEX_UNRELATED_INFO2];
- sourceInfo = sourceInfo1 + " " + sourceInfo2;
- unrelatedInfo = unrelatedInfo1 + " " + unrelatedInfo2;
- }
- else
- {
- sourceInfo = unrelatedDuplicates[i][INDEX_SOURCE_INFO];
- unrelatedInfo = unrelatedDuplicates[i][INDEX_UNRELATED_INFO];
- }
-
+ sourceInfo = sourceInfo1;
+ if(sourceInfo2 != undefined)
+ sourceInfo += " " + sourceInfo2;
+
+ unrelatedInfo = unrelatedInfo1;
+ if(unrelatedInfo2 != undefined)
+ unrelatedInfo += " " + unrelatedInfo2;
resultUnrelatedDuplicates.push([id, sourceInfo, unrelatedInfo]);
}
--
GitLab