From f9d671b249998f99c8cb025249fef238aad2a105 Mon Sep 17 00:00:00 2001
From: "j.luginger" <j.luginger@JLuginger.aditosoftware.local>
Date: Thu, 28 Feb 2019 16:14:18 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1035026][[Person]:
Anrede und Titel]
---
entity/Person_entity/Person_entity.aod | 1 +
.../entityfields/language/valueProcess.js | 3 +--
.../entityfields/salutation/displayValueProcess.js | 4 +++-
.../entityfields/salutation/possibleItemsProcess.js | 0
.../children/salutation_param/code.js | 3 ---
.../entityfields/title/displayValueProcess.js | 4 +++-
entity/Salutation_entity/Salutation_entity.aod | 1 -
.../entityfields/uid/titleProcess.js | 5 ++---
.../entityfields/uid/valueProcess.js | 12 ------------
.../distinctsalutation_jdito/contentProcess.js | 4 ++--
.../recordcontainers/title_jdito/contentProcess.js | 4 ++--
entity/Salutation_entity/titleProcess.js | 7 ++++++-
12 files changed, 20 insertions(+), 28 deletions(-)
create mode 100644 entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
delete mode 100644 entity/Salutation_entity/entityfields/uid/valueProcess.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 33a2f4dc7d5..e04596e9cf5 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -49,6 +49,7 @@
<name>SALUTATION</name>
<title>Salutation</title>
<consumer>Salutations</consumer>
+ <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess>
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/Person_entity/entityfields/language/valueProcess.js b/entity/Person_entity/entityfields/language/valueProcess.js
index ebaf1bb63bc..4a47bbccc13 100644
--- a/entity/Person_entity/entityfields/language/valueProcess.js
+++ b/entity/Person_entity/entityfields/language/valueProcess.js
@@ -5,6 +5,5 @@ import("system.db");
import("system.result");
-logging.log("kljkk " + vars.get("$field.SALUTATION"))
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
result.string("deu");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/displayValueProcess.js b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
index 927bb4fb7ea..23500893cce 100644
--- a/entity/Person_entity/entityfields/salutation/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
@@ -1,5 +1,7 @@
import("system.vars");
import("system.db");
import("system.result");
+import("Sql_lib");
-result.string(db.cell("select SALUTATION from PERSON where PERSONID = '" + vars.get("$field.PERSONID") + "'"));
\ No newline at end of file
+var cond = SqlCondition.begin()
+result.string(db.cell(cond.andPrepareVars("PERSON.PERSONID", "$field.PERSONID").buildSql("select SALUTATION from PERSON", "1=2")));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js b/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js
index cada0795b3e..72099ab8ff3 100644
--- a/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js
+++ b/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js
@@ -2,7 +2,4 @@ import("system.vars");
import("system.result");
import("system.logging")
-logging.log("dsfksdjnfksj" + vars.get("$field.ORGANISATION_ID"));
-logging.log("ff" + vars.get("$field.SALUTATION"));
-
result.string(vars.get("$field.SALUTATION"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/title/displayValueProcess.js b/entity/Person_entity/entityfields/title/displayValueProcess.js
index 7a4911a0e3d..67f0faec9f0 100644
--- a/entity/Person_entity/entityfields/title/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/title/displayValueProcess.js
@@ -1,5 +1,7 @@
import("system.vars");
import("system.db");
import("system.result");
+import("Sql_lib");
-result.string(db.cell("select TITLE from PERSON where PERSONID = '" + vars.get("$field.PERSONID") + "'"));
\ No newline at end of file
+var cond = SqlCondition.begin()
+result.string(db.cell(cond.andPrepareVars("PERSON.PERSONID", "$field.PERSONID").buildSql("select TITLE from PERSON", "1=2")));
\ No newline at end of file
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 1acb5474ce8..0e959b81d27 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -115,7 +115,6 @@
<entityField>
<name>UID</name>
<titleProcess>%aditoprj%/entity/Salutation_entity/entityfields/uid/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>uIdDefinition_param</name>
diff --git a/entity/Salutation_entity/entityfields/uid/titleProcess.js b/entity/Salutation_entity/entityfields/uid/titleProcess.js
index 8e908a6ca5a..764d0886fa0 100644
--- a/entity/Salutation_entity/entityfields/uid/titleProcess.js
+++ b/entity/Salutation_entity/entityfields/uid/titleProcess.js
@@ -3,9 +3,8 @@ import("system.result");
var uIdDefinition = vars.get("$param.uIdDefinition_param")
-
-if(uIdDefinition == "SALUTATION")
+if (uIdDefinition == "SALUTATION")
result.string("Anrede")
-if(uIdDefinition == "TITLE")
+if (uIdDefinition == "TITLE")
result.string("Titel")
\ No newline at end of file
diff --git a/entity/Salutation_entity/entityfields/uid/valueProcess.js b/entity/Salutation_entity/entityfields/uid/valueProcess.js
deleted file mode 100644
index ef19222863e..00000000000
--- a/entity/Salutation_entity/entityfields/uid/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//import("system.logging");
-//import("system.vars");
-//import("system.result");
-//
-//var uIdDefinition = vars.get("$param.uIdDefinition_param")
-//
-//
-//if(uIdDefinition == "SALUTATION")
-// result.string(vars.get("$field.SALUTATION"))
-//
-//if(uIdDefinition == "TITLE")
-// result.string(vars.get("$field.TITLE"))
diff --git a/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js b/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js
index e22730569ca..3557692391f 100644
--- a/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js
+++ b/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js
@@ -9,6 +9,6 @@ var cond = SqlCondition.begin()
.andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
.buildSql("select distinct SALUTATION, SALUTATION from SALUTATION", "1=2");
-var salutation = db.table(cond);
+var salutations = db.table(cond);
-result.object(salutation);
\ No newline at end of file
+result.object(salutations);
\ No newline at end of file
diff --git a/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js b/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js
index f083f9a4454..c4fc01944cb 100644
--- a/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js
+++ b/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js
@@ -10,6 +10,6 @@ var cond = SqlCondition.begin()
.andPrepareVars("SALUTATION.SALUTATION", "$param.Salutation_param")
.buildSql("select TITLE, TITLE from SALUTATION", "1=2");
-var salutation = db.table(cond);
+var titles = db.table(cond);
-result.object(salutation);
\ No newline at end of file
+result.object(titles);
\ No newline at end of file
diff --git a/entity/Salutation_entity/titleProcess.js b/entity/Salutation_entity/titleProcess.js
index a35437175f8..bd122fedadf 100644
--- a/entity/Salutation_entity/titleProcess.js
+++ b/entity/Salutation_entity/titleProcess.js
@@ -2,5 +2,10 @@ import("system.result");
import("system.vars");
if (vars.get("$param.uIdDefinition_param") && vars.exists("$param.uIdDefinition_param"))
+{
result.string(vars.get("$field.UID"))
-else result.string("Anrede")
\ No newline at end of file
+}
+else
+{
+ result.string("Anrede")
+}
\ No newline at end of file
--
GitLab