From 7d319f381af7652b1fc64ee35529217c2c876f36 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Thu, 16 Aug 2018 15:30:55 +0200
Subject: [PATCH] =?UTF-8?q?Hinzuf=C3=BCgen=20von=20Adressen=20und=20Kommun?=
=?UTF-8?q?ikationsdaten=20beim=20Erstellen=20von=20Personen=20und=20Firme?=
=?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
aliasDefinition/Data_alias/Data_alias.aod | 14 ++++++++++++++
.../entityfields/relation_id/valueProcess.js | 1 +
entity/History_entity/onDBInsert.js | 4 ++--
entity/Org_entity/Org_entity.aod | 1 +
.../entityfields/relationid/valueProcess.js | 7 +++++++
entity/Pers_entity/Pers_entity.aod | 1 +
.../entityfields/org_id/valueProcess.js | 5 ++---
.../entityfields/orgname/valueProcess.js | 8 ++++++--
.../persaddress_dfo/children/relid_param/code.js | 2 +-
.../entityfields/relationid/valueProcess.js | 7 +++++++
neonView/PersEdit_view/PersEdit_view.aod | 8 ++++----
11 files changed, 46 insertions(+), 12 deletions(-)
create mode 100644 entity/Org_entity/entityfields/relationid/valueProcess.js
create mode 100644 entity/Pers_entity/entityfields/relationid/valueProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index e37baaa7fa..9638ae2da4 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -998,6 +998,13 @@
<index v="false" />
<title></title>
<description></description>
+ <dependencies>
+ <entityDependency>
+ <name>b0a6bcf2-246e-475e-a4f0-b25553e1e27f</name>
+ <entityName>RELATION</entityName>
+ <fieldName>RELATIONID</fieldName>
+ </entityDependency>
+ </dependencies>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
@@ -1108,6 +1115,13 @@
<index v="false" />
<title></title>
<description></description>
+ <dependencies>
+ <entityDependency>
+ <name>c42dcb6e-6771-4fd0-80e8-86359c417051</name>
+ <entityName>RELATION</entityName>
+ <fieldName>RELATIONID</fieldName>
+ </entityDependency>
+ </dependencies>
</entityFieldDb>
<entityFieldDb>
<name>USER_NEW</name>
diff --git a/entity/Address_entity/entityfields/relation_id/valueProcess.js b/entity/Address_entity/entityfields/relation_id/valueProcess.js
index 2d085e3aff..b4b2e6cbf5 100644
--- a/entity/Address_entity/entityfields/relation_id/valueProcess.js
+++ b/entity/Address_entity/entityfields/relation_id/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
diff --git a/entity/History_entity/onDBInsert.js b/entity/History_entity/onDBInsert.js
index 244ca90670..10db22cf04 100644
--- a/entity/History_entity/onDBInsert.js
+++ b/entity/History_entity/onDBInsert.js
@@ -5,8 +5,8 @@ import("system.vars");
if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") != null )
{
- var cols = new Array("HISTORYLINKID", "OBJECT_ID", "ROW_ID", "HISTORY_ID", "USER_NEW", "DATE_NEW");
- var vals = new Array(util.getNewUUID(), 1, vars.get("$param.RowId_param"), vars.getString("$field.HISTORYID"), vars.getString("$sys.user"), vars.getString("$sys.date")); // use new OBJECT_ID for context
+ var cols = ["HISTORYLINKID", "OBJECT_ID", "ROW_ID", "HISTORY_ID", "USER_NEW", "DATE_NEW"];
+ var vals = [util.getNewUUID(), 1, vars.get("$param.RowId_param"), vars.getString("$field.HISTORYID"), vars.getString("$sys.user"), vars.getString("$sys.date")]; // use new OBJECT_ID for context
var colTypes = db.getColumnTypes("HISTORYLINK", cols);
db.insertData("HISTORYLINK", cols, colTypes, vals);
}
\ No newline at end of file
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 24db71632f..bfe5fdd3ea 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -104,6 +104,7 @@
<name>RELATIONID</name>
<tableName>RELATION</tableName>
<columnName>RELATIONID</columnName>
+ <valueProcess>%aditoprj%/entity/Org_entity/entityfields/relationid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATUS</name>
diff --git a/entity/Org_entity/entityfields/relationid/valueProcess.js b/entity/Org_entity/entityfields/relationid/valueProcess.js
new file mode 100644
index 0000000000..5be18c3983
--- /dev/null
+++ b/entity/Org_entity/entityfields/relationid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index b9553856da..5c9dedcccd 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -143,6 +143,7 @@
<name>RELATIONID</name>
<tableName>RELATION</tableName>
<columnName>RELATIONID</columnName>
+ <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/relationid/valueProcess.js</valueProcess>
</entityField>
<entityIncomingField>
<name>PersOrg_dfi</name>
diff --git a/entity/Pers_entity/entityfields/org_id/valueProcess.js b/entity/Pers_entity/entityfields/org_id/valueProcess.js
index ea6f78c551..489cac6bba 100644
--- a/entity/Pers_entity/entityfields/org_id/valueProcess.js
+++ b/entity/Pers_entity/entityfields/org_id/valueProcess.js
@@ -3,11 +3,10 @@ import("system.vars");
import("system.result");
import("system.neon");
-
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param") != null)
result.string(vars.getString("$param.OrgId_param"));
- else if(vars.get("$field.ORG_ID") == null)
- result.string("0");
+ else
+ result.string("0")
}
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/orgname/valueProcess.js b/entity/Pers_entity/entityfields/orgname/valueProcess.js
index ce920204d2..46324b9873 100644
--- a/entity/Pers_entity/entityfields/orgname/valueProcess.js
+++ b/entity/Pers_entity/entityfields/orgname/valueProcess.js
@@ -6,8 +6,12 @@ import("system.neon");
var ret = "";
var orgid = vars.getString("$field.ORG_ID");
-if( orgid != "")
+if( orgid == "0")
{
- ret = db.cell("select NAME from ORG where ORGID = '" + orgid + "'");
+ ret = "privat";
+}
+else if(orgid != "")
+{
+ ret = db.cell("select NAME from ORG where ORGID = '" + orgid + "'");
}
result.string (ret);
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js b/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
index aa257b8b78..1ed22d9712 100644
--- a/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
+++ b/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file
+result.string(vars.getString("$field.RELATIONID"));
\ No newline at end of file
diff --git a/entity/Pers_entity/entityfields/relationid/valueProcess.js b/entity/Pers_entity/entityfields/relationid/valueProcess.js
new file mode 100644
index 0000000000..5be18c3983
--- /dev/null
+++ b/entity/Pers_entity/entityfields/relationid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod
index 7326fe2858..6d1e277a95 100644
--- a/neonView/PersEdit_view/PersEdit_view.aod
+++ b/neonView/PersEdit_view/PersEdit_view.aod
@@ -16,6 +16,10 @@
<showDrawer v="false" />
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>3826c0af-dad4-419c-ac53-a644a83e6738</name>
+ <entityField>ORGNAME</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
<entityField>SALUTATION</entityField>
@@ -44,10 +48,6 @@
<name>74de507e-75e0-4957-a4fb-7070fa3c5a4a</name>
<entityField>DATEOFBIRTH</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>3826c0af-dad4-419c-ac53-a644a83e6738</name>
- <entityField>ORGNAME</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
--
GitLab