From e8d1837fa4d1f21b724d428c83f4f6eea63d599c Mon Sep 17 00:00:00 2001
From: "j.luginger" <j.luginger@JLuginger.aditosoftware.local>
Date: Tue, 26 Feb 2019 09:13:43 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1035026][[Person]:
Anrede und Titel] Codes verbessert
---
entity/Person_entity/Person_entity.aod | 1 -
.../gender/displayValueProcess.js | 31 +++++++------------
.../entityfields/gender/valueProcess.js | 16 +++-------
.../entityfields/salutation/onValidation.js | 14 ---------
.../salutation/possibleItemsProcess.js | 5 ++-
.../title/possibleItemsProcess.js | 11 +++----
6 files changed, 21 insertions(+), 57 deletions(-)
delete mode 100644 entity/Person_entity/entityfields/salutation/onValidation.js
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 686f3b7959..c7f4fd219a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -50,7 +50,6 @@
<name>SALUTATION</name>
<title>Salutation</title>
<possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess>
- <onValidation>%aditoprj%/entity/Person_entity/entityfields/salutation/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/salutation/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
diff --git a/entity/Person_entity/entityfields/gender/displayValueProcess.js b/entity/Person_entity/entityfields/gender/displayValueProcess.js
index 1d84f0ff41..2c6be04351 100644
--- a/entity/Person_entity/entityfields/gender/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/gender/displayValueProcess.js
@@ -1,32 +1,23 @@
+import("system.logging");
import("system.vars");
import("Keyword_lib");
-import("system.logging");
import("system.result");
import("system.db");
import("system.vars");
import("system.neon");
+import("Sql_lib");
var salutation = vars.get("$field.SALUTATION");
+var cond = SqlCondition.begin()
+
+var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2"))
-if (salutation)
-{
- var sex = db.cell("select SEX from SALUTATION where SALUTATION = '" + salutation + "'");
-
- if (sex)
- {
- var keyword = KeywordUtils.getViewValue("PersonGender", sex);
-
- logging.log("ii" + keyword)
- result.string(keyword)
- }
+if (sex)
+{
+ var keyword = KeywordUtils.getViewValue("PersonGender", sex);
-}
-
-
-
-
-
-
-
+ logging.log(keyword)
+ result.string(keyword)
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/gender/valueProcess.js b/entity/Person_entity/entityfields/gender/valueProcess.js
index 56881cd1bb..9d763fea86 100644
--- a/entity/Person_entity/entityfields/gender/valueProcess.js
+++ b/entity/Person_entity/entityfields/gender/valueProcess.js
@@ -1,19 +1,11 @@
-import("system.logging");
import("system.result");
import("system.db");
import("system.vars");
import("system.neon");
+import("Sql_lib");
-var salutation = vars.get("$field.SALUTATION")
-;
+var cond = SqlCondition.begin()
-logging.log("value process: " + salutation);
+var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2"))
-if((vars.get("sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("sys.recordstate") == neon.OPERATINGSTATE_EDIT) && !vars.get("$field.GENDER") && vars.get("$field.SALUTATION"))
-{
-
-var sex = db.cell("select SEX from SALUTATION where SALUTATION = '" + salutation + "'");
-logging.log(sex)
-result.string( sex)
-
-}
\ No newline at end of file
+result.string(sex)
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/onValidation.js b/entity/Person_entity/entityfields/salutation/onValidation.js
deleted file mode 100644
index 25929f20e0..0000000000
--- a/entity/Person_entity/entityfields/salutation/onValidation.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//import("system.logging");
-//import("system.result");
-//import("system.db");
-//import("system.vars");
-//
-//var salutation = vars.get("$field.SALUTATION")
-//
-//if(!vars.get("$field.GENDER"))
-// {
-//
-// var sex = db.cell("select SEX from SALUTATION where SALUTATION = '" + salutation + "'");
-// vars.set("$field.GENDER", sex)
-//
-// }
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
index c494b91dba..9fc8e487f3 100644
--- a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
+++ b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
@@ -2,7 +2,6 @@ import("system.result");
import("system.db");
-//var salutation = db.array(db.COLUMN, "select distinct SALUTATION from SALUTATION where SALUTATION is not NULL");
-var salutation2 = db.table("select distinct SALUTATION, SALUTATION from SALUTATION where SALUTATION is not NULL");
+var salutation = db.table("select distinct SALUTATION, SALUTATION from SALUTATION where SALUTATION is not NULL");
-result.object(salutation2);
\ No newline at end of file
+result.object(salutation);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/title/possibleItemsProcess.js b/entity/Person_entity/entityfields/title/possibleItemsProcess.js
index b5456c0103..c1f2d5c8ff 100644
--- a/entity/Person_entity/entityfields/title/possibleItemsProcess.js
+++ b/entity/Person_entity/entityfields/title/possibleItemsProcess.js
@@ -1,13 +1,10 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.db");
+import("Sql_lib");
-var salutation = vars.get("$field.SALUTATION");
+var cond = SqlCondition.begin()
-logging.log(salutation)
-
-var title = db.table("select TITLE, TITLE from SALUTATION where TITLE is not null and SALUTATION = '" + salutation + "'");
-
-result.object(title);
+var title = db.table(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select TITLE, TITLE from SALUTATION", "1=2"))
+result.object(title);
\ No newline at end of file
--
GitLab