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

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

parent b8fea234
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 207 additions and 58 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 19
− 19
View file @ 87bd1970
......@@ -385,7 +385,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -864,8 +864,8 @@
<name>UNIT</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" />
......@@ -1178,8 +1178,8 @@
<name>PRICELIST</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" />
......@@ -1784,8 +1784,8 @@
<name>UNIT</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" />
......@@ -2203,8 +2203,8 @@
<name>SOURCE</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" />
......@@ -2657,8 +2657,8 @@
<name>SALESPROJECT_ROLE</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" />
......@@ -3153,8 +3153,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" />
......@@ -3270,8 +3270,8 @@
<name>UNIT</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" />
......@@ -3569,8 +3569,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -3653,8 +3653,8 @@
<name>TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="5" />
<size v="5" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......
entity/Keyword_entity/Keyword_entity.aod
+ 42
− 0
View file @ 87bd1970
......@@ -172,6 +172,48 @@
<fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
<entityName>Productprice_entity</entityName>
<fieldName>KeywordPricelists</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
<entityName>Offeritem_entity</entityName>
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
<entityName>Orderitem_entity</entityName>
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
<entityName>Product_entity</entityName>
<fieldName>KeywordQuantityUnits</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
<entityName>SalesprojectMember_entity</entityName>
<fieldName>KeywordMemberRoles</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
<entityName>SalesprojectSource_entity</entityName>
<fieldName>KeywordSources</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>36a72192-902f-431b-8f43-0bef311678f7</name>
<entityName>Order_entity</entityName>
<fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
entity/Offeritem_entity/Offeritem_entity.aod
+ 20
− 1
View file @ 87bd1970
......@@ -82,7 +82,7 @@
<entityField>
<name>UNIT</name>
<title>Unit</title>
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordQuantityUnits</consumer>
</entityField>
<entityField>
<name>VAT</name>
......@@ -163,6 +163,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</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/keywordquantityunits/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -248,6 +263,10 @@
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UNIT.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js → entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+ 4
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("UNIT");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "OFFERITEM.UNIT");
result.string(sql);
entity/Order_entity/Order_entity.aod
+ 20
− 1
View file @ 87bd1970
......@@ -63,7 +63,7 @@
<entityField>
<name>STATUS</name>
<title>Status</title>
<possibleItemsProcess>%aditoprj%/entity/Order_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordStates</consumer>
<state>EDITABLE</state>
</entityField>
<entityField>
......@@ -293,6 +293,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordStates</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/Order_entity/entityfields/keywordstates/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -401,6 +416,10 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Order_entity/entityfields/image/valueProcess.js
+ 1
− 1
View file @ 87bd1970
......@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
result.string("TEXT:" + KeywordUtils.getViewValue("SALESORDER.STATUS", vars.getString("$field.STATUS")) );
\ No newline at end of file
result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.SalesprojectState, vars.getString("$field.STATUS")) );
\ No newline at end of file
entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js → entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
+ 4
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("UNIT");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.SalesorderState);
\ No newline at end of file
entity/Order_entity/entityfields/status/possibleItemsProcess.js deleted 100644 → 0
+ 0
− 16
View file @ b8fea234
import("system.result");
import("Keyword_lib");
import("system.vars");
import("Order_lib");
var items = KeywordUtils.getStandardArray("SALESORDER.STATUS");
if (!OrderUtils.isEditable(vars.get("$field.STATUS")))
{
items = items.filter(function(pItem)
{
return !OrderUtils.isEditable(pItem[0]);
});
}
result.object(items);
\ No newline at end of file
entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesorderState, "SALESORDER.STATUS");
result.string(sql);
entity/Orderitem_entity/Orderitem_entity.aod
+ 20
− 1
View file @ 87bd1970
......@@ -82,7 +82,7 @@
<entityField>
<name>UNIT</name>
<title>Unit</title>
<possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
<consumer>KeywordQuantityUnits</consumer>
</entityField>
<entityField>
<name>VAT</name>
......@@ -167,6 +167,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</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/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -252,6 +267,10 @@
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UNIT.displayValue</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Product_entity/entityfields/unit/possibleItemsProcess.js → entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+ 4
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("UNIT");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "SALESORDERITEM.UNIT");
result.string(sql);
entity/Product_entity/Product_entity.aod
+ 20
− 1
View file @ 87bd1970
......@@ -58,8 +58,8 @@
<entityField>
<name>UNIT</name>
<title>Unit</title>
<consumer>KeywordQuantityUnits</consumer>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>currentPurchasePriceId</name>
......@@ -247,6 +247,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</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/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -348,6 +363,10 @@
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UNIT.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/SalesprojectMember_entity/entityfields/salesproject_role/possibleItemsProcess.js → entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
+ 4
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("SALESPROJECT.ROLE");
result.object(items);
\ No newline at end of file
result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "PRODUCT.UNIT");
result.string(sql);
entity/Productprice_entity/Productprice_entity.aod
+ 20
− 1
View file @ 87bd1970
......@@ -81,8 +81,8 @@
<name>PRICELIST</name>
<documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
<title>Price list</title>
<consumer>KeywordPricelists</consumer>
<mandatoryProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js</mandatoryProcess>
<possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js</possibleItemsProcess>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
......@@ -160,6 +160,21 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordPricelists</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/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -225,6 +240,10 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICELIST.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js 0 → 100644
+ 4
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
result.string($KeywordRegistry.get.ProductPricelist);
entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js deleted 100644 → 0
+ 0
− 17
View file @ b8fea234
import("system.db");
import("system.neon");
import("system.vars");
import("system.result");
import("Keyword_lib");
var items;
items = KeywordUtils.getStandardArray("PRICELIST");
if(vars.get("$field.RELATION_ID") != "")
{
var orgname = db.cell("select NAME from ORG join RELATION on ORG_ID = ORGID where RELATIONID = '" + vars.get("$field.RELATION_ID") + "'");
items.push(["", orgname]);
}
result.object(items);
\ No newline at end of file
entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js 0 → 100644
+ 5
− 0
View file @ 87bd1970
import("system.result");
import("Keyword_lib");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductPricelist, "PRODUCTPRICE.PRICELIST");
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