From 146b0141633f0fdfe08ae48c274bbf76b5f286e7 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Tue, 28 May 2019 17:09:44 +0200
Subject: [PATCH] Changes task and activity layout (description)

---
 .../ActivityDetail_view/ActivityDetail_view.aod |  3 ++-
 .../ActivityPreview_view.aod                    | 17 +++++++++++++----
 neonView/TaskMain_view/TaskMain_view.aod        | 16 +++++++++-------
 neonView/TaskPreview_view/TaskPreview_view.aod  | 13 +++++++++++++
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/neonView/ActivityDetail_view/ActivityDetail_view.aod b/neonView/ActivityDetail_view/ActivityDetail_view.aod
index 97c355590c2..dcb00d28cde 100644
--- a/neonView/ActivityDetail_view/ActivityDetail_view.aod
+++ b/neonView/ActivityDetail_view/ActivityDetail_view.aod
@@ -13,7 +13,8 @@
       <name>OfferInfo</name>
       <editMode v="false" />
       <showDrawer v="true" />
-      <drawerCaption>Detail</drawerCaption>
+      <drawerCaption></drawerCaption>
+      <fixedDrawer v="true" />
       <hideLabels v="true" />
       <entityField>#ENTITY</entityField>
       <fields>
diff --git a/neonView/ActivityPreview_view/ActivityPreview_view.aod b/neonView/ActivityPreview_view/ActivityPreview_view.aod
index 94937fc368f..63627905d09 100644
--- a/neonView/ActivityPreview_view/ActivityPreview_view.aod
+++ b/neonView/ActivityPreview_view/ActivityPreview_view.aod
@@ -30,10 +30,6 @@
           <name>ad41c89c-2f4a-414c-90c8-d5a5df24aeaa</name>
           <entityField>CATEGORY</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>b0673d1d-af3d-4daa-b6ec-511f18367e7f</name>
-          <entityField>INFO</entityField>
-        </entityFieldLink>
         <entityFieldLink>
           <name>c4569e50-223e-4b99-8253-e8fa72ef45a0</name>
           <entityField>RESPONSIBLE</entityField>
@@ -50,5 +46,18 @@
       <entityField>MainDocuments</entityField>
       <view>DocumentList_view</view>
     </neonViewReference>
+    <genericViewTemplate>
+      <name>Description</name>
+      <showDrawer v="true" />
+      <drawerCaption>Description</drawerCaption>
+      <hideLabels v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>cfdae746-0433-49fa-877d-0c5ca93024e3</name>
+          <entityField>INFO</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 06d66f34d0c..b2e0db985e8 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -5,19 +5,16 @@
   <layout>
     <masterSlaveLayout>
       <name>layout</name>
-      <master>339e160e-e482-4be2-9550-fc06131fbffe</master>
+      <master>bfecc398-890e-485f-afa0-74e24f41b019</master>
     </masterSlaveLayout>
   </layout>
   <children>
-    <neonViewReference>
-      <name>339e160e-e482-4be2-9550-fc06131fbffe</name>
-      <entityField>#ENTITY</entityField>
-      <view>TaskMainPreview_view</view>
-    </neonViewReference>
     <genericViewTemplate>
       <name>details</name>
       <showDrawer v="true" />
-      <drawerCaption>Detail</drawerCaption>
+      <drawerCaption></drawerCaption>
+      <fixedDrawer v="true" />
+      <hideLabels v="false" />
       <entityField>#ENTITY</entityField>
       <title>details</title>
       <fields>
@@ -46,5 +43,10 @@
       <entityField>LogHistories</entityField>
       <view>LogHistoryFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>bfecc398-890e-485f-afa0-74e24f41b019</name>
+      <entityField>#ENTITY</entityField>
+      <view>TaskPreview_view</view>
+    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 822f65baed5..c12e4abf780 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -62,5 +62,18 @@
       <entityField>MainDocuments</entityField>
       <view>DocumentList_view</view>
     </neonViewReference>
+    <genericViewTemplate>
+      <name>Description</name>
+      <showDrawer v="true" />
+      <drawerCaption>Description</drawerCaption>
+      <hideLabels v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>65933f93-96fc-4bfe-9297-7e185868ec77</name>
+          <entityField>DESCRIPTION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>
-- 
GitLab