Skip to content
Snippets Groups Projects
Commit b885c3dd authored by Markus Escher's avatar Markus Escher
Browse files

remove Pers ORGNAME 

remove invalid processes
parent 4a9b83d2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 98 deletions
entity/Pers_entity/Pers_entity.aod
+ 16
− 20
View file @ b885c3dd
......@@ -118,6 +118,11 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PREVIEWTITLE</name>
<title></title>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>OrgId_param</name>
<expose v="true" />
......@@ -181,8 +186,11 @@
</entityField>
<entityField>
<name>ORG_ID</name>
<title>Firma</title>
<tableName>RELATION</tableName>
<columnName>ORG_ID</columnName>
<linkedContext>Org_context</linkedContext>
<outgoingField>PersOrg_dfo</outgoingField>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Pers_entity/entityfields/org_id/onValueChange.js</onValueChange>
</entityField>
......@@ -248,22 +256,6 @@
</entityParameter>
</children>
</entityOutgoingField>
<entityField>
<name>ORGNAME</name>
<title>Company</title>
<tableName>ORG</tableName>
<columnName>NAME</columnName>
<linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>PersOrg_dfo</outgoingField>
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/valueProcess.js</valueProcess>
<fieldIdProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/fieldIdProcess.js</fieldIdProcess>
<onValueChange>%aditoprj%/entity/Pers_entity/entityfields/orgname/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
</onValueChangeTypes>
</entityField>
<entityField>
<name>ORGID</name>
<tableName>ORG</tableName>
......@@ -528,10 +520,6 @@
<name>GENDER.value</name>
<value>PERS.GENDER</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_ID.value</name>
<value>RELATION.ORG_ID</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSID.value</name>
<value>PERS.PERSID</value>
......@@ -600,6 +588,14 @@
<name>TITLESUFFIX.value</name>
<value>PERS.TITLESUFFIX</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_ID.displayValue</name>
<value>ORG.NAME</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_ID.value</name>
<value>RELATION.ORG_ID</value>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Pers_entity/entityfields/org_id/valueProcess.js
+ 10
− 11
View file @ b885c3dd
import("system.vars");
import("system.db");
import("system.result");
import("system.neon");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") == '')
result.string(vars.get("$this.value"));
else if(vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param") != null)
result.string(vars.getString("$param.OrgId_param"));
else
result.string("0")
}
else
result.string(vars.get("$this.value"));
var ret = "";
var orgid = vars.getString("$field.ORG_ID").trim();
if(orgid == "0")
ret = null;
else if(orgid != "")
ret = db.cell("select RELATIONID from RELATION where ORG_ID = '" + orgid + "' and PERS_ID is NULL");
result.string (ret);
entity/Pers_entity/entityfields/orgname/fieldIdProcess.js deleted 100644 → 0
+ 0
− 14
View file @ 4a9b83d2
import("system.vars");
import("system.db");
import("system.result");
import("system.neon");
var ret = "";
var orgid = vars.getString("$field.ORG_ID").trim();
if(orgid == "0")
ret = null;
else if(orgid != "")
ret = db.cell("select RELATIONID from RELATION where ORG_ID = '" + orgid + "' and PERS_ID is NULL");
result.string (ret);
\ No newline at end of file
entity/Pers_entity/entityfields/orgname/linkedContextProcess.js deleted 100644 → 0
+ 0
− 13
View file @ 4a9b83d2
import("system.vars");
import("system.result");
import("system.neon");
var orgid = vars.getString("$field.ORGID");
if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") != '')
result.string("Org_context");
else if((orgid == null || orgid.trim() == "0")
&& (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW))
result.string(null);
else
result.string("Org_context");
entity/Pers_entity/entityfields/orgname/onValueChange.js deleted 100644 → 0
+ 0
− 17
View file @ 4a9b83d2
import("system.logging");
import("system.db");
import("system.neon");
import("system.vars");
var org_id = db.cell("select ORG_ID from RELATION where RELATIONID = '" + vars.getString("$field.ORGNAME") + "'");
logging.log("value change -> " + org_id);
if(org_id != '')
{
vars.set("$field.ORG_ID", org_id);
var org_name = db.cell("select NAME from ORG where ORGID = '" + org_id + "'");
vars.set("$image.lookup_orgname", org_name);
neon.refresh("", "$field.ORGNAME");
}
entity/Pers_entity/entityfields/orgname/valueProcess.js deleted 100644 → 0
+ 0
− 20
View file @ 4a9b83d2
import("system.result");
import("system.vars");
if(!vars.exists("$image.lookup_orgname"))
{
result.string(vars.get("$this.value"));
}
else
{
var name = vars.get("$image.lookup_orgname");
if(name != null)
{
vars.set("$image.lookup_orgname", null);
result.string(name);
}
else
result.string(vars.get("$this.value"));
}
\ No newline at end of file
neonView/PersEdit_view/PersEdit_view.aod
+ 2
− 2
View file @ b885c3dd
......@@ -17,8 +17,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>3826c0af-dad4-419c-ac53-a644a83e6738</name>
<entityField>ORGNAME</entityField>
<name>7a647c90-3a1c-4f8d-9ecd-6bdf35ab2f80</name>
<entityField>ORG_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8f7b95e8-e15e-4d9b-960a-ecd142c71c9e</name>
......
neonView/PersPreview_view/PersPreview_view.aod
+ 1
− 1
View file @ b885c3dd
......@@ -12,7 +12,7 @@
<name>PersHeader_template</name>
<iconField>IMAGE</iconField>
<titleField>NAME_fieldGroup</titleField>
<descriptionField>ORGNAME</descriptionField>
<descriptionField>ORG_ID</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<neonViewReference>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment