From 083d276ca2248f84177fbfb10b7620718b9fa3d8 Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Tue, 4 Dec 2018 12:00:04 +0100 Subject: [PATCH] offer move header and footer to detail --- neonContext/Offer_context/Offer_context.aod | 4 +++ .../OfferDetail_view/OfferDetail_view.aod | 27 +++++++++++++++++++ neonView/OfferEdit_view/OfferEdit_view.aod | 12 +++++++++ neonView/OfferMain_view/OfferMain_view.aod | 5 ++++ .../OfferPreview_view/OfferPreview_view.aod | 8 ------ 5 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 neonView/OfferDetail_view/OfferDetail_view.aod diff --git a/neonContext/Offer_context/Offer_context.aod b/neonContext/Offer_context/Offer_context.aod index 37a7a890e1..ac38442f98 100644 --- a/neonContext/Offer_context/Offer_context.aod +++ b/neonContext/Offer_context/Offer_context.aod @@ -25,5 +25,9 @@ <name>c7f456ce-a141-436b-ad4b-7007a95eae04</name> <view>OfferPreview_view</view> </neonViewReference> + <neonViewReference> + <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name> + <view>OfferDetail_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferDetail_view/OfferDetail_view.aod new file mode 100644 index 0000000000..937cdf6410 --- /dev/null +++ b/neonView/OfferDetail_view/OfferDetail_view.aod @@ -0,0 +1,27 @@ +<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0"> + <name>OfferDetail_view</name> + <title>Detail</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <genericViewTemplate> + <name>OfferDetail_template</name> + <entityField>#ENTITY</entityField> + <fields> + <entityFieldLink> + <name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name> + <entityField>HEADER</entityField> + </entityFieldLink> + <entityFieldLink> + <name>d6f2774b-34c2-4db8-9730-e98b4c83503a</name> + <entityField>FOOTER</entityField> + </entityFieldLink> + </fields> + </genericViewTemplate> + </children> +</neonView> diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod index 52ce916b39..1a97c05548 100644 --- a/neonView/OfferEdit_view/OfferEdit_view.aod +++ b/neonView/OfferEdit_view/OfferEdit_view.aod @@ -41,6 +41,18 @@ <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name> <entityField>CURRENCY</entityField> </entityFieldLink> + <entityFieldLink> + <name>af28d95c-8093-4fb0-ad0f-7cb180939175</name> + <entityField>DATE_EDIT</entityField> + </entityFieldLink> + <entityFieldLink> + <name>ed71986f-303c-4118-a895-51ec31ba8775</name> + <entityField>HEADER</entityField> + </entityFieldLink> + <entityFieldLink> + <name>c4b3c8ed-4625-4785-abc6-c726171ff7f4</name> + <entityField>FOOTER</entityField> + </entityFieldLink> </fields> </genericViewTemplate> </children> diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod index d3263633c5..54b478bbf3 100644 --- a/neonView/OfferMain_view/OfferMain_view.aod +++ b/neonView/OfferMain_view/OfferMain_view.aod @@ -19,5 +19,10 @@ <entityField>OfferOfferitem_dfo</entityField> <view>OfferitemFilter_view</view> </neonViewReference> + <neonViewReference> + <name>e6b12eed-d67e-467c-9302-f6340f901235</name> + <entityField>#ENTITY</entityField> + <view>OfferDetail_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod index 9f42c58c3b..c09f491ad0 100644 --- a/neonView/OfferPreview_view/OfferPreview_view.aod +++ b/neonView/OfferPreview_view/OfferPreview_view.aod @@ -56,14 +56,6 @@ <name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name> <entityField>SALESPROJECT_ID</entityField> </entityFieldLink> - <entityFieldLink> - <name>683e3a86-0f9f-4b40-85c0-ae102a5a4a9a</name> - <entityField>HEADER</entityField> - </entityFieldLink> - <entityFieldLink> - <name>2ca09b0d-bdee-49e0-a022-cb4a4d891752</name> - <entityField>FOOTER</entityField> - </entityFieldLink> </fields> </genericViewTemplate> </children> -- GitLab