From 6b94d1099d8f4c6758a3e8bbb1d731f99a9696d8 Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Fri, 14 Dec 2018 11:05:18 +0100 Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?= =?UTF-8?q?=201029657][Produktbeschreiung=20hinzuf=C3=BCgen]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/Product_entity/Product_entity.aod | 5 ++++ .../Product_context/Product_context.aod | 4 ++++ .../ProductDescription_view.aod | 24 +++++++++++++++++++ .../ProductEdit_view/ProductEdit_view.aod | 4 ++++ .../ProductMain_view/ProductMain_view.aod | 5 ++++ others/db_changes/struct/create_product.xml | 1 + 6 files changed, 43 insertions(+) create mode 100644 neonView/ProductDescription_view/ProductDescription_view.aod diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index b353b91a44..45f279922b 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -261,6 +261,11 @@ <fieldName>ProductRelation_dfi</fieldName> </dependency> </entityOutgoingField> + <entityField> + <name>INFO</name> + <title>Description</title> + <contentType>LONG_TEXT</contentType> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/neonContext/Product_context/Product_context.aod b/neonContext/Product_context/Product_context.aod index aaded98da9..af76f2c8c7 100644 --- a/neonContext/Product_context/Product_context.aod +++ b/neonContext/Product_context/Product_context.aod @@ -26,5 +26,9 @@ <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name> <view>ProductPreview_view</view> </neonViewReference> + <neonViewReference> + <name>f5f7c429-56ca-421e-8e43-e8da14ca88a0</name> + <view>ProductDescription_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/ProductDescription_view/ProductDescription_view.aod new file mode 100644 index 0000000000..4652da43d2 --- /dev/null +++ b/neonView/ProductDescription_view/ProductDescription_view.aod @@ -0,0 +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.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1"> + <name>ProductDescription_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <genericViewTemplate> + <name>ProductDescription_template</name> + <showDrawer v="true" /> + <drawerCaption>Description</drawerCaption> + <entityField>#ENTITY</entityField> + <fields> + <entityFieldLink> + <name>cd7cd596-0f25-4067-9aac-5ee188a3af64</name> + <entityField>INFO</entityField> + </entityFieldLink> + </fields> + </genericViewTemplate> + </children> +</neonView> diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod index 529d8295e4..c660b04f21 100644 --- a/neonView/ProductEdit_view/ProductEdit_view.aod +++ b/neonView/ProductEdit_view/ProductEdit_view.aod @@ -37,6 +37,10 @@ <name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name> <entityField>PRODUCTNAME</entityField> </entityFieldLink> + <entityFieldLink> + <name>07f4aa57-24e9-4ce2-8b81-c4a3e8bcbce6</name> + <entityField>INFO</entityField> + </entityFieldLink> <entityFieldLink> <name>49b07dd2-1ee1-4b80-88a7-daf4879848d2</name> <entityField>STATUS</entityField> diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod index d0ded2cb5d..b3b7e85ced 100644 --- a/neonView/ProductMain_view/ProductMain_view.aod +++ b/neonView/ProductMain_view/ProductMain_view.aod @@ -14,6 +14,11 @@ <entityField>#ENTITY</entityField> <view>ProductPreview_view</view> </neonViewReference> + <neonViewReference> + <name>51f37fe5-91e1-4b76-83b3-be0319e871a4</name> + <entityField>#ENTITY</entityField> + <view>ProductDescription_view</view> + </neonViewReference> <neonViewReference> <name>7f416115-ff89-45ca-be10-ed568cac266c</name> <entityField>ProductProd2prod_dfo</entityField> diff --git a/others/db_changes/struct/create_product.xml b/others/db_changes/struct/create_product.xml index 7066b39170..1eb1c34a05 100644 --- a/others/db_changes/struct/create_product.xml +++ b/others/db_changes/struct/create_product.xml @@ -13,6 +13,7 @@ <constraints nullable="false" unique="true" uniqueConstraintName="UNIQUE_PRODUCT_PRODUCTCODE"/> </column> <column name="PRODUCTNAME" type="NVARCHAR(50)"/> + <column name="INFO" type="NCLOB"/> <column name="STATUS" type="INTEGER"/> <column name="UNIT" type="INTEGER"/> <column name="STANDARD" type="INTEGER"/> -- GitLab