From 32afa8be1afba2b8fd5d14f9675b83dc626a0808 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 10 Jan 2019 10:29:39 +0100
Subject: [PATCH] test table angebot
---
aliasDefinition/Data_alias/Data_alias.aod | 41 +++++----------
entity/Offeritem_entity/Offeritem_entity.aod | 9 ----
entity/Orderitem_entity/Orderitem_entity.aod | 9 ++--
.../Offeritem_context/Offeritem_context.aod | 4 ++
neonView/OfferEdit_view/OfferEdit_view.aod | 4 +-
.../OfferitemFilter_view.aod | 4 ++
.../OfferitemMultiEdit_view.aod | 4 ++
.../OfferitemMultiEdit_view0.aod | 51 +++++++++++++++++++
.../OfferitemPreview_view.aod | 6 +--
.../OrderitemFilter_view.aod | 4 ++
.../OrderitemMultiEdit_view.aod | 4 ++
.../OrderitemPreview_view.aod | 2 +-
others/db_changes/struct/create_offeritem.xml | 1 -
.../struct/create_salesorderitem.xml | 2 +-
14 files changed, 94 insertions(+), 51 deletions(-)
create mode 100644 neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 952462eb66..6cf60a5dd6 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2548,19 +2548,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>ASSIGNEDTO</name>
<dbName></dbName>
@@ -4744,20 +4731,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>SALESORDER_ID</name>
<dbName></dbName>
@@ -4842,6 +4815,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>INFO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
</entities>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 46b68d0898..7b0e267ae2 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -25,11 +25,6 @@
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
<entityField>
<name>DISCOUNT</name>
<title>Discount</title>
@@ -208,10 +203,6 @@
<name>DATE_NEW.value</name>
<recordfield>OFFERITEM.DATE_NEW</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- <recordfield>OFFERITEM.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNT.value</name>
<recordfield>OFFERITEM.DISCOUNT</recordfield>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 47f80ab581..fe1270a563 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -25,11 +25,6 @@
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
<entityField>
<name>DISCOUNT</name>
<title>Discount</title>
@@ -171,6 +166,10 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/neonContext/Offeritem_context/Offeritem_context.aod b/neonContext/Offeritem_context/Offeritem_context.aod
index e36d0a25aa..36bbe1e003 100644
--- a/neonContext/Offeritem_context/Offeritem_context.aod
+++ b/neonContext/Offeritem_context/Offeritem_context.aod
@@ -19,5 +19,9 @@
<name>440a19f2-4893-47b9-b10c-864540b6287f</name>
<view>OfferitemMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>683c6607-69ab-43d7-907b-eb7054f2f257</name>
+ <view>OfferitemMultiEdit_view0</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 3a1b2c29e2..26f9c81d3b 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -59,9 +59,9 @@
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>a74af385-7088-4168-9e0a-22e4b73dd6fb</name>
+ <name>dcf79bac-b890-4875-9ab9-4a743972a215</name>
<entityField>OfferOfferitem_dfo</entityField>
- <view>OfferitemMultiEdit_view</view>
+ <view>OfferitemMultiEdit_view0</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index 3cd8f851ce..9590a86985 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -46,6 +46,10 @@
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>a31fd16c-4237-4cd9-a9de-2267f186d342</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
index eeb2e5038d..8d494baa95 100644
--- a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
+++ b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
@@ -45,6 +45,10 @@
<name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>a605715e-5efc-4aeb-860f-f16ff4b80321</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod b/neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod
new file mode 100644
index 0000000000..2387449448
--- /dev/null
+++ b/neonView/OfferitemMultiEdit_view0/OfferitemMultiEdit_view0.aod
@@ -0,0 +1,51 @@
+<?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>OfferitemMultiEdit_view0</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>ItemData</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>155119de-99a4-4b1b-8f32-91df05f2271a</name>
+ <entityField>ITEMPOSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f7b11d3a-bb01-4a3b-8aff-0e6da27e9e89</name>
+ <entityField>PRODUCT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2e55205a-15ab-488f-bae6-b7d1da57e5b7</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>db040e35-98e5-4103-865b-1654ac93894b</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e2bbeee1-8644-436d-b220-73b9fff8e87e</name>
+ <entityField>DISCOUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1c9dfee8-e838-44be-9c44-00ca5493ceb5</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7b99c8b2-af93-4bf3-968c-0a0e9afc916e</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>55e4f6a6-6acb-46ff-8848-d42e6e5942a7</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 3f8fb1b11d..5f3cd04116 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -12,7 +12,7 @@
<name>OfferitemPreview_header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
+ <descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
@@ -32,10 +32,6 @@
<name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
<entityField>OPTIONAL</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>4b1853d4-1fc8-4c14-a5e2-1c5d0468442c</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 61e1e2af23..63409f66ae 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -46,6 +46,10 @@
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
index f94e0a1f56..3102dd60c9 100644
--- a/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
+++ b/neonView/OrderitemMultiEdit_view/OrderitemMultiEdit_view.aod
@@ -45,6 +45,10 @@
<name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
<entityField>OPTIONAL</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>96f0b5bd-6187-44ad-aac0-15ac262e30a2</name>
+ <entityField>INFO</entityField>
+ </neonTableColumn>
</columns>
</genericMultipleViewTemplate>
</children>
diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
index 04cf0c55dc..f0a175961c 100644
--- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
+++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
@@ -12,7 +12,7 @@
<name>OrderitemPreview_header</name>
<iconField>IMAGE</iconField>
<titleField>ITEMNAME</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
+ <descriptionField>INFO</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
diff --git a/others/db_changes/struct/create_offeritem.xml b/others/db_changes/struct/create_offeritem.xml
index 627ba98c09..aab0341fb7 100644
--- a/others/db_changes/struct/create_offeritem.xml
+++ b/others/db_changes/struct/create_offeritem.xml
@@ -9,7 +9,6 @@
<column name="UNIT" type="INTEGER"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="GROUPCODEID" type="INTEGER"/>
- <column name="DESCRIPTION" type="NCLOB"/>
<column name="ASSIGNEDTO" type="CHAR(36)">
<constraints foreignKeyName="FK_OFFERITEM_ASSIGNEDTO" references="OFFERITEM(OFFERITEMID)"/>
</column>
diff --git a/others/db_changes/struct/create_salesorderitem.xml b/others/db_changes/struct/create_salesorderitem.xml
index b622f95a62..d17a3c62d8 100644
--- a/others/db_changes/struct/create_salesorderitem.xml
+++ b/others/db_changes/struct/create_salesorderitem.xml
@@ -9,7 +9,6 @@
<column name="UNIT" type="INTEGER"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="GROUPCODEID" type="INTEGER"/>
- <column name="DESCRIPTION" type="NCLOB"/>
<column name="ASSIGNEDTO" type="CHAR(36)">
<constraints foreignKeyName="FK_SALESORDERITEM_ASSIGNEDTO" references="SALESORDERITEM(SALESORDERITEMID)"/>
</column>
@@ -25,6 +24,7 @@
</column>
<column name="DISCOUNT" type="NUMERIC(14,2)"/>
<column name="ITEMPOSITION" type="VARCHAR(30)"/>
+ <column name="INFO" type="NCLOB"/>
<column name="DATE_EDIT" type="TIMESTAMP"/>
<column name="DATE_NEW" type="TIMESTAMP">
<constraints nullable="false"/>
--
GitLab