Skip to content
Snippets Groups Projects
Commit 21ea0894 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1032312][Keywords für bestehende Module anlegen]

parent d152bb58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 221 additions and 21 deletions
entity/Contract_entity/Contract_entity.aod
+ 60
− 3
View file @ 21ea0894
...@@ -49,18 +49,18 @@ ...@@ -49,18 +49,18 @@
<entityField> <entityField>
<name>CONTRACTSTATUS</name> <name>CONTRACTSTATUS</name>
<title>${CONTRACT_STATUS}</title> <title>${CONTRACT_STATUS}</title>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js</possibleItemsProcess> <consumer>ContractStates</consumer>
</entityField> </entityField>
<entityField> <entityField>
<name>CONTRACTTYPE</name> <name>CONTRACTTYPE</name>
<title>Type of contract</title> <title>Type of contract</title>
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js</possibleItemsProcess> <consumer>ContractTypes</consumer>
</entityField> </entityField>
<entityField> <entityField>
<name>PAYMENT</name> <name>PAYMENT</name>
<title>Payment method</title> <title>Payment method</title>
<consumer>ContractPayments</consumer>
<mandatory v="true" /> <mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/possibleItemsProcess.js</possibleItemsProcess>
</entityField> </entityField>
<entityField> <entityField>
<name>RELATION_ID</name> <name>RELATION_ID</name>
...@@ -202,6 +202,51 @@ ...@@ -202,6 +202,51 @@
</entityParameter> </entityParameter>
</children> </children>
</entityConsumer> </entityConsumer>
<entityConsumer>
<name>ContractPayments</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>generic_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ContractStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>generic_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ContractTypes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>generic_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
...@@ -301,6 +346,18 @@ ...@@ -301,6 +346,18 @@
<name>PERS_LASTNAME.value</name> <name>PERS_LASTNAME.value</name>
<recordfield>PERS.LASTNAME</recordfield> <recordfield>PERS.LASTNAME</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PAYMENT.displayValue</name>
<expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTRACTSTATUS.displayValue</name>
<expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTRACTTYPE.displayValue</name>
<expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings> </recordFieldMappings>
</dbRecordContainer> </dbRecordContainer>
</recordContainers> </recordContainers>
......
entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js 0 → 100644
+ 2
− 0
View file @ 21ea0894
import("system.result");
result.string("ContractPayment");
\ No newline at end of file
entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js 0 → 100644
+ 2
− 0
View file @ 21ea0894
import("system.result");
result.string("ContractStatus");
\ No newline at end of file
entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js 0 → 100644
+ 2
− 0
View file @ 21ea0894
import("system.result");
result.string("ContractType");
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 21ea0894
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractStatus", "CONTRACT.CONTRACTSTATUS");
result.string(sql);
\ No newline at end of file
entity/Offer_entity/entityfields/currency/possibleItemsProcess.js → entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
+ 5
− 0
View file @ 21ea0894
import("system.result"); import("system.result");
import("Keyword_lib"); import("Keyword_lib");
var items; var sql = KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACT.CONTRACTTYPE");
result.string(sql);
items = KeywordUtils.getStandardArray("CURRENCY"); \ No newline at end of file
result.object(items);
\ No newline at end of file
entity/Contract_entity/entityfields/payment/possibleItemsProcess.js → entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
+ 5
− 0
View file @ 21ea0894
import("system.result"); import("system.result");
import("Keyword_lib"); import("Keyword_lib");
var items; var sql = KeywordUtils.getResolvedTitleSqlPart("ContractPayment", "CONTRACT.PAYMENT");
result.string(sql);
items = KeywordUtils.getStandardArray("CONTRACT.PAYMENT"); \ No newline at end of file
result.object(items);
\ No newline at end of file
entity/Keyword_entity/Keyword_entity.aod
+ 36
− 0
View file @ 21ea0894
...@@ -82,6 +82,42 @@ ...@@ -82,6 +82,42 @@
<fieldName>KeywordDirections</fieldName> <fieldName>KeywordDirections</fieldName>
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
<entityDependency>
<name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractPayments</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
<entityName>Offer_entity</entityName>
<fieldName>KeywordCurrencies</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
<entityName>Order_entity</entityName>
<fieldName>KeywordCurrencies</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
<entityName>Productprice_entity</entityName>
<fieldName>KeywordCurrencies</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies> </dependencies>
<children> <children>
<entityParameter> <entityParameter>
......
entity/Keyword_entity/documentation.adoc
+ 7
− 7
View file @ 21ea0894
...@@ -50,14 +50,14 @@ Take a look at the following table. Beware that these are not the acutal db-colu ...@@ -50,14 +50,14 @@ Take a look at the following table. Beware that these are not the acutal db-colu
.simplified, abstract representation how keywords are acutllay stored .simplified, abstract representation how keywords are acutllay stored
[options="header", cols="m,m,d,d"] [options="header", cols="m,m,d,d"]
|======= |=======
|UID |key-ID |tile | category |UID |key-ID |tile | container
|{set:cellbgcolor:#90b678} |{set:cellbgcolor:#90b678}
unique key 1|1-key-value A|one|category 1 unique key 1|1-key-value A|one|container 1
|unique key 2|2-key-value A|two|category 1 |unique key 2|2-key-value A|two|container 1
|unique key 3|3-key-value A|three|category 1 |unique key 3|3-key-value A|three|container 1
|{set:cellbgcolor:#b69e78 } |{set:cellbgcolor:#b69e78 }
unique key 4|1-key-value B|I|category 2 unique key 4|1-key-value B|I|container 2
|unique key 5|2-key-value B|II|category 2 |unique key 5|2-key-value B|II|container 2
|======= |=======
And, to clarify an example: And, to clarify an example:
...@@ -66,7 +66,7 @@ And, to clarify an example: ...@@ -66,7 +66,7 @@ And, to clarify an example:
[options="header", cols="m,m,d,d"] [options="header", cols="m,m,d,d"]
|======= |=======
|{set:cellbgcolor:! } |{set:cellbgcolor:! }
UID |key-ID |tile | category UID |key-ID |tile | container
|{set:cellbgcolor:#90b678}db1792cd|de-DE|German (Germany)|Language |{set:cellbgcolor:#90b678}db1792cd|de-DE|German (Germany)|Language
|62df7f0ba|en-GB|English (United Kingdom)|Language |62df7f0ba|en-GB|English (United Kingdom)|Language
|126229d9|fr-FR|French (France)|Language |126229d9|fr-FR|French (France)|Language
......
entity/Offer_entity/Offer_entity.aod
+ 20
− 1
View file @ 21ea0894
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<entityField> <entityField>
<name>CURRENCY</name> <name>CURRENCY</name>
<title>Currency</title> <title>Currency</title>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess> <consumer>KeywordCurrencies</consumer>
</entityField> </entityField>
<entityField> <entityField>
<name>OFFERCODE</name> <name>OFFERCODE</name>
...@@ -317,6 +317,21 @@ ...@@ -317,6 +317,21 @@
<element>MASK</element> <element>MASK</element>
</onValueChangeTypes> </onValueChangeTypes>
</entityField> </entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>generic_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
...@@ -425,6 +440,10 @@ ...@@ -425,6 +440,10 @@
<name>ADDRESS.value</name> <name>ADDRESS.value</name>
<recordfield>OFFER.ADDRESS</recordfield> <recordfield>OFFER.ADDRESS</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings> </recordFieldMappings>
</dbRecordContainer> </dbRecordContainer>
</recordContainers> </recordContainers>
......
entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js 0 → 100644
+ 2
− 0
View file @ 21ea0894
import("system.result");
result.string("Currency");
\ No newline at end of file
entity/Order_entity/entityfields/currency/possibleItemsProcess.js → entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+ 5
− 0
View file @ 21ea0894
import("system.result"); import("system.result");
import("Keyword_lib"); import("Keyword_lib");
var items; var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "OFFER.CURRENCY");
result.string(sql);
items = KeywordUtils.getStandardArray("CURRENCY"); \ No newline at end of file
result.object(items);
\ No newline at end of file
entity/Order_entity/Order_entity.aod
+ 20
− 1
View file @ 21ea0894
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<entityField> <entityField>
<name>CURRENCY</name> <name>CURRENCY</name>
<title>Currency</title> <title>Currency</title>
<possibleItemsProcess>%aditoprj%/entity/Order_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess> <consumer>KeywordCurrencies</consumer>
</entityField> </entityField>
<entityField> <entityField>
<name>SALESORDERCODE</name> <name>SALESORDERCODE</name>
...@@ -278,6 +278,21 @@ ...@@ -278,6 +278,21 @@
<entityField> <entityField>
<name>ADDRESS</name> <name>ADDRESS</name>
</entityField> </entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>generic_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
...@@ -382,6 +397,10 @@ ...@@ -382,6 +397,10 @@
<name>ADDRESS.value</name> <name>ADDRESS.value</name>
<recordfield>SALESORDER.ADDRESS</recordfield> <recordfield>SALESORDER.ADDRESS</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings> </recordFieldMappings>
</dbRecordContainer> </dbRecordContainer>
</recordContainers> </recordContainers>
......
entity/Order_entity/entityfields/keywordcurrencies/children/containername_param/code.js 0 → 100644
+ 2
− 0
View file @ 21ea0894
import("system.result");
result.string("Currency");
\ No newline at end of file
entity/Contract_entity/entityfields/contractstatus/possibleItemsProcess.js → entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+ 5
− 0
View file @ 21ea0894
import("system.result"); import("system.result");
import("Keyword_lib"); import("Keyword_lib");
var items; var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "SALESORDER.CURRENCY");
result.string(sql);
items = KeywordUtils.getStandardArray("CONTRACT.CONTRACTSTATUS"); \ No newline at end of file
result.object(items);
\ No newline at end of file
entity/Productprice_entity/Productprice_entity.aod
+ 21
− 1
View file @ 21ea0894
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<entityField> <entityField>
<name>CURRENCY</name> <name>CURRENCY</name>
<title>Currency</title> <title>Currency</title>
<consumer>KeywordCurrencies</consumer>
<mandatory v="true" /> <mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js</possibleItemsProcess>
</entityField> </entityField>
<entityField> <entityField>
<name>FROMQUANTITY</name> <name>FROMQUANTITY</name>
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
<entityProvider> <entityProvider>
<name>Productprices</name> <name>Productprices</name>
<fieldType>DEPENDENCY_IN</fieldType> <fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies> <dependencies>
<entityDependency> <entityDependency>
<name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name> <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
...@@ -143,6 +144,21 @@ ...@@ -143,6 +144,21 @@
</entityDependency> </entityDependency>
</dependencies> </dependencies>
</entityProvider> </entityProvider>
<entityConsumer>
<name>KeywordCurrencies</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>generic_dfi</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
...@@ -204,6 +220,10 @@ ...@@ -204,6 +220,10 @@
<name>VAT.value</name> <name>VAT.value</name>
<recordfield>PRODUCTPRICE.VAT</recordfield> <recordfield>PRODUCTPRICE.VAT</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings> </recordFieldMappings>
</dbRecordContainer> </dbRecordContainer>
</recordContainers> </recordContainers>
......
entity/Productprice_entity/entityfields/currency/possibleItemsProcess.js deleted 100644 → 0
+ 0
− 5
View file @ d152bb58
import("system.result");
import("Keyword_lib");
var items = KeywordUtils.getStandardArray("CURRENCY");
result.object(items);
\ No newline at end of file
entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/code.js 0 → 100644
+ 2
− 0
View file @ 21ea0894
import("system.result");
result.string("Currency");
\ No newline at end of file
entity/Contract_entity/entityfields/contracttype/possibleItemsProcess.js → entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+ 5
− 0
View file @ 21ea0894
import("system.result"); import("system.result");
import("Keyword_lib"); import("Keyword_lib");
var items; var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "PRODUCTPRICE.CURRENCY");
result.string(sql);
items = KeywordUtils.getStandardArray("CONTRACT.CONTRACTTYPE"); \ No newline at end of file
result.object(items);
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 15
− 3
View file @ 21ea0894
...@@ -963,9 +963,6 @@ ...@@ -963,9 +963,6 @@
<entry> <entry>
<key>#,##0.00</key> <key>#,##0.00</key>
</entry> </entry>
<entry>
<key>jDitoRC</key>
</entry>
<entry> <entry>
<key>Latin Name</key> <key>Latin Name</key>
</entry> </entry>
...@@ -1533,6 +1530,21 @@ ...@@ -1533,6 +1530,21 @@
<entry> <entry>
<key>Sorting</key> <key>Sorting</key>
</entry> </entry>
<entry>
<key>Canadian dollar</key>
</entry>
<entry>
<key>United States dollar</key>
</entry>
<entry>
<key>Euro</key>
</entry>
<entry>
<key>jdito</key>
</entry>
<entry>
<key>Swiss franc</key>
</entry>
</keyValueMap> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
<sqlModels> <sqlModels>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment