diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 9d47a294f6041c0368594d5d8224488b77e894b9..1e6b211227cc503a3112093467a73cf1e63d2ced 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Activity_entity</name>
- <title>Activity</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
+ <title>Activity</title>
<afterUiInit>%aditoprj%/entity/Activity_entity/afterUiInit.js</afterUiInit>
<iconId>NEON:HISTORY</iconId>
<image>VAADIN:SHOP</image>
@@ -360,7 +360,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -402,7 +402,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
deleted file mode 100644
index b0c1cc1dc3b026692007e5bac012f544d0906f30..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
- <name>AttributeRelationTree_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>PARENT_ID</name>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>TreeProvider</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
- <entityName>Person_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
- <entityName>Product_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
- <entityName>Activity_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
- <entityName>Contract_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
- <entityName>Employee_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
- <entityName>Order_entity</entityName>
- <fieldName>AttributeTree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>AB_ATTRIBUTE_ID</name>
- <title>Attribute</title>
- <consumer>SpecificAttribute</consumer>
- <onValueChange>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>VALUE</name>
- <title>Value</title>
- <contentTypeProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
- <resolution>DAY</resolution>
- <mandatoryProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/mandatoryProcess.js</mandatoryProcess>
- <dropDownProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
- <stateProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/value/stateProcess.js</stateProcess>
- </entityField>
- <entityConsumer>
- <name>SpecificAttribute</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>AttributeCount_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>edit</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <iconId>NEON:PENCIL</iconId>
- <stateProcess>%aditoprj%/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT_ID.value</element>
- <element>VALUE.value</element>
- <element>VALUE.displayValue</element>
- <element>AB_ATTRIBUTE_ID.value</element>
- <element>AB_ATTRIBUTE_ID.displayValue</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js
deleted file mode 100644
index 1cebe1b3feaf01b51d151221f833a7255541bfb5..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/entityfields/ab_attribute_id/onValueChange.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
- vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- neon.setFieldValue("$field.VALUE", null);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js
deleted file mode 100644
index 1600aca0c7b87edeec96b9ee5b8424eb9aa55d38..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/stateProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("Attribute_lib");
-
-var state = neon.COMPONENTSTATE_DISABLED;
-if (vars.exists("$local.rows"))
-{
- var row = JSON.parse(vars.get("$local.rows"))[0];
- if (row.AB_ATTRIBUTE_ID)
- state = neon.COMPONENTSTATE_EDITABLE;
-}
-result.string(state);
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js b/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 5c2ba1e99bd66da1cbc065319b7644302880879f..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js b/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js
deleted file mode 100644
index 219317e107752606f09b507bbdd68e17a018af4c..0000000000000000000000000000000000000000
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onDelete.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Sql_lib");
-import("system.db");
-
-if (vars.get("$field.AB_ATTRIBUTE_ID"))
-{
- db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.begin().andPrepareVars("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", "$field.UID").build("1=2"));
- neon.refresh();
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index eaec031a3da11d316e6069b3013480b86e5cd69d..c5fcfd60f6883b9ed352f4c8d9806d01afeb17c2 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,180 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>AttributeRelation_entity</name>
- <title>Attribute Relation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/AttributeRelation_entity/documentation.adoc</documentation>
- <recordContainer>db</recordContainer>
+ <recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
- <name>AB_ATTRIBUTERELATIONID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js</valueProcess>
+ <name>PARENT_ID</name>
</entityField>
<entityField>
- <name>AB_ATTRIBUTE_ID</name>
- <title>Attribute</title>
- <consumer>SpecificAttribute</consumer>
- <mandatory v="false" />
- <groupable v="true" />
- <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>valueProxy</name>
- <title>Value</title>
- <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
- <resolution>DAY</resolution>
- <mandatory v="false" />
- <mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js</mandatoryProcess>
- <dropDownProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js</dropDownProcess>
- <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>CHAR_VALUE</name>
- <mandatory v="false" />
- <searchable v="false" />
+ <name>UID</name>
</entityField>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
<entityProvider>
- <name>RelationsForSpecificObject</name>
+ <name>TreeProvider</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
- <name>c0905809-29bd-47bd-a8d2-ee09dd0c9f75</name>
+ <name>e0a7a4bc-ec7f-4f09-9b94-cbeb328cd7b8</name>
<entityName>Organisation_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>236a52d8-830d-4e46-bf9b-7ffaeef25477</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeChildren</fieldName>
+ <name>f29d91fe-2537-486f-b9de-44065a7790d4</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>21de4424-d5e2-4c19-a5e1-1f59dbc186b3</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5bcda86a-e56c-4a4a-ac13-c6eb68152200</name>
+ <name>445c1bd7-4e72-4ab7-a5b1-cc77924eb562</name>
<entityName>Product_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>a9b81050-e7f8-408d-aa73-e2709188e121</name>
- <entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <name>4498139f-067c-4cca-b122-d9bc9100c53d</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>f73a57f2-0697-4ebf-abc1-a7eb24d89fe4</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <name>d6d5f9aa-4582-4ec5-9381-394a38a726e8</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>e5a7ee8b-67da-4a5d-a0cf-09a9f85016eb</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <name>b728166d-a74f-4ca1-8ce7-7e57032f2a7d</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>cb20be7b-35aa-43c7-bf98-3a31010b33d6</name>
+ <name>3921c712-d15c-4941-b04d-44f4536dc404</name>
<entityName>Employee_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>6e01a982-198c-40ab-ae1b-7f5683d33f07</name>
+ <name>148faad1-78f6-4ff2-a4d5-9607d919adb9</name>
<entityName>Salesproject_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
- <name>1d33f00a-203d-4119-9178-c7dc0d087353</name>
+ <name>8ed8bae6-c69e-45ce-9fc9-5fb43587a47b</name>
<entityName>Order_entity</entityName>
- <fieldName>Attributes</fieldName>
+ <fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
- </entityProvider>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>DATE_VALUE</name>
- <contentType>DATE</contentType>
- <searchable v="false" />
- <state>EDITABLE</state>
- </entityField>
- <entityField>
- <name>NUMBER_VALUE</name>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <state>EDITABLE</state>
- </entityField>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>INT_VALUE</name>
- <contentType>BOOLEAN</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ID_VALUE</name>
- <searchable v="false" />
- </entityField>
- <entityConsumer>
- <name>Keywords</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
<children>
<entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
+ <name>GetTree_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
<expose v="false" />
- <triggerRecalculation v="true" />
</entityParameter>
</children>
- </entityConsumer>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
+ </entityProvider>
+ <entityField>
+ <name>AB_ATTRIBUTE_ID</name>
+ <title>Attribute</title>
+ <consumer>SpecificAttribute</consumer>
+ <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>VALUE</name>
+ <title>Value</title>
+ <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js</contentTypeProcess>
+ <resolution>DAY</resolution>
+ <mandatoryProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js</mandatoryProcess>
+ <dropDownProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/value/stateProcess.js</stateProcess>
+ </entityField>
<entityConsumer>
<name>SpecificAttribute</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -190,107 +120,144 @@
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
- <name>FilteredAttributeIds_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
+ <name>AttributeCount_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>edit</name>
+ <fieldType>ACTION</fieldType>
+ <onActionProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <iconId>NEON:PENCIL</iconId>
+ <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityParameter>
- <name>DisplaySimpleName_param</name>
+ <name>GetTree_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>AttributeRelations</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>69560cc2-d92a-453c-9e64-fb712a538c4f</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>34f24d10-7312-4b03-8d6f-2918c8cb9eb8</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3cb1014d-a6c8-4b4a-83ba-a099d4488ab2</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2662f513-6498-40c2-bed6-031087857e82</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>be336d6c-c550-4ae5-9f78-0f2ee56a2a6c</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8488da81-0f98-4c4b-811f-ccda64c8624b</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7df4a57a-646d-4b5a-802b-f1e2bf93d09b</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>40a4c698-d34f-4c5a-bee8-239ee9d71f20</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>99bc7ec8-195e-483f-923e-763c6f28a29c</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>9d2f08b1-065c-45c3-9922-a5fc443684e8</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>GetTree_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
<entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
+ <entityParameter>
+ <name>FilteredAttributes_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>9565b2b1-ace7-4464-ae76-c71bd8f5f676</name>
- <tableName>AB_ATTRIBUTERELATION</tableName>
- <primaryKey>AB_ATTRIBUTERELATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTE_ID.value</name>
- <recordfield>AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTERELATIONID.value</name>
- <recordfield>AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
- <recordfield>AB_ATTRIBUTERELATION.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CHAR_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.DATE_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NUMBER_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ID_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.ID_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>AB_ATTRIBUTERELATION.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>AB_ATTRIBUTERELATION.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>AB_ATTRIBUTERELATION.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>AB_ATTRIBUTERELATION.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INT_VALUE.value</name>
- <recordfield>AB_ATTRIBUTERELATION.INT_VALUE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFields>
+ <element>UID.value</element>
+ <element>PARENT_ID.value</element>
+ <element>VALUE.value</element>
+ <element>VALUE.displayValue</element>
+ <element>AB_ATTRIBUTE_ID.value</element>
+ <element>AB_ATTRIBUTE_ID.displayValue</element>
+ </recordFields>
+ </jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AttributeRelation_entity/documentation.adoc b/entity/AttributeRelation_entity/documentation.adoc
deleted file mode 100644
index 0f6d6bbdb1b45054b3e3b2a23a7665a8a7f74aee..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/documentation.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-Attribute Relation
-==================
-
-----
-an entity for managing values that are set for an attribute
-----
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
deleted file mode 100644
index acda6626ab40309e259438b0dca6da54219b99ec..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-result.string(AttributeUtil.getFullAttributeName(
- vars.get("$field.AB_ATTRIBUTE_ID"),
- vars.exists("$param.DisplaySimpleName_param") ? vars.get("$param.DisplaySimpleName_param") : false ));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
index 132c9bbe345620f8d9fc4550c13dcdb87a493487..1cebe1b3feaf01b51d151221f833a7255541bfb5 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -2,10 +2,7 @@ import("system.vars");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
- vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
- neon.setFieldValue("$field.INT_VALUE", null);
- neon.setFieldValue("$field.CHAR_VALUE", null);
- neon.setFieldValue("$field.DATE_VALUE", null);
- neon.setFieldValue("$field.ID_VALUE", null);
- neon.setFieldValue("$field.NUMBER_VALUE", null);
+ vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ neon.setFieldValue("$field.VALUE", null);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js
deleted file mode 100644
index 53cae9c41bac64b97f2de9f9943570c82b7dc677..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/stateProcess.js
+++ /dev/null
@@ -1 +0,0 @@
-//TODO: the attribute id should be readonly if a value is set
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js
deleted file mode 100644
index 622e00f05f77bd63405f4487831518087cc38d27..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/ab_attributerelationid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.util");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/alter/children/edit/onActionProcess.js
rename to entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ebd67e036f3900b09b82450009d795cd3e7ac9e
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
@@ -0,0 +1,13 @@
+//import("system.result");
+//import("system.vars");
+//import("system.neon");
+//import("Attribute_lib");
+//
+//var state = neon.COMPONENTSTATE_DISABLED;
+//if (vars.exists("$local.rows"))
+//{
+// var row = JSON.parse(vars.get("$local.rows"))[0];
+// if (row.AB_ATTRIBUTE_ID)
+// state = neon.COMPONENTSTATE_EDITABLE;
+//}
+//result.string(state);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
deleted file mode 100644
index 91ca68074f8ae51f3149c59954293133708905ea..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/int_value/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-if(!vars.get("$field.INT_VALUE"))
- result.string("0");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
deleted file mode 100644
index 6c3a508f22bdf1ba7bb7401970a8d6d2d4ab808a..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/keyword/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib")
-
-var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
-attrKeywordSelect = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql(attrKeywordSelect);
-result.string(db.cell(attrKeywordSelect));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
deleted file mode 100644
index 0ad606c237d8cdb5310fa2818e3edd9d14d6ab93..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/keywords/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib")
-
-var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
-attrKeywordSelect = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql(attrKeywordSelect);
-result.string(db.cell(attrKeywordSelect));
diff --git a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
deleted file mode 100644
index 4e3d5a6e480d22383542cbb74c8bc5c9dd2c733d..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param") != null)
- result.string(vars.get("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js b/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
deleted file mode 100644
index 2ce3f28be961ff856705b9dc395e33eb2976f0f2..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") != null)
- result.string(vars.get("$param.ObjectType_param"));
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
rename to entity/AttributeRelation_entity/entityfields/specificattribute/children/attributecount_param/valueProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js
deleted file mode 100644
index 17644822bd69a810a5e2a0c871d651b482e37d6a..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.DisplaySimpleName_param") ? vars.get("$param.DisplaySimpleName_param") : "");
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
deleted file mode 100644
index 0f10b7075d3dbe124dd9048f5ae7b3d092616329..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.FilteredAttributeIds_param") ? vars.get("$param.FilteredAttributeIds_param") : "");
diff --git a/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
deleted file mode 100644
index 71802ad6ba34158c3344111a02c912789ae97f79..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattributes/children/filteredattributeids_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.FilteredAttributeIds_param") ? vars.get("$param.FilteredAttributeIds_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 26ba533642c539c7d4a4f1cf7dd8d306a6d3903e..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/specificattributes/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cda204045d2aba9ae974e0ce2200ba0cc6c852c0
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string(true);
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js b/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js
similarity index 97%
rename from entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js
index e692170633914456e09edf154860eb0a1f6842ef..55d32c91b7003e4a973558a6460268ef5b6d962b 100644
--- a/entity/AttributeRelationTree_entity/entityfields/value/contentTypeProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/value/contentTypeProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
result.string(AttributeTypeUtil.getContentType(attributeType));
\ No newline at end of file
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/dropDownProcess.js b/entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/value/dropDownProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/dropDownProcess.js
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/mandatoryProcess.js b/entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/value/mandatoryProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/mandatoryProcess.js
diff --git a/entity/AttributeRelationTree_entity/entityfields/value/stateProcess.js b/entity/AttributeRelation_entity/entityfields/value/stateProcess.js
similarity index 100%
rename from entity/AttributeRelationTree_entity/entityfields/value/stateProcess.js
rename to entity/AttributeRelation_entity/entityfields/value/stateProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
deleted file mode 100644
index e692170633914456e09edf154860eb0a1f6842ef..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-result.string(AttributeTypeUtil.getContentType(attributeType));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
deleted file mode 100644
index 412402a7e204e4fd01e21b755ae15ab57a5ceaa5..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-import("Keyword_lib");
-
-var attrType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var value;
-if (attrType == $AttributeTypes.COMBO)
- value = AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE"));
-
-//TODO this is a workaround for keywords, when it's possible to use the consumer remove this else if
-else if (attrType == $AttributeTypes.KEYWORD)
-{
- var keywordContainer = db.cell(
- SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql("select KEYWORD_CONTAINER from AB_ATTRIBUTE")
- );
- value = KeywordUtils.getViewValue(keywordContainer, vars.get("$field.ID_VALUE"));
-}
-
-else
- value = vars.get("$field.valueProxy");
-
-result.string(value);
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js
deleted file mode 100644
index 104cdfb69131ecc5c4cd06163ae52cf16283c408..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/dropDownProcess.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-import("Sql_lib");
-
-var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
-var attrType = AttributeUtil.getAttributeType(attributeId);
-
-if (attrType == $AttributeTypes.COMBO)
-{
- var valueSql = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_ACTIVE", "1")
- .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
- .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
- .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE", "1=2", "order by SORTING asc");
- var valueList = db.table(valueSql);
- result.object(valueList);
-}
-else if (attrType == $AttributeTypes.BOOLEAN)
-{
- result.object([
- ["1", translate.text("Yes")],
- ["0", translate.text("No")]
- ]);
-}
-
-//TODO this is a workaround for keywords, when it's possible to use the consumer remove this
-else if (attrType == $AttributeTypes.KEYWORD)
-{
- var attrKeywordSelect = "select KEYWORD_CONTAINER from AB_ATTRIBUTE";
- attrKeywordSelect = SqlCondition.begin()
- .andPrepareVars("AB_ATTRIBUTE.AB_ATTRIBUTEID", "$field.AB_ATTRIBUTE_ID")
- .buildSql(attrKeywordSelect);
-
- var sql = SqlCondition.begin()
- .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", db.cell(attrKeywordSelect))
- .buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE from AB_KEYWORD_ENTRY", "1=2", "order by SORTING asc");
- var keywords = db.table(sql).map(function (row)
- {
- return [row[0], translate.text(row[1])];
- });
- result.object(keywords);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js
deleted file mode 100644
index e60d633a87eef5815501eb3cef2e8d7f69c71c04..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/mandatoryProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var contentType = AttributeTypeUtil.getContentType(attributeType);
-result.string(contentType != null && contentType != "BOOLEAN");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js b/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
deleted file mode 100644
index 44aaa91f083773956443f739a0d9cb8e6705330a..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Entity_lib");
-import("Attribute_lib");
-
-var attrValue = vars.exists("$field.valueProxy") ? vars.get("$field.valueProxy") : "";
-attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
-
-if (attrValue != null)
-{
- var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
- var attrField = (function (pType)
- {
- switch (pType)
- {
- case $AttributeTypes.TEXT.toString():
- case $AttributeTypes.MEMO.toString():
- return "$field.CHAR_VALUE";
- case $AttributeTypes.DATE.toString():
- return "$field.DATE_VALUE";
- case $AttributeTypes.NUMBER.toString():
- return "$field.NUMBER_VALUE";
- case $AttributeTypes.BOOLEAN.toString():
- return "$field.INT_VALUE";
- case $AttributeTypes.COMBO.toString():
- case $AttributeTypes.KEYWORD.toString():
- return "$field.ID_VALUE";
- default:
- return null;
- }
- }).call(null, attributeType);
-
- if (attrField)
- neon.setFieldValue(attrField, attrValue);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js
deleted file mode 100644
index 62f33ac87ce0bb62f052b945600933cf1b80cb2f..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/stateProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
-var fieldState;
-if (AttributeTypeUtil.getContentType(attributeType) != null)
- fieldState = neon.COMPONENTSTATE_EDITABLE;
-else
- fieldState = neon.COMPONENTSTATE_READONLY;
-
-result.string(fieldState);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
deleted file mode 100644
index 10d3aadcf50110dd9da7e5b189729ebd2f8174dd..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- var rowId = vars.get("$param.ObjectRowId_param");
- var objectType = vars.get("$param.ObjectType_param");
- var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
-
- var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
- var attrField = (function (type)
- {
- switch (type)
- {
- case $AttributeTypes.TEXT.toString():
- case $AttributeTypes.MEMO.toString():
- return "$field.CHAR_VALUE";
- case $AttributeTypes.DATE.toString():
- return "$field.DATE_VALUE";
- case $AttributeTypes.NUMBER.toString():
- return "$field.NUMBER_VALUE";
- case $AttributeTypes.BOOLEAN.toString():
- return "$field.INT_VALUE";
- case $AttributeTypes.COMBO.toString():
- case $AttributeTypes.KEYWORD.toString():
- return "$field.ID_VALUE";
- }
- }).call(null, attributeType);
- var value = null;
- if (attrField != null) //load the value from the correct field for the type
- value = vars.get(attrField);
-
- if(value != null && value != "")
- result.string(value);
- else if (attributeType == $AttributeTypes.VOID)
- result.string("");
-}
-
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index 067a0196f0b0bc7dd086dae9f2cdab2611ae8dd7..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var condition = new SqlCondition();
-
-if (vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
-{
- condition.andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.ObjectRowId_param")
- .andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_TYPE", "$param.ObjectType_param");
- if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
- {
- var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
- var filteredIdsCondition = new SqlCondition();
-
- filteredIds.forEach(function(id)
- {
- this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
- }, filteredIdsCondition);
-
- condition.andSqlCondition(filteredIdsCondition);
- }
-}
-result.string(db.translateCondition(condition.build("1=2")));
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
similarity index 77%
rename from entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
rename to entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index 71b97a1051d5bd3a170845c52e8bfcd419f7355a..4fac082d7af1f6c25323051ce6e0cf87b616c61a 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -6,6 +6,8 @@ import("Sql_lib");
var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
+var getTree = vars.exists("$param.GetTree_param") && vars.getString("$param.GetTree_param") == "true";
+var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
var allAttributes = [];
var attributeObj = {};
var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', '', ATTRIBUTE_NAME from AB_ATTRIBUTE";
@@ -21,12 +23,26 @@ if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
idCond.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
});
attrCond.andSqlCondition(idCond);
+ getTree = false;
}
else if (rowId)
{
attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
if (objectType != null)
attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+
+ if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
+ {
+ var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
+ var filteredIdsCondition = new SqlCondition();
+
+ filteredIds.forEach(function(id)
+ {
+ this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
+ }, filteredIdsCondition);
+
+ attrCond.andSqlCondition(filteredIdsCondition);
+ }
}
var defaultFields = [
"AB_ATTRIBUTERELATIONID",
@@ -47,6 +63,11 @@ var attributeValues = db.table(attributeSql).map(function (row)
{
let attributeId = row[1];
let attributeName = row[4];
+ if (!getTree && !displaySimpleName && row[2])
+ {
+ let parentName = AttributeUtil.getFullAttributeName(row[2]);
+ attributeName = (parentName ? parentName + " / " : "") + attributeName;
+ }
let value = row[AttributeTypeUtil.getTypeColumnIndex(row[3]) + defaultFields.length];
let viewValue;
if (row[3].trim() == $AttributeTypes.COMBO)
@@ -57,12 +78,11 @@ var attributeValues = db.table(attributeSql).map(function (row)
return [row[0], row[2], value, viewValue, attributeId, attributeName];
});
-
-_fetchAttributes(attributeValues.map(function (row) {return row[1]}));
+if (getTree)
+ _fetchAttributes(attributeValues.map(function (row) {return row[1]}));
allAttributes = _sortArrayForTree(allAttributes).concat(attributeValues);
-
result.object(allAttributes);
function _fetchAttributes (pAttributeIds)
@@ -90,6 +110,8 @@ function _fetchAttributes (pAttributeIds)
function _sortArrayForTree (pArray)
{
+ if (pArray.length <= 1)
+ return pArray;
var rows = {};
var allIds = {};
var idIndex = 0;
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..ceb46c3e0c977ab16c75822061a0472088410aea
--- /dev/null
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+
+if (vars.get("$field.AB_ATTRIBUTE_ID"))
+{
+ db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
+ neon.refresh();
+}
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
similarity index 88%
rename from entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
rename to entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
index 966cc3043ec5a1db5f1e2c05fa1e7e92c83c1f04..a66bb8f178cd09c7df3b9433e7953f9f7ba7fc4d 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js
@@ -13,12 +13,12 @@ var columns = [
"USER_NEW"
];
var values = [
- util.getNewUUID(),
+ vars.get("$field.UID"),
vars.get("$field.AB_ATTRIBUTE_ID"),
vars.get("$param.ObjectRowId_param"),
vars.get("$param.ObjectType_param"),
- vars.get("$sys.date"),
- vars.get("$sys.user")
+ vars.get("$field.DATE_NEW"),
+ vars.get("$field.USER_NEW")
];
var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var valueField = AttributeTypeUtil.getDatabaseField(type);
diff --git a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
similarity index 79%
rename from entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
rename to entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
index 6eb94014514b4a6aa7fc68f96c4666019ad2d78a..b5eefe863b08101fa13a4a85ea32af8582f63f69 100644
--- a/entity/AttributeRelationTree_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
@@ -13,8 +13,8 @@ var columns = [
];
var values = [
vars.get("$field.AB_ATTRIBUTE_ID"),
- vars.get("$sys.date"),
- vars.get("$sys.user")
+ vars.get("$field.DATE_EDIT"),
+ vars.get("$field.USER_EDIT")
];
var dbFields = AttributeTypeUtil.getAllDatabaseFields();
@@ -26,4 +26,4 @@ dbFields.forEach(function (row)
values[AttributeTypeUtil.getTypeColumnIndex(type) + 3] = vars.get("$field.VALUE");
db.updateData("AB_ATTRIBUTERELATION", columns, null, values,
- SqlCondition.begin().andPrepareVars("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", "$field.UID").build("1=2"));
\ No newline at end of file
+ SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 9b5d377d95dc6216db834559c4c1a0bf68f162e9..fc342d1d68a2b9f8ae44dbc8ff950e59d6daf0c8 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Attribute_entity</name>
- <title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
+ <title>Attribute</title>
<afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
<iconId>VAADIN:TAG</iconId>
@@ -179,12 +179,6 @@
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>UID</lookupIdfield>
<dependencies>
- <entityDependency>
- <name>342e8ba6-db61-411b-9f79-e9271335b00f</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>SpecificAttribute</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>ba3b4d47-7385-49df-bf61-54c99f5b2c81</name>
<entityName>AttributeRelationTree_entity</entityName>
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 7138f08073c5716c5d7aa7cf35861251d5ddecfa..a257bdc20daff4ba370a5cbe409550440ef8612c 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -13,8 +13,8 @@ var sqlSelect = "select SELF.AB_ATTRIBUTEID, SELF.ATTRIBUTE_PARENT_ID, SELF.ATTR
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.attributeType(), "SELF.ATTRIBUTE_TYPE") //3
+ ", '', SELF.ATTRIBUTE_NAME, PARENT1.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_NAME, PARENT2.ATTRIBUTE_PARENT_ID "
+ "from AB_ATTRIBUTE SELF "
- + "left join AB_ATTRIBUTE PARENT1 on SELF.ATTRIBUTE_PARENT_ID = PARENT1.AB_ATTRIBUTEID "
- + "left join AB_ATTRIBUTE PARENT2 ON PARENT1.ATTRIBUTE_PARENT_ID = PARENT2.AB_ATTRIBUTEID";
+ + "left join AB_ATTRIBUTE PARENT1 on SELF.ATTRIBUTE_PARENT_ID = PARENT1.AB_ATTRIBUTEID " //always select the names of the next 2 parents so that less queries
+ + "left join AB_ATTRIBUTE PARENT2 ON PARENT1.ATTRIBUTE_PARENT_ID = PARENT2.AB_ATTRIBUTEID"; //are required later when buildung the full name
var condition = SqlCondition.begin();
var sqlOrder = " order by SELF.ATTRIBUTE_PARENT_ID asc, SELF.SORTING asc";
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index fcac2f5cbf4f5775864bc6845a0244bee4d86ea1..35b4cbcda85cebd6dbeb7f3cf0844b020ab4ee87 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Contract_entity</name>
- <title>Contract</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
+ <title>Contract</title>
<afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:FILE_TEXT</iconId>
<titleProcess>%aditoprj%/entity/Contract_entity/titleProcess.js</titleProcess>
@@ -300,7 +300,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -323,7 +323,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index f7904d74a5f48750d924f6a0786824d6988d6e47..89887fcbab0ae68b16bf93603a4a6c10e88a4643 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -111,7 +111,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -181,7 +181,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d8d4f2b4d157abcd69062d6799cc6e15112588bf..f51d31398a7fae0ac5ef85a60b6c3819aaf2601f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Offer_entity</name>
- <title>Offer</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
+ <title>Offer</title>
<afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:CART</iconId>
<titleProcess>%aditoprj%/entity/Offer_entity/titleProcess.js</titleProcess>
@@ -624,7 +624,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -653,7 +653,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 197dad83f612a49af47bf090e9f4e9bddee8ffda..6b64d028aaab82c869c52bba0bb13bd98bc801ae 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Order_entity</name>
- <title>Receipt</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
+ <title>Receipt</title>
<afterUiInit>%aditoprj%/entity/Order_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:DOLLAR</iconId>
<titleProcess>%aditoprj%/entity/Order_entity/titleProcess.js</titleProcess>
@@ -443,7 +443,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -462,7 +462,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index ef084b993528bee840ace48a489d443730f8403c..3a19929b8f7c4d6b003f6f5d9102a5f3768c970e 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Organisation_entity</name>
- <title>Company</title>
<description>former Org</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Organisation_entity/documentation.adoc</documentation>
+ <title>Company</title>
<afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:BUILDING</iconId>
<imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
@@ -365,7 +365,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -377,7 +377,6 @@
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -713,7 +712,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 416a1bb94be424ac69d458654973b4d6070eacbe..4c1762ab21483c24bc488c6bb6e1f89761652bad 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Person_entity</name>
- <title>Contact</title>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
+ <title>Contact</title>
<afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
<iconId>VAADIN:USERS</iconId>
@@ -570,7 +570,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -581,7 +581,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
<triggerRecalculation v="true" />
</entityParameter>
</children>
@@ -809,7 +808,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d90fa0affa858861d6744471be0936bf23d77788..6bea474d3b93b447d5deed790a14f29247093b8a 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Product_entity</name>
- <title>Product</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
+ <title>Product</title>
<afterUiInit>%aditoprj%/entity/Product_entity/afterUiInit.js</afterUiInit>
<iconId>VAADIN:HAMMER</iconId>
<titleProcess>%aditoprj%/entity/Product_entity/titleProcess.js</titleProcess>
@@ -348,7 +348,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -420,7 +420,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 3cce36f25a3003e6a3d2b4b65ffea5aa7d574b28..55f0e4cb6878bea4d5f00d75201ac178dc5c4283 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>SalesprojectCompetition_entity</name>
- <title>Competition</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Competition</title>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -237,18 +237,9 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- <triggerRecalculation v="true" />
- </entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
@@ -257,6 +248,14 @@
<name>DisplaySimpleName_param</name>
<valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>FilteredAttributes_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
rename to entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index cf5b6fcfaf15f937f6732b64d3ae57535c33a3d6..6f11296700be03b5ddee2b6b584f838a34ddd670 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.2">
<name>Salesproject_entity</name>
- <title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Salesproject</title>
<afterUiInit>%aditoprj%/entity/Salesproject_entity/afterUiInit.js</afterUiInit>
<afterOperatingState>%aditoprj%/entity/Salesproject_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:BOOK_DOLLAR</iconId>
@@ -566,7 +566,7 @@
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
- <fieldName>RelationsForSpecificObject</fieldName>
+ <fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
@@ -585,7 +585,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>AttributeRelationTree_entity</entityName>
+ <entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index f6365a27cf00e2c7f5ae99430228cd810cbd80a5..6a64d2f7d6dd15ed63f866b1d6f9f9e732042bba 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -1,16 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>AttributeRelation</name>
+ <name>AttributeRelationTree</name>
<title>Attributes</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <editview>AttributeRelationTreeEdit_view</editview>
<entity>AttributeRelation_entity</entity>
<references>
<neonViewReference>
- <name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
- <view>AttributeRelationEdit_view</view>
+ <name>55f89863-72b0-4179-8494-b1e320d79de9</name>
+ <view>AttributeRelationTree_view</view>
</neonViewReference>
<neonViewReference>
- <name>e23b445d-12eb-400c-9153-af6b026654e6</name>
+ <name>591d27d7-e963-4ff0-9d82-2e24b18e6b5c</name>
+ <view>AttributeRelationTreeEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5628f945-6b08-494c-9e7c-ca1c67517b12</name>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b50638d0-30ec-4166-80c0-ab6d0f2180a1</name>
<view>AttributeRelationPreviewList</view>
</neonViewReference>
</references>
diff --git a/neonContext/AttributeRelationTree/AttributeRelationTree.aod b/neonContext/AttributeRelationTree/AttributeRelationTree.aod
deleted file mode 100644
index 73c73bdd8cef6f24e2de33935f66fd29e1201559..0000000000000000000000000000000000000000
--- a/neonContext/AttributeRelationTree/AttributeRelationTree.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>AttributeRelationTree</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <editview>AttributeRelationTreeEdit_view</editview>
- <entity>AttributeRelationTree_entity</entity>
- <references>
- <neonViewReference>
- <name>55f89863-72b0-4179-8494-b1e320d79de9</name>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>591d27d7-e963-4ff0-9d82-2e24b18e6b5c</name>
- <view>AttributeRelationTreeEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonView/ActivityEdit_view/ActivityEdit_view.aod b/neonView/ActivityEdit_view/ActivityEdit_view.aod
index 1a13f58ed9080d11516f1fa978b3c99aecda5eb0..5397d31aab09aeb55e4e43406fbbfb13614bcd16 100644
--- a/neonView/ActivityEdit_view/ActivityEdit_view.aod
+++ b/neonView/ActivityEdit_view/ActivityEdit_view.aod
@@ -50,7 +50,7 @@
<neonViewReference>
<name>7fcf9c09-189a-47b7-a171-9975676ed704</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
similarity index 71%
rename from neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
rename to neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
index a4b17b338e2a385c4383110d588d4df944b965d0..b3f7e06aafeef4f2eac6dc03a9d1c3b864eb7836 100644
--- a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
+++ b/neonView/AttributeRelationMultiEdit_view/AttributeRelationMultiEdit_view.aod
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AttributeRelationEdit_view</name>
+ <name>AttributeRelationMultiEdit_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <boxLayout>
<name>layout</name>
- </noneLayout>
+ </boxLayout>
</layout>
<children>
<genericMultipleViewTemplate>
- <name>MultipleEdit</name>
+ <name>GenericMultiple</name>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>3da856c1-6a5b-4fc3-aa41-0865b331a5e4</name>
+ <name>5ccc9c8e-baee-4506-b4cc-3797be0eb237</name>
<entityField>AB_ATTRIBUTE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>04dda499-d970-41d1-a524-5e354c0d2bfd</name>
- <entityField>valueProxy</entityField>
+ <name>ada9c77a-f37b-4021-a01a-a06edd75cb25</name>
+ <entityField>VALUE</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index 70932bf3595460a7e375d16a4c2fae51f15798b7..3908b6781bff3666e67947c28dad792f585b8c29 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -13,12 +13,12 @@
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
- <name>ca2fb22d-2987-443d-8e69-fccaba68e0c5</name>
+ <name>18c6e169-bd6e-448a-b028-c43f2a6a2973</name>
<entityField>AB_ATTRIBUTE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>a4661c55-6e51-4884-b460-0ef1dca7c5f7</name>
- <entityField>valueProxy</entityField>
+ <name>ec5ceac7-a2d4-4912-b04b-adc83d3e9589</name>
+ <entityField>VALUE</entityField>
</neonTableColumn>
</columns>
</titledListViewTemplate>
diff --git a/neonView/ContractEdit_view/ContractEdit_view.aod b/neonView/ContractEdit_view/ContractEdit_view.aod
index 21e04e53a2be56f8e8c2d0a5a6b3f0b5bdbec3ef..305051621158363a459290695f4bccb398ec38e1 100644
--- a/neonView/ContractEdit_view/ContractEdit_view.aod
+++ b/neonView/ContractEdit_view/ContractEdit_view.aod
@@ -54,7 +54,7 @@
<neonViewReference>
<name>49eafd04-4d72-4a11-8818-97407e0fe154</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
index 766d45a551b95b7988fd3c119c450145322a455c..884520ac52fc84868b8337f68b8ee571b17ab20b 100644
--- a/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
+++ b/neonView/EmployeeEdit_view/EmployeeEdit_view.aod
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>EmployeeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Generic</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
- <entityField>ISACTIVE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
- <entityField>FIRSTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
- <entityField>LASTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9c030b62-bf17-4be1-bcc6-87b304a618c0</name>
- <entityField>TITLE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
- <entityField>EMAIL_ADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6abf045b-88f9-40c9-a009-f85538d6fe23</name>
- <entityField>DEPARTMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
- <entityField>PASSWORD</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
- <entityField>CONFIRM_PASSWORD</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
- <entityField>EmployeeRoles</entityField>
- <view>EmployeeRoleEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>07e77840-e140-4ba0-ac09-d8e10e7d88a2</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>EmployeeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>1925ef51-54a8-41e2-aa78-6d95d1ee4b99</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9170856b-45c2-4d8a-864d-4db36bfe4a8c</name>
+ <entityField>ISACTIVE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7d36467f-8b79-4647-b8e5-5759bdbf37a7</name>
+ <entityField>FIRSTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>00a2dedb-67f5-4662-b053-bf841b30e365</name>
+ <entityField>LASTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9c030b62-bf17-4be1-bcc6-87b304a618c0</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6155e6b7-ee2c-45b4-87f5-9e506ffc5775</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6abf045b-88f9-40c9-a009-f85538d6fe23</name>
+ <entityField>DEPARTMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8cffaf75-f2dc-42c5-95d7-1ce1e4927d8a</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4ad9c1aa-37a9-46f9-a566-94e5be5c2a7f</name>
+ <entityField>PASSWORD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5381db3a-762d-439a-b41b-e4e67edc2099</name>
+ <entityField>CONFIRM_PASSWORD</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>af8112a3-78d3-436f-b665-ebce595a7c24</name>
+ <entityField>EmployeeRoles</entityField>
+ <view>EmployeeRoleEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>07e77840-e140-4ba0-ac09-d8e10e7d88a2</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index ba2428898be40760f5ee4785e95fc00e47a95725..8dae75fcec804d05780df05043f1ccc621f6a26b 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -73,7 +73,7 @@
<neonViewReference>
<name>52f93604-4ec3-427f-b220-27ab63a30560</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 2132b516032ca81b2c1e714ead5d08f216cf47d5..b5c58b6fe86174e241216f40a77120f5692fbe20 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -57,7 +57,7 @@
<neonViewReference>
<name>72e2cb25-23e0-4f52-87a3-7c1bd80e99ec</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 274866d3cfb2339102985a8bceb40b21596ec16b..080b29e16ea4781a2c803798dcee3674b0ed54b0 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -53,9 +53,9 @@
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
<neonViewReference>
- <name>2037ef93-6719-49af-9352-9ca3c03d6972</name>
+ <name>2114d459-851a-4ead-b3ec-a81ec78af607</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index 78930188971155046864647b3f5ea60c6e1d3186..4980ebdd11c47b41d9e8ce026624767dc0eb6463 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -84,7 +84,7 @@
<neonViewReference>
<name>520f3056-2a24-4469-a86f-76ba80090829</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 04a5f765b82c18a34e08728c52168bdd8f3bdd55..7aa52918d62670c48297efd7a109e7bf40f31438 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -62,7 +62,7 @@
<neonViewReference>
<name>34659538-e8a5-4f76-9710-a322548885ef</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index c047336f190676a4a78f522967c83665db265246..b259c9d69e6cd164d272bb9e7da686c512c4f89e 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -65,7 +65,7 @@
<neonViewReference>
<name>fc97f8c8-ffd0-4d67-b331-eab37ef1dc2b</name>
<entityField>Attributes</entityField>
- <view>AttributeRelationEdit_view</view>
+ <view>AttributeRelationMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 615cff9f2c8a321f8b9db481d5f4198be118afd0..0d8b84908b10e42213831fe846712a617822eee2 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -47,6 +47,7 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
SqlCondition.begin()
.orPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId, "# != ?")
.orPrepare("AB_ATTRIBUTEUSAGE.MAX_COUNT", pAttributeCount[attributeId], "# > ?")
+ .or("AB_ATTRIBUTEUSAGE.MAX_COUNT is null")
);
}
}