diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index 07c13a4f197ce862e25046a64c74063ffe75fe01..b2dd85d8d225b07b25d07d6f328b144a9906eb4d 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -679,6 +679,12 @@ <searchable v="false" /> <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess> </entityField> + <entityField> + <name>FullOfferCode</name> + <title>Offer number</title> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess> + </entityField> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js b/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..d39bcd7a3c4880d06e2db9776a472e92ad9a34ac --- /dev/null +++ b/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js @@ -0,0 +1,5 @@ +import("system.result"); +import("system.vars"); + +//a filedGroup cannot be placed in a table (filter-view) at the moment and therefore a separate field is needed: +result.string(vars.get("$field.OFFERCODE") + "-" + vars.get("$field.VERSNR")); diff --git a/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js b/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js index c7fab6e323296f8188d68d9deb288de327a82c32..28c9f0b0877d194e0c193b8ef7e3107e7863f714 100644 --- a/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js +++ b/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js @@ -1,4 +1,4 @@ import("system.result"); import("system.vars"); -result.string(vars.get("$field.OFFERCODE") + "-" + vars.get("$field.VERSNR")); +result.string(vars.get("$field.FullOfferCode")); diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod index edf7596f2f4c18361445c97edeffb08b8f034e8d..b64a227c3aeb6b81bb4bef5f0f1be0e8cc4184ad 100644 --- a/neonView/OfferFilter_view/OfferFilter_view.aod +++ b/neonView/OfferFilter_view/OfferFilter_view.aod @@ -54,12 +54,8 @@ <entityField>#ENTITY</entityField> <columns> <neonTableColumn> - <name>60b83daa-9349-4bef-94d8-5f1fc350da59</name> - <entityField>OFFERCODE</entityField> - </neonTableColumn> - <neonTableColumn> - <name>36b035da-4a57-413e-a5dc-c8974ca3855b</name> - <entityField>VERSNR</entityField> + <name>4d40cee3-bcb1-4e67-8c1d-d5fc2e49cc11</name> + <entityField>FullOfferCode</entityField> </neonTableColumn> <neonTableColumn> <name>780087e7-ff3c-4592-90be-607357168295</name>