Skip to content
Snippets Groups Projects
Commit b5680eb9 authored by Pascal Neub's avatar Pascal Neub Committed by Benjamin Ulrich
Browse files

[Projekt: xRM-Sales][TicketNr.: 1062848][Angebot - Angebotsposten filtern]

parent e73437a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
entity/Offeritem_entity/Offeritem_entity.aod
+ 22
− 16
View file @ b5680eb9
......@@ -167,6 +167,14 @@
<entityProvider>
<name>OfferItems</name>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
<entityName>Offer_entity</entityName>
<fieldName>Offeritems</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ContactId_param</name>
......@@ -190,14 +198,6 @@
<title></title>
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
<entityName>Offer_entity</entityName>
<fieldName>Offeritems</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityField>
<name>INFO</name>
......@@ -208,6 +208,11 @@
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -215,14 +220,14 @@
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -230,11 +235,6 @@
<expose v="false" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Products</name>
......@@ -243,6 +243,12 @@
<entityName>Product_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
<children>
<entityParameter>
<name>ProductIds_param</name>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/products/children/productids_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>Language_param</name>
......
entity/Offeritem_entity/entityfields/products/children/productids_param/valueProcess.js 0 → 100644
+ 13
− 0
View file @ b5680eb9
import("system.neon");
import("system.vars");
import("system.result");
import("Sql_lib");
if(vars.get("$sys.presentationmode") == neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
var ids = newSelect("OFFERITEM.PRODUCT_ID")
.from("OFFERITEM")
.where("OFFERITEM.OFFER_ID", vars.get("$param.OfferId_param"))
.arrayColumn();
result.string(JSON.stringify(ids));
}
entity/Product_entity/Product_entity.aod
+ 107
− 103
View file @ b5680eb9
......@@ -109,46 +109,46 @@
</entityField>
<entityConsumer>
<name>Organisations</name>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>Organisations</fieldName>
</dependency>
<children>
<entityParameter>
<name>OrganisationType_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/organisations/children/organisationtype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Organisation_entity</entityName>
<fieldName>Organisations</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
<fieldName>Productprices</fieldName>
</dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/productprices/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Productprice_entity</entityName>
<fieldName>Productprices</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Stocks</name>
<selectionMode>SINGLE</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Stock_entity</entityName>
<fieldName>Stocks</fieldName>
</dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stocks/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Stock_entity</entityName>
<fieldName>Stocks</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>PICTURE</name>
......@@ -157,17 +157,17 @@
<entityConsumer>
<name>StockCounts</name>
<state>READONLY</state>
<dependency>
<name>dependency</name>
<entityName>Stock_entity</entityName>
<fieldName>Stocks</fieldName>
</dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/stockcounts/children/productid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Stock_entity</entityName>
<fieldName>Stocks</fieldName>
</dependency>
</entityConsumer>
<entityProvider>
<name>#PROVIDER</name>
......@@ -201,6 +201,11 @@
</entityProvider>
<entityConsumer>
<name>ProductLinks</name>
<dependency>
<name>dependency</name>
<entityName>Prod2prod_entity</entityName>
<fieldName>ProductLinks</fieldName>
</dependency>
<children>
<entityParameter>
<name>ProductId_param</name>
......@@ -209,11 +214,6 @@
<mandatory v="true" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Prod2prod_entity</entityName>
<fieldName>ProductLinks</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>CONTACT_ID</name>
......@@ -231,6 +231,11 @@
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>Documents</fieldName>
</dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
......@@ -241,15 +246,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>Documents</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>MainDocuments</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>MainDocuments</fieldName>
</dependency>
<children>
<entityParameter>
<name>AssignmentRowId_param</name>
......@@ -260,14 +265,14 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>MainDocuments</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -275,14 +280,14 @@
<expose v="false" />
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>KeywordQuantityUnits</name>
<children>
<entityParameter>
<name>ContainerName_param</name>
......@@ -290,14 +295,14 @@
<expose v="false" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Activities</name>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectId_param</name>
......@@ -308,11 +313,6 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>LinkedObjects</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>newActivity</name>
......@@ -326,6 +326,11 @@
<name>Attributes</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributes/stateProcess.js</stateProcess>
<onValidation>%aditoprj%/entity/Product_entity/entityfields/attributes/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>AttributeRelations</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
......@@ -338,11 +343,6 @@
<expose v="false" />
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>AttributeRelations</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>ExcludedProducts_param</name>
......@@ -351,12 +351,6 @@
</entityParameter>
<entityProvider>
<name>Products</name>
<children>
<entityParameter>
<name>ExcludedProducts_param</name>
<expose v="true" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>1b12e8ef-74ba-4294-bd2b-9d4afa80798c</name>
......@@ -383,6 +377,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ExcludedProducts_param</name>
<expose v="true" />
</entityParameter>
</children>
</entityProvider>
<entityActionField>
<name>newTask</name>
......@@ -393,6 +393,11 @@
<entityConsumer>
<name>Tasks</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>Tasks</fieldName>
</dependency>
<children>
<entityParameter>
<name>RowId_param</name>
......@@ -403,15 +408,15 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>Tasks</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>AttributeTree</name>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
......@@ -422,11 +427,6 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AttributeRelation_entity</entityName>
<fieldName>TreeProvider</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
......@@ -450,17 +450,17 @@
</entityField>
<entityConsumer>
<name>LogHistories</name>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
</dependency>
<children>
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>LogHistory_entity</entityName>
<fieldName>LogHistoryProvider</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>ProductText_param</name>
......@@ -468,6 +468,11 @@
</entityParameter>
<entityConsumer>
<name>DescriptionTranslations</name>
<dependency>
<name>dependency</name>
<entityName>DescriptionTranslation_entity</entityName>
<fieldName>DescriptionTranslations</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
......@@ -478,11 +483,6 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>DescriptionTranslation_entity</entityName>
<fieldName>DescriptionTranslations</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>openAdminView</name>
......@@ -511,6 +511,11 @@
</entityProvider>
<entityConsumer>
<name>KnowledgeManagements</name>
<dependency>
<name>dependency</name>
<entityName>KnowledgeManagement_entity</entityName>
<fieldName>Provider</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowId_param</name>
......@@ -521,40 +526,39 @@
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/knowledgemanagements/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>KnowledgeManagement_entity</entityName>
<fieldName>Provider</fieldName>
</dependency>
</entityConsumer>
<entityActionField>
<name>addToOrder</name>
<title>Add to order</title>
<onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:FILE_TEXT_O</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/stateProcess.js</stateProcess>
<name>addToOrder</name>
<title>Add to order</title>
<onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:FILE_TEXT_O</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtoorder/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>addToOffer</name>
<title>Add to offer</title>
<onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/stateProcess.js</stateProcess>
<name>addToOffer</name>
<title>Add to offer</title>
<onActionProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
<state>INVISIBLE</state>
<stateProcess>%aditoprj%/entity/Product_entity/entityfields/addtooffer/stateProcess.js</stateProcess>
</entityActionField>
<entityParameter>
<name>ShownInOfferMainView_param</name>
<expose v="true" />
<name>ShownInOfferMainView_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>ShownInOrderMainView_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>ShownInOrderMainView_param</name>
<expose v="true" />
<name>OrderOfferInformations_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>OrderOfferInformations_param</name>
<expose v="true" />
<name>ProductIds_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
......
entity/Product_entity/recordcontainers/db/conditionProcess.js
+ 7
− 1
View file @ b5680eb9
......@@ -5,10 +5,16 @@ import("Sql_lib");
var productCond = newWhere();
if(vars.exists("$param.ProductIds_param") && vars.get("$param.ProductIds_param"))
{
var includeIds = JSON.parse(vars.getString("$param.ProductIds_param"));
productCond.andIfSet("PRODUCT.PRODUCTID", includeIds, SqlBuilder.IN());
}
if (vars.exists("$param.ExcludedProducts_param") && vars.get("$param.ExcludedProducts_param"))
{
var excludedIds = JSON.parse(vars.getString("$param.ExcludedProducts_param"));
productCond.andIfSet("PRODUCT.PRODUCTID", excludedIds, SqlBuilder.NOT_IN());
}
result.string(productCond.toString());
\ No newline at end of file
result.string(productCond.toString());
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