diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod index 071ec6c9a7515e3678da56306ca661ff8f4865bc..d34d158451225500cc054f5b91f2f3b8caafe41b 100644 --- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod +++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod @@ -34,6 +34,7 @@ <entityField> <name>DESCRIPTION</name> <title>Description</title> + <contentType>LONG_TEXT</contentType> <mandatory v="true" /> </entityField> <entityConsumer> diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod index caa0b72f3a0dd04ab89d6394ae0fc7938a3033bd..64025c21478525550458e16697419503ff46a8e6 100644 --- a/entity/Offeritem_entity/Offeritem_entity.aod +++ b/entity/Offeritem_entity/Offeritem_entity.aod @@ -75,6 +75,7 @@ <consumer>Products</consumer> <linkedContext>Product</linkedContext> <mandatory v="true" /> + <state>READONLY</state> <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess> <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange> <onValueChangeTypes> diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js index b3cc01ab49bbd4ddc910037d3319e4ebb11ce25b..31958d6712587b6caa676a7acdf188e7dbb522d9 100644 --- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js +++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js @@ -13,11 +13,12 @@ if(pid != "") { var currency = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : ""; var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : ""; + var objectid=vars.exists("$param.ObjectRowid_param") ? vars.get("$param.ObjectRowid_param") : ""; var pricelist = AttributeRelationUtils.getAttribute($AttributeRegistry.pricelist(), contactid) || ""; - + var PriceListFilter = { currency: currency, quantity: vars.get("$field.QUANTITY"), relationId: contactid, priceList: pricelist }; - //TODO: loading from db until loading from Consumer is possible. + var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter, [["info", db.translateStatement(SqlCondition.begin() .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_ROWID", "$field.PRODUCT_ID") @@ -26,6 +27,7 @@ if(pid != "") .buildSql("(select DESCRIPTION from DESCRIPTIONTRANSLATION", "1=2", ")"))] ]); + if(ProductDetails.productId != undefined) { neon.setFieldValue("$field.GROUPCODEID", ProductDetails.groupCode); diff --git a/neonContext/DescriptionTranslation/DescriptionTranslation.aod b/neonContext/DescriptionTranslation/DescriptionTranslation.aod index 63008a00cac677d311e28cd69b5c4b0f37e8d53d..caef8dbd5c08a7f4b057a7d4db0d0ec048f21d53 100644 --- a/neonContext/DescriptionTranslation/DescriptionTranslation.aod +++ b/neonContext/DescriptionTranslation/DescriptionTranslation.aod @@ -4,6 +4,7 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <filterview>DescriptionTranslationFilter_view</filterview> <editview>DescriptionTranslationEdit_view</editview> + <preview>DescriptionTranslationPreview_view</preview> <entity>DescriptionTranslation_entity</entity> <references> <neonViewReference> @@ -14,5 +15,9 @@ <name>0d8720bb-5bef-4913-a0ea-d426875d8127</name> <view>DescriptionTranslationEdit_view</view> </neonViewReference> + <neonViewReference> + <name>d0cfda07-eb27-440d-a698-03763ca8d664</name> + <view>DescriptionTranslationPreview_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod b/neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod index 4069467fa6972ef875ba75412873cedb2765bfc5..ee50c236734f4a44c8e6450ff34389c425ecc44e 100644 --- a/neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod +++ b/neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod @@ -2,6 +2,7 @@ <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> <name>DescriptionTranslationEdit_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <isSmall v="true" /> <layout> <boxLayout> <name>layout</name> diff --git a/neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod b/neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..9096d2a3ee378868b4b8a00d4658ca63726c12c2 --- /dev/null +++ b/neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod @@ -0,0 +1,30 @@ +<?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.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> + <name>DescriptionTranslationPreview_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <filterable v="true" /> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <genericViewTemplate> + <name>TranslationInfo</name> + <showDrawer v="true" /> + <drawerCaption></drawerCaption> + <hideLabels v="true" /> + <entityField>#ENTITY</entityField> + <fields> + <entityFieldLink> + <name>5e432839-ca9a-4a29-8006-0a1673d94c92</name> + <entityField>LANG</entityField> + </entityFieldLink> + <entityFieldLink> + <name>1348a3ee-b372-4091-a0d5-5ab45fcb58a9</name> + <entityField>DESCRIPTION</entityField> + </entityFieldLink> + </fields> + </genericViewTemplate> + </children> +</neonView>