Skip to content
Snippets Groups Projects
Commit 00f70876 authored by S.Listl's avatar S.Listl
Browse files

Merge origin/master 

Conflicts:
	entity/Offer_entity/entityfields/neworder/onActionProcess.js
parents 0e870833 0c8fc0b5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 141 additions and 126 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 44
− 57
View file @ 00f70876
......@@ -149,9 +149,9 @@
</entityFields>
</entityDb>
<entityDb>
<name>RELATION</name>
<name>CONTACT</name>
<dbName></dbName>
<idColumn>RELATIONID</idColumn>
<idColumn>CONTACTID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<title></title>
......@@ -179,7 +179,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATIONID</name>
<name>CONTACTID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
......@@ -218,7 +218,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PERS_ID</name>
<name>PERSON_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -260,9 +260,9 @@
</entityFields>
</entityDb>
<entityDb>
<name>PERS</name>
<name>PERSON</name>
<dbName></dbName>
<idColumn>PERSID</idColumn>
<idColumn>PERSONID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<title></title>
......@@ -290,7 +290,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>PERSID</name>
<name>PERSONID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
......@@ -304,8 +304,8 @@
<dependencies>
<entityDependency>
<name>2daca400-8bad-4bad-9df3-98c4ca023c19</name>
<entityName>RELATION</entityName>
<fieldName>PERS_ID</fieldName>
<entityName>CONTACT</entityName>
<fieldName>PERSON_ID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
......@@ -563,7 +563,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -577,8 +577,8 @@
<dependencies>
<entityDependency>
<name>b0a6bcf2-246e-475e-a4f0-b25553e1e27f</name>
<entityName>RELATION</entityName>
<fieldName>RELATIONID</fieldName>
<entityName>CONTACT</entityName>
<fieldName>CONTACTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
......@@ -641,7 +641,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -655,8 +655,8 @@
<dependencies>
<entityDependency>
<name>c42dcb6e-6771-4fd0-80e8-86359c417051</name>
<entityName>RELATION</entityName>
<fieldName>RELATIONID</fieldName>
<entityName>CONTACT</entityName>
<fieldName>CONTACTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
......@@ -797,7 +797,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -972,7 +972,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -1241,7 +1241,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -1662,7 +1662,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -1687,19 +1687,6 @@
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>FOOTER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>HEADER</name>
<dbName></dbName>
......@@ -2107,7 +2094,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -2428,7 +2415,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -2587,7 +2574,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -2648,7 +2635,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -2868,7 +2855,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -3200,7 +3187,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -3532,7 +3519,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>EDITOR_RELATION_ID</name>
<name>EDITOR_CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -3602,7 +3589,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>REQUESTOR_RELATION_ID</name>
<name>REQUESTOR_CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
......@@ -3978,7 +3965,7 @@
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="true" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -4254,7 +4241,7 @@
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -4301,7 +4288,7 @@
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -4343,7 +4330,7 @@
<columnType v="5" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -4375,38 +4362,38 @@
<name>ORGANISATION</name>
<title>Company</title>
<icon>VAADIN:BUILDING</icon>
<idColumn>RELATIONID</idColumn>
<idColumn>CONTACTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js</subQueries>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js</subQueries>
<resultContextNeon>Organisation_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMMUNICATION</element>
<element>RELATION</element>
<element>CONTACT</element>
<element>ORGANISATION</element>
</affectedTables>
<affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js</affectedIds>
<affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js</affectedIds>
</indexSearchGroup>
<indexSearchGroup>
<name>PERS</name>
<name>PERSON</name>
<title>Contact</title>
<icon>VAADIN:USERS</icon>
<idColumn>RELATIONID</idColumn>
<idColumn>CONTACTID</idColumn>
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
<resultContextNeon>Contact_context</resultContextNeon>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/query.js</query>
<subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/subQueries.js</subQueries>
<resultContextNeon>Person_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
<element>COMMUNICATION</element>
<element>PERS</element>
<element>RELATION</element>
<element>PERSON</element>
<element>CONTACT</element>
<element>ORGANISATION</element>
</affectedTables>
<affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js</affectedIds>
<affectedIds>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/person/affectedIds.js</affectedIds>
</indexSearchGroup>
</indexSearchGroups>
</aliasDefinition>
aliasDefinition/Data_alias/indexsearchgroups/org/affectedIds.js → aliasDefinition/Data_alias/indexsearchgroups/organisation/affectedIds.js
+ 6
− 6
View file @ 00f70876
......@@ -15,22 +15,22 @@ infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, var
switch (tableName)
{
case "RELATION":
case "CONTACT":
res = [idValue];
break;
case "ORGANISATION":
res = db.array(db.COLUMN, "select RELATION.RELATIONID from RELATION where RELATION.PERS_ID is null and RELATION.ORGANISATION_ID = '" + idValue + "'");
res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
break;
case "ADDRESS":
res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
[id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
]]);
});
break;
case "COMMUNICATION":
res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from COMMUNICATION where COMMUNICATIONID = ?", [
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
});
......
aliasDefinition/Data_alias/indexsearchgroups/org/query.js → aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+ 6
− 6
View file @ 00f70876
......@@ -8,11 +8,11 @@ import("Sql_lib");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
queryCondition = "where RELATION.RELATIONID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
queryCondition = "where CONTACT.CONTACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
//TODO: refactor this for incremental indexer (injections?)
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select RELATION.RELATIONID "
sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["ORGANISATION.NAME", "ORGANISATION.CUSTOMERCODE"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
......@@ -22,9 +22,9 @@ sqlQuery = "select RELATION.RELATIONID "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from ORGANISATION "
+ " join RELATION on RELATION.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and RELATION.PERS_ID is null "
+ " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = RELATION.ADDRESS_ID "
+ " left join COMMUNICATION on COMMUNICATION.RELATION_ID = RELATION.RELATIONID "
+ " join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null "
+ " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID "
+ " left join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID "
+ (queryCondition || "")
+ " order by RELATION.RELATIONID ";
+ " order by CONTACT.CONTACTID ";
result.string(sqlQuery);
\ No newline at end of file
aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js → aliasDefinition/Data_alias/indexsearchgroups/organisation/subQueries.js
+ 1
− 1
View file @ 00f70876
import("system.result");
result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.RELATION_ID = '@@@'");
\ No newline at end of file
result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'");
\ No newline at end of file
aliasDefinition/Data_alias/indexsearchgroups/pers/affectedIds.js
+ 8
− 8
View file @ 00f70876
......@@ -15,25 +15,25 @@ infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, var
switch (tableName)
{
case "RELATION":
case "CONTACT":
res = [idValue];
break;
case "PERS":
res = db.array(db.COLUMN, "select RELATION.RELATIONID from RELATION where RELATION.PERS_ID = '" + idValue + "'");
case "PERSON":
res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID = '" + idValue + "'");
break;
case "ORGANISATION":
res = db.array(db.COLUMN, "select RELATION.RELATIONID from RELATION where RELATION.PERS_ID is not null and RELATION.ORGANISATION_ID = '" + idValue + "'");
res = db.array(db.COLUMN, "select CONTACT.CONTACTID from CONTACT where CONTACT.PERSON_ID is not null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
break;
case "ADDRESS":
res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from ADDRESS where ADDRESS.ADDRESSID = ?", [
[id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
]]);
});
break;
case "COMMUNICATION":
res = IndexsearchUtils.getAffectedIdValues("RELATION_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.RELATION_ID from COMMUNICATION where COMMUNICATIONID = ?", [
res = IndexsearchUtils.getAffectedIdValues("CONTACT_ID", infoContainer, function (id){
return db.array(db.COLUMN, ["select ADDRESS.CONTACT_ID from COMMUNICATION where COMMUNICATIONID = ?", [
[id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
]]);
});
......
aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
+ 9
− 9
View file @ 00f70876
......@@ -7,12 +7,12 @@ import("Sql_lib");
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
queryCondition = "where RELATION.RELATIONID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
queryCondition = "where CONTACT.CONTACTID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
//TODO: refactor this for incremental indexer (injections?)
}
sqlHelper = new SqlMaskingUtils();
sqlQuery = "select RELATION.RELATIONID "
+ "," + sqlHelper.concat(["PERS.SALUTATION", "PERS.FIRSTNAME", "PERS.LASTNAME", "ORGANISATION.NAME"])
sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "ORGANISATION.NAME"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
......@@ -20,11 +20,11 @@ sqlQuery = "select RELATION.RELATIONID "
,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from PERS "
+ " join RELATION on RELATION.PERS_ID = PERS.PERSID "
+ " join ORGANISATION on RELATION.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
+ " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = RELATION.ADDRESS_ID "
+ " left join COMMUNICATION on COMMUNICATION.RELATION_ID = RELATION.RELATIONID "
+ " from PERSON "
+ " join CONTACT on CONTACT.PERSON_ID = PERSON.PERSONID "
+ " join ORGANISATION on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID "
+ " left join ADDRESS defaultAddress on defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID "
+ " left join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID "
+ (queryCondition || "")
+ " order by RELATION.RELATIONID ";
+ " order by CONTACT.CONTACTID ";
result.string(sqlQuery);
\ No newline at end of file
aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
+ 1
− 1
View file @ 00f70876
import("system.result");
result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.RELATION_ID = '@@@'");
\ No newline at end of file
result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.CONTACT_ID = '@@@'");
\ No newline at end of file
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 1
− 1
View file @ 00f70876
......@@ -6,7 +6,7 @@
<node name="CONTACTS" kind="123" title="Contactmanagement">
<icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title="">
<node name="Contact_context" kind="10077" />
<node name="Person_context" kind="10077" />
<node name="Organisation_context" kind="10077" />
<node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" />
......
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 31
− 0
View file @ 00f70876
......@@ -13,10 +13,14 @@
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
<consumer>Contexts</consumer>
<linkedContext>Context_context</linkedContext>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
<title>Beziehung</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
</entityField>
<entityField>
......@@ -37,6 +41,8 @@
<entityProvider>
<name>Link</name>
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>OBJECT_TYPE</targetContextField>
<targetIdField>OBJECT_ROWID</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
......@@ -47,6 +53,31 @@
</entityDependency>
</dependencies>
</entityProvider>
<entityConsumer>
<name>Objects</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Object_entity</entityName>
<fieldName>AllObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectType_param</name>
<code>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Contexts</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Context_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js 0 → 100644
+ 9
− 0
View file @ 00f70876
import("system.result");
import("system.neon");
import("system.vars");
import("system.project");
if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
{
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
}
\ No newline at end of file
entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/code.js 0 → 100644
+ 4
− 0
View file @ 00f70876
import("system.result");
import("system.vars");
result.string(vars.get("$field.OBJECT_TYPE"));
\ No newline at end of file
entity/Activity_entity/Activity_entity.aod
+ 3
− 1
View file @ 00f70876
......@@ -164,10 +164,12 @@
<entityParameter>
<name>Object1Rowid_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
......@@ -232,7 +234,7 @@
</entityDependency>
<entityDependency>
<name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
<entityName>Contact_entity</entityName>
<entityName>Person_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
......
entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js deleted 100644 → 0
+ 0
− 5
View file @ 0e870833
import("system.result");
import("system.vars");
import("Context_lib");
result.string(vars.get("$param.RowId_param"));
\ No newline at end of file
entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js deleted 100644 → 0
+ 0
− 5
View file @ 0e870833
import("system.result");
import("system.vars");
import("Context_lib");
result.string(vars.get("$param.ObjectId_param"));
\ No newline at end of file
entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js deleted 100644 → 0
+ 0
− 3
View file @ 0e870833
import("system.result");
result.string("ACTIVITY");
\ No newline at end of file
entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js deleted 100644 → 0
+ 0
− 5
View file @ 0e870833
import("system.vars");
import("system.result");
import("Context_lib");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
entity/Activity_entity/entityfields/objectid_param/documentation.adoc
+ 1
− 1
View file @ 00f70876
The `ObjectId_param`-param specifies the object type of a `RowId_param`.
For example if you pass a `RELATIONID` [of a contactperson] as `RowId_param` you've to specify the type[the `ObjObjectId_param`] as contactperson.
For example if you pass a `CONTACTID` [of a contactperson] as `RowId_param` you've to specify the type[the `ObjObjectId_param`] as contactperson.
entity/Address_entity/Address_entity.aod
+ 15
− 15
View file @ 00f70876
......@@ -53,9 +53,9 @@
<title>Region</title>
</entityField>
<entityField>
<name>RELATION_ID</name>
<name>CONTACT_ID</name>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/relation_id/valueProcess.js</valueProcess>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATE</name>
......@@ -82,8 +82,8 @@
</dependencies>
<children>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js</code>
<name>ContactType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code>
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
......@@ -102,15 +102,15 @@
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
<entityName>Contact_entity</entityName>
<entityName>Person_entity</entityName>
<fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js</code>
<name>ContactType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
......@@ -137,15 +137,15 @@
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
<entityName>Contact_entity</entityName>
<entityName>Person_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/relationtype_param/code.js</code>
<name>ContactType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code>
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
......@@ -162,13 +162,13 @@
<expose v="true" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
<description>provide a ADDRESSID-value of the standard address (of a RELATION)</description>
<description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
</entityParameter>
<entityParameter>
<name>RelationType_param</name>
<name>ContactType_param</name>
<expose v="true" />
<mandatory v="true" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/relationtype_param/documentation.adoc</documentation>
<documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
</entityFields>
......@@ -227,8 +227,8 @@
<recordfield>ADDRESS.REGION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATION_ID.value</name>
<recordfield>ADDRESS.RELATION_ID</recordfield>
<name>CONTACT_ID.value</name>
<recordfield>ADDRESS.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATE.value</name>
......
entity/Address_entity/conditionProcess.js
+ 1
− 1
View file @ 00f70876
......@@ -2,6 +2,6 @@ import("system.result");
import("system.vars");
if(vars.exists("$param.RelId_param") && vars.get("$param.RelId_param") != null && vars.get("$param.RelId_param") != "")
result.string("ADDRESS.RELATION_ID = ('" + vars.getString("$param.RelId_param") + "')");
result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.RelId_param") + "')");
else
result.string("1 = 1");
entity/Address_entity/documentation.adoc
+ 1
− 1
View file @ 00f70876
......@@ -7,4 +7,4 @@ an entity for logic behind a postal address
The entity manages storing postal addresses and provides features like validation.
Every `RELATION` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
Every `CONTACT` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
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