From 3e79172e5ff7c95abe89ddd0c4382fd4adc3f6ae Mon Sep 17 00:00:00 2001
From: "d.lechner" <d.lechner@adito.de>
Date: Thu, 11 Apr 2019 10:43:02 +0200
Subject: [PATCH] Added Attributes
---
.../AttributeRelationTree_entity.aod | 6 +++
.../AttributeRelation_entity.aod | 6 +++
.../DocumentTemplate_entity.aod | 38 +++++++++++++++++++
.../objectrowid_param/valueProcess.js | 4 ++
.../children/objecttype_param/valueProcess.js | 4 ++
.../objectrowid_param/valueProcess.js | 4 ++
.../children/objecttype_param/valueProcess.js | 4 ++
.../AttributeRelationTree_view.aod | 37 +++++++++---------
.../DocumentTemplateEdit_view.aod | 5 +++
.../DocumentTemplateFilter_view.aod | 1 +
.../DocumentTemplatePreview_view.aod | 5 +++
11 files changed, 96 insertions(+), 18 deletions(-)
create mode 100644 entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
create mode 100644 entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
create mode 100644 entity/DocumentTemplate_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
create mode 100644 entity/DocumentTemplate_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
diff --git a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
index bb483a46ac..c550e09227 100644
--- a/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
+++ b/entity/AttributeRelationTree_entity/AttributeRelationTree_entity.aod
@@ -72,6 +72,12 @@
<fieldName>AttributeTree</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>222a758c-5b7b-44ab-acc5-80b2e446c46b</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>AttributeTree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
</entityFields>
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index d06a6101b3..5d369a0fe4 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -105,6 +105,12 @@
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>f49f564d-2378-4551-a4e9-afb63594f168</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 3aae3dc9cb..999274768e 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -103,6 +103,44 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelationTree_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..8664993b9e
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..e8b4e72e74
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/DocumentTemplate_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000..8664993b9e
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..e8b4e72e74
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index 47d34ce205..7c11a4e79a 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,18 +1,19 @@
-<?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>AttributeRelationTree_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeViewTemplate>
- <name>AttributeRelationTree</name>
- <parentField>PARENT_ID</parentField>
- <titleField>TITLE</titleField>
- <entityField>#ENTITY</entityField>
- </treeViewTemplate>
- </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>AttributeRelationTree_view</name>
+ <title>Attributes</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeViewTemplate>
+ <name>AttributeRelationTree</name>
+ <parentField>PARENT_ID</parentField>
+ <titleField>TITLE</titleField>
+ <entityField>#ENTITY</entityField>
+ </treeViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index 21122afc39..7834db8477 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -39,5 +39,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>f146618e-4690-46da-bc02-ea57f3019f02</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
index 85bb1004a4..a9985ee8f2 100644
--- a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -4,6 +4,7 @@
<title>Document Template</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:FILE_FONT</icon>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index 95c1b5c581..2413830135 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -20,5 +20,10 @@
<entityField>Documents</entityField>
<view>DocumentList_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ba313d4c-e5c0-4077-8ae2-bc1f3c86d747</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab