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

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

parent 4afa06a6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 138 additions and 53 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 24
− 24
View file @ 5a64008e
......@@ -88,8 +88,8 @@
<name>TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -728,8 +728,8 @@
<name>PAYMENT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -741,8 +741,8 @@
<name>CONTRACTSTATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -793,8 +793,8 @@
<name>CONTRACTTYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -942,8 +942,8 @@
<name>GROUPCODEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1139,8 +1139,8 @@
<name>CURRENCY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
......@@ -1554,8 +1554,8 @@
<name>CURRENCY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1658,8 +1658,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -1914,8 +1914,8 @@
<name>GROUPCODEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -2395,8 +2395,8 @@
<name>GROUPCODE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3041,8 +3041,8 @@
<name>CURRENCY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3382,8 +3382,8 @@
<name>GROUPCODEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
<size v="10" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......
entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js
+ 2
− 1
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
result.string("ActivityDirection");
\ No newline at end of file
result.string($KeywordRegistry.get.ActivityDirection);
\ No newline at end of file
entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js
+ 1
− 1
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ActivityDirection", "ACTIVITY.DIRECTION");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ActivityDirection, "ACTIVITY.DIRECTION");
result.string(sql);
entity/Contract_entity/entityfields/contractpayments/children/containername_param/code.js
+ 3
− 1
View file @ 5a64008e
import("system.result");
result.string("ContractPayment");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
+ 3
− 1
View file @ 5a64008e
import("system.result");
result.string("ContractStatus");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.ContractPayment);
\ No newline at end of file
entity/Contract_entity/entityfields/contracttypes/children/containername_param/code.js
+ 3
− 1
View file @ 5a64008e
import("system.result");
result.string("ContractType");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.ContractType);
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js
+ 1
− 1
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractStatus", "CONTRACT.CONTRACTSTATUS");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractStatus, "CONTRACT.CONTRACTSTATUS");
result.string(sql);
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js
+ 1
− 1
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACT.CONTRACTTYPE");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractType, "CONTRACT.CONTRACTTYPE");
result.string(sql);
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js
+ 1
− 1
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("ContractPayment", "CONTRACT.PAYMENT");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ContractPayment, "CONTRACT.PAYMENT");
result.string(sql);
\ No newline at end of file
entity/Keyword_entity/Keyword_entity.aod
+ 36
− 0
View file @ 5a64008e
......@@ -118,6 +118,42 @@
<fieldName>KeywordCurrencies</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
<entityName>Offeritem_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
<entityName>Orderitem_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c404b010-1634-4160-adca-7edf1535ee26</name>
<entityName>Product_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
<entityName>SalesprojectForecast_entity</entityName>
<fieldName>KeywordProductGroupcodes</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
<entityName>Offer_entity</entityName>
<fieldName>KeywordOfferStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>8696e561-b263-4c7c-b753-c5da44b48055</name>
<entityName>Organisation_entity</entityName>
<fieldName>KeywordOrganisationTypes</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Offer_entity/Offer_entity.aod
+ 20
− 1
View file @ 5a64008e
......@@ -70,7 +70,7 @@
<entityField>
<name>STATUS</name>
<title>Status</title>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordOfferStates</consumer>
<state>EDITABLE</state>
</entityField>
<entityField>
......@@ -332,6 +332,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordOfferStates</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -444,6 +459,10 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Offer_entity/entityfields/image/valueProcess.js
+ 1
− 1
View file @ 5a64008e
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
result.string("TEXT:" + KeywordUtils.getViewValue("OFFER.STATUS", vars.getString("$field.STATUS")) );
\ No newline at end of file
result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.OfferStatus, vars.getString("$field.STATUS")) );
\ No newline at end of file
entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/code.js
+ 3
− 1
View file @ 5a64008e
import("system.result");
result.string("Currency");
\ No newline at end of file
import("Keyword_lib");
result.string($KeywordRegistry.get.Currency);
\ No newline at end of file
entity/Organisation_entity/entityfields/type/possibleItemsProcess.js → entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/code.js
+ 4
− 0
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("ORG.TYPE");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.OfferStatus);
\ No newline at end of file
entity/Offer_entity/entityfields/status/possibleItemsProcess.js deleted 100644 → 0
+ 0
− 16
View file @ 4afa06a6
import("system.result");
import("Keyword_lib");
import("system.vars");
import("Offer_lib");
var items = KeywordUtils.getStandardArray("OFFER.STATUS");
if (!OfferUtils.isEditable(vars.get("$field.STATUS")))
{
items = items.filter(function(pItem)
{
return !OfferUtils.isEditable(pItem[0]);
});
}
result.object(items);
\ No newline at end of file
entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+ 1
− 1
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart("Currency", "OFFER.CURRENCY");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.Currency, "OFFER.CURRENCY");
result.string(sql);
\ No newline at end of file
entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.OfferStatus, "OFFER.STATUS");
result.string(sql);
entity/Offeritem_entity/Offeritem_entity.aod
+ 20
− 1
View file @ 5a64008e
......@@ -20,7 +20,7 @@
<entityField>
<name>GROUPCODEID</name>
<title>Commodity group</title>
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordProductGroupcodes</consumer>
<state>READONLY</state>
</entityField>
<entityField>
......@@ -148,6 +148,21 @@
<contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/info/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Keyword_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -229,6 +244,10 @@
<name>INFO.value</name>
<recordfield>OFFERITEM.INFO</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Product_entity/entityfields/groupcodeid/possibleItemsProcess.js → entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js
+ 4
− 0
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("GROUPCODE");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.ProductGroupcode);
\ No newline at end of file
entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 5a64008e
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "OFFERITEM.GROUPCODEID");
result.string(sql);
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