Skip to content
Snippets Groups Projects
Commit 7d319f38 authored by Tobias Feldmann's avatar Tobias Feldmann
Browse files

Hinzufügen von Adressen und Kommunikationsdaten beim Erstellen von Personen und Firmen

parent c4cb9a73
No related branches found
No related tags found
No related merge requests found
Showing with 46 additions and 12 deletions
......@@ -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>
......
import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
......
......@@ -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
......@@ -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>
......
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
......@@ -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>
......
......@@ -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
......@@ -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
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
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
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment