From f978163ebcb62f5f575ddbd98e08fccfed786760 Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <m.mansour@adito.de>
Date: Wed, 7 Aug 2019 14:28:12 +0200
Subject: [PATCH] Activity themes
---
entity/Activity_entity/Activity_entity.aod | 18 +++++++++++++
.../attributetypes_param/valueProcess.js | 4 +++
.../children/objecttype_param/valueProcess.js | 4 +++
entity/Attribute_entity/Attribute_entity.aod | 8 ++++++
.../ActivityDetail_view.aod | 26 ++++++++-----------
5 files changed, 45 insertions(+), 15 deletions(-)
create mode 100644 entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js
create mode 100644 entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 7ff166bad6..30dd3b8978 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -482,6 +482,24 @@
<name>Subject_param</name>
<expose v="true" />
</entityParameter>
+ <entityConsumer>
+ <name>ActivityAtrributes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AttributeTypes_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js b/entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js
new file mode 100644
index 0000000000..ad16e0d607
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activityatrributes/children/attributetypes_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Attribute_lib");
+
+result.object([$AttributeTypes.THEME.toString()]);
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js b/entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..e8b4e72e74
--- /dev/null
+++ b/entity/Activity_entity/entityfields/activityatrributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 0800311201..e6c9916e66 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -13,6 +13,14 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>0691a752-4e4e-47b7-a376-f39655c0aa6f</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>ActivityAtrributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>ATTRIBUTE_NAME</name>
diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index ce4d5a9a6d..a1502049bc 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -6,23 +6,19 @@
<layout>
<boxLayout>
<name>layout</name>
+ <direction>HORIZONTAL</direction>
</boxLayout>
</layout>
<children>
- <genericViewTemplate>
- <name>OfferInfo</name>
- <editMode v="false" />
- <showDrawer v="true" />
- <drawerCaption></drawerCaption>
- <fixedDrawer v="true" />
- <hideLabels v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>c7e75393-4745-478b-9f89-878b9a19b722</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
+ <neonViewReference>
+ <name>f3e3d589-16a5-45a3-878f-7f00548c4370</name>
+ <entityField>ActivityAtrributes</entityField>
+ <view>AttributeTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9a9c4df0-abec-42b8-af90-b9fe57f28337</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab