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

AddressType filter by ContactType

parent 325292a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 32 deletions
entity/AddressType_entity/AddressType_entity.aod
+ 9
− 0
View file @ ab4f3a4c
......@@ -21,6 +21,14 @@
<name>ByCategory</name>
<fieldType>DEPENDENCY_IN</fieldType>
<lookupIdfield>KEYID</lookupIdfield>
<dependencies>
<entityDependency>
<name>b6ddc934-51ac-43a5-8aa9-7239423ea14d</name>
<entityName>Address_entity</entityName>
<fieldName>KeywordAddressType</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>usageFilter_param</name>
......@@ -32,6 +40,7 @@
<entityParameter>
<name>usageFilter_param</name>
<title></title>
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
</entityFields>
......
entity/AddressType_entity/recordcontainers/db/conditionProcess.js
+ 10
− 7
View file @ ab4f3a4c
import("system.db");
import("system.vars");
import("system.result");
import("KeywordRegistry_basic");
......@@ -11,12 +12,14 @@ var cond = SqlCondition.begin()
var usageFilter = vars.get("$param.usageFilter_param");
if (usageFilter)
{
var keywordAttribute = KeywordAttribute($KeywordRegistry.addressType(), usageFilter);
"AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID in (\n\
select AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID \n\
from AB_KEYWORD_ATTRIBUTERELATION " + SqlCondition.begin()
.andPrepare("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", keywordAttribute.id)
.andPrepare("AB_KEYWORD_ATTRIBUTERELATION.VALUE_??", keywordAttribute.id)//should be generated automatically
var keywordAttribute = new KeywordAttribute($KeywordRegistry.addressType(), usageFilter);
cond.andAttachPrepared(SqlCondition.begin()
.andPrepare("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", keywordAttribute.id)
.andPrepare("AB_KEYWORD_ATTRIBUTERELATION." + keywordAttribute.dbField, "1")
.buildSql("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID in (\n\
select AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID \n\
from AB_KEYWORD_ATTRIBUTERELATION ", null, ")"));
}
cond = db.translateStatement(cond.build("1 = 2"));
result.string(cond);
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 7
− 10
View file @ ab4f3a4c
......@@ -72,7 +72,6 @@
<entityProvider>
<name>OrganisationAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
......@@ -85,7 +84,7 @@
<entityParameter>
<name>ContactType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code>
<expose v="true" />
<expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
......@@ -107,7 +106,6 @@
<entityProvider>
<name>ContactAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
......@@ -120,7 +118,7 @@
<entityParameter>
<name>ContactType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code>
<expose v="true" />
<expose v="false" />
<triggerRecalculation v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
......@@ -150,7 +148,6 @@
<name>OrganisationAddressesByContact</name>
<fieldType>DEPENDENCY_IN</fieldType>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
......@@ -163,7 +160,7 @@
<entityParameter>
<name>ContactType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code>
<expose v="true" />
<expose v="false" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
......@@ -193,13 +190,13 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
<entityName>AddressType_entity</entityName>
<fieldName>ByCategory</fieldName>
</dependency>
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js</code>
<name>usageFilter_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/usagefilter_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
......
entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js
+ 3
− 1
View file @ ab4f3a4c
import("system.result");
result.object(2);
\ No newline at end of file
import("Contact_lib");
result.object(Contact.TYPES.Contact);
\ No newline at end of file
entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js deleted 100644 → 0
+ 0
− 5
View file @ 325292a4
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.addressType());
\ No newline at end of file
entity/Address_entity/entityfields/keywordaddresstype/children/usagefilter_param/code.js 0 → 100644
+ 20
− 0
View file @ ab4f3a4c
import("system.logging");
import("system.vars");
import("system.result");
import("Contact_lib");
var keywordAttributeFilterName = "";
var contactType = vars.get("$param.ContactType_param");
switch (contactType) {
case Contact.TYPES.Contact:
case Contact.TYPES.Private:
keywordAttributeFilterName = "contact";
break;
case Contact.TYPES.Organisation:
keywordAttributeFilterName = "organisation";
break;
}
logging.log("contactType>>" + contactType);
logging.log("keywordAttributeFilterName>>" + keywordAttributeFilterName);
result.object(keywordAttributeFilterName);
\ No newline at end of file
entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js
+ 2
− 1
View file @ ab4f3a4c
import("system.result");
import("Contact_lib");
result.object(1);
\ No newline at end of file
result.object(Contact.TYPES.Organisation);
\ No newline at end of file
entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js
+ 2
− 1
View file @ ab4f3a4c
import("system.result");
import("Contact_lib");
result.object(1);
\ No newline at end of file
result.object(Contact.TYPES.Organisation);
\ No newline at end of file
entity/KeywordEntry_entity/KeywordEntry_entity.aod
+ 0
− 6
View file @ ab4f3a4c
......@@ -270,12 +270,6 @@
<fieldName>KeywordMedium</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>2ed3c1ee-0cae-4017-aaf2-49bf4307abc4</name>
<entityName>Address_entity</entityName>
<fieldName>KeywordAddressType</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
<entityName>Organisation_entity</entityName>
......
neonContext/AddressType/AddressType.aod 0 → 100644
+ 6
− 0
View file @ ab4f3a4c
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
<name>AddressType</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entity>AddressType_entity</entity>
</neonContext>
others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AddressType.xml
+ 1
− 1
View file @ ab4f3a4c
......@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="1d5c5d49-0ffd-47fb-af10-542f7cf454cd"/>
<column name="NAME" value="organinsation"/>
<column name="NAME" value="organisation"/>
<column name="CONTAINER" value="AddressType"/>
<column name="TYPE" value="BOOL_VALUE"/>
</insert>
......
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