From 580bf0fb7bf59962a7d26e02dade3a5bc8acb8ea Mon Sep 17 00:00:00 2001 From: "m.escher" <m.escher@mescher-nb.aditosoftware.local> Date: Thu, 25 Oct 2018 08:18:48 +0200 Subject: [PATCH] add DFI #INCOMING --- entity/Address_entity/Address_entity.aod | 7 +++++-- entity/Appointment_entity/Appointment_entity.aod | 7 +++++-- entity/Contract_entity/Contract_entity.aod | 7 +++++-- entity/History_entity/History_entity.aod | 11 +++++++---- entity/Org_entity/Org_entity.aod | 7 +++++-- entity/Pers_entity/Pers_entity.aod | 9 ++++++--- entity/Product_entity/Product_entity.aod | 5 ++++- entity/Productprice_entity/Productprice_entity.aod | 3 +++ entity/Social_entity/Social_entity.aod | 7 +++++-- entity/Stock_entity/Stock_entity.aod | 3 +++ 10 files changed, 48 insertions(+), 18 deletions(-) diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod index 134e6a329c..6cc8087d77 100644 --- a/entity/Address_entity/Address_entity.aod +++ b/entity/Address_entity/Address_entity.aod @@ -3,10 +3,10 @@ <name>Address_entity</name> <title>Addresses</title> <majorModelMode>DISTRIBUTED</majorModelMode> - <alias>Data_alias</alias> - <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess> <recordContainerType>DB</recordContainerType> <caption>Addresses</caption> + <alias>Data_alias</alias> + <conditionProcess>%aditoprj%/entity/Address_entity/conditionProcess.js</conditionProcess> <entityFields> <entityField> <name>ADDRESS</name> @@ -161,6 +161,9 @@ <element>MASK</element> </onValueChangeTypes> </entityField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index 1b83d40d6d..2a647e8673 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -3,6 +3,8 @@ <name>Appointment_entity</name> <title>Termin</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <recordContainerType>JDITO</recordContainerType> + <caption>Termin</caption> <alias>Data_alias</alias> <jDitoRecordAlias>Data_alias</jDitoRecordAlias> <fields> @@ -28,8 +30,6 @@ <onInsert>%aditoprj%/entity/Appointment_entity/onInsert.js</onInsert> <onUpdate>%aditoprj%/entity/Appointment_entity/onUpdate.js</onUpdate> <onDelete>%aditoprj%/entity/Appointment_entity/onDelete.js</onDelete> - <recordContainerType>JDITO</recordContainerType> - <caption>Termin</caption> <entityFields> <entityField> <name>SUMMARY</name> @@ -134,5 +134,8 @@ </entityActionField> </children> </entityActionGroup> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> </entity> diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod index a49173f1dc..8388d1b55c 100644 --- a/entity/Contract_entity/Contract_entity.aod +++ b/entity/Contract_entity/Contract_entity.aod @@ -3,11 +3,11 @@ <name>Contract_entity</name> <title>Contract</title> <majorModelMode>DISTRIBUTED</majorModelMode> - <alias>Data_alias</alias> - <conditionProcess>%aditoprj%/entity/Contract_entity/conditionProcess.js</conditionProcess> <recordContainerType>DB</recordContainerType> <caption>Contract</caption> <iconId>VAADIN:FORM</iconId> + <alias>Data_alias</alias> + <conditionProcess>%aditoprj%/entity/Contract_entity/conditionProcess.js</conditionProcess> <entityFields> <entityField> <name>CONTRACTCODE</name> @@ -187,6 +187,9 @@ <fieldName>Org_dfi</fieldName> </dependency> </entityOutgoingField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod index 9db560091b..9d4131bdaf 100644 --- a/entity/History_entity/History_entity.aod +++ b/entity/History_entity/History_entity.aod @@ -3,15 +3,15 @@ <name>History_entity</name> <title>History</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <recordContainerType>DB</recordContainerType> + <caption>History</caption> + <iconId>NEON:HISTORY</iconId> + <imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess> <alias>Data_alias</alias> <fromClauseProcess>%aditoprj%/entity/History_entity/fromClauseProcess.js</fromClauseProcess> <conditionProcess>%aditoprj%/entity/History_entity/conditionProcess.js</conditionProcess> <onDBInsert>%aditoprj%/entity/History_entity/onDBInsert.js</onDBInsert> <onDBDelete>%aditoprj%/entity/History_entity/onDBDelete.js</onDBDelete> - <recordContainerType>DB</recordContainerType> - <caption>History</caption> - <iconId>NEON:HISTORY</iconId> - <imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess> <entityFields> <entityField> <name>DIRECTION</name> @@ -126,6 +126,9 @@ </entityDependency> </dependencies> </entityIncomingField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod index f71fe8af6f..250869ab94 100644 --- a/entity/Org_entity/Org_entity.aod +++ b/entity/Org_entity/Org_entity.aod @@ -3,13 +3,13 @@ <name>Org_entity</name> <title>Company</title> <majorModelMode>DISTRIBUTED</majorModelMode> - <alias>Data_alias</alias> - <fromClauseProcess>%aditoprj%/entity/Org_entity/fromClauseProcess.js</fromClauseProcess> <recordContainerType>DB</recordContainerType> <caption>Company</caption> <captionProcess>%aditoprj%/entity/Org_entity/captionProcess.js</captionProcess> <iconId>VAADIN:BUILDING</iconId> <imageProcess>%aditoprj%/entity/Org_entity/imageProcess.js</imageProcess> + <alias>Data_alias</alias> + <fromClauseProcess>%aditoprj%/entity/Org_entity/fromClauseProcess.js</fromClauseProcess> <entityFields> <entityField> <name>CUSTOMERCODE</name> @@ -304,6 +304,9 @@ </entityParameter> </children> </entityOutgoingField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod index e9215647ec..aecaeb08ebd 100644 --- a/entity/Pers_entity/Pers_entity.aod +++ b/entity/Pers_entity/Pers_entity.aod @@ -3,14 +3,14 @@ <name>Pers_entity</name> <title>Contact</title> <majorModelMode>DISTRIBUTED</majorModelMode> - <alias>Data_alias</alias> - <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess> - <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess> <recordContainerType>DB</recordContainerType> <caption>Contact</caption> <captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess> <iconId>VAADIN:USERS</iconId> <imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess> + <alias>Data_alias</alias> + <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess> + <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess> <entityFields> <entityField> <name>DATEOFBIRTH</name> @@ -378,6 +378,9 @@ </entityParameter> </children> </entityOutgoingField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod index 9f18f3a50d..02d326e17c 100644 --- a/entity/Product_entity/Product_entity.aod +++ b/entity/Product_entity/Product_entity.aod @@ -3,10 +3,10 @@ <name>Product_entity</name> <title>Product</title> <majorModelMode>DISTRIBUTED</majorModelMode> - <alias>Data_alias</alias> <recordContainerType>DB</recordContainerType> <caption>Product</caption> <iconId>VAADIN:HAMMER</iconId> + <alias>Data_alias</alias> <entityFields> <entityField> <name>ADVERTISING</name> @@ -224,6 +224,9 @@ </entityParameter> </children> </entityOutgoingField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod index b19129228a..0ab83ab71f 100644 --- a/entity/Productprice_entity/Productprice_entity.aod +++ b/entity/Productprice_entity/Productprice_entity.aod @@ -236,6 +236,9 @@ <outputFormat>#,##0.00 €</outputFormat> <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currentsalesprice/valueProcess.js</valueProcess> </entityField> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod index 5dc92aa0f7..787822ab61 100644 --- a/entity/Social_entity/Social_entity.aod +++ b/entity/Social_entity/Social_entity.aod @@ -3,14 +3,14 @@ <name>Social_entity</name> <title>Social</title> <majorModelMode>DISTRIBUTED</majorModelMode> + <recordContainerType>NONE</recordContainerType> + <caption>Social Media</caption> <indexGroup></indexGroup> <patternExtensionProcess></patternExtensionProcess> <fields> <element>UID</element> </fields> <contentProcess>%aditoprj%/entity/Social_entity/contentProcess.js</contentProcess> - <recordContainerType>NONE</recordContainerType> - <caption>Social Media</caption> <entityFields> <entityField> <name>TWITTER_TIMELINE</name> @@ -37,5 +37,8 @@ <expose v="true" /> <description>Benutzer</description> </entityParameter> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> </entity> diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod index 1b3ed923c0..72a126bb04 100644 --- a/entity/Stock_entity/Stock_entity.aod +++ b/entity/Stock_entity/Stock_entity.aod @@ -126,6 +126,9 @@ <triggerRecalculation v="true" /> <description>PARAMETER</description> </entityParameter> + <entityIncomingField> + <name>#INCOMING</name> + </entityIncomingField> </entityFields> <linkInformation> <linkInformation> -- GitLab