diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod index b2ad0af5ac69ed0d7a9b41391bfcc688caee3d25..799264f70e0b81caec439c607a21904e10f3cb1d 100644 --- a/entity/Org_entity/Org_entity.aod +++ b/entity/Org_entity/Org_entity.aod @@ -183,6 +183,14 @@ <entityIncomingField> <name>Org_dfi</name> <fieldType>DEPENDENCY_IN</fieldType> + <dependencies> + <entityDependency> + <name>11f8e13a-d801-4bd6-829c-d334c49e9a4c</name> + <entityName>Pers_entity</entityName> + <fieldName>PersOrg_dfo</fieldName> + <isOutgoing v="false" /> + </entityDependency> + </dependencies> </entityIncomingField> <entityOutgoingField> <name>OrgAddress_dfo</name> diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod index ea906832581d2973f2cbde039057fb926d37d0d1..8dc53472d0bb7ff7574e9357c1e94284c8db0e0c 100644 --- a/entity/Pers_entity/Pers_entity.aod +++ b/entity/Pers_entity/Pers_entity.aod @@ -1,270 +1,281 @@ -<?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3"> - <name>Pers_entity</name> - <title>Contact</title> - <majorModelMode>DISTRIBUTED</majorModelMode> - <alias>Data_alias</alias> - <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess> - <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess> - <recordContainerType>DB</recordContainerType> - <caption>Contact</caption> - <captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess> - <iconId>VAADIN:USERS</iconId> - <imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess> - <entityFields> - <entityField> - <name>DATEOFBIRTH</name> - <tableName>PERS</tableName> - <columnName>DATEOFBIRTH</columnName> - <caption>Date of birth</caption> - <contentType>DATE</contentType> - <outputFormat>yyyy-MM-dd</outputFormat> - </entityField> - <entityField> - <name>PERS_DATE_EDIT</name> - <tableName>PERS</tableName> - <columnName>DATE_EDIT</columnName> - <contentType>DATE</contentType> - <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>PERS_DATE_NEW</name> - <tableName>PERS</tableName> - <columnName>DATE_NEW</columnName> - <contentType>DATE</contentType> - <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat> - <state>READONLY</state> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>FIRSTNAME</name> - <tableName>PERS</tableName> - <columnName>FIRSTNAME</columnName> - <caption>Firstname</caption> - </entityField> - <entityField> - <name>GENDER</name> - <tableName>PERS</tableName> - <columnName>GENDER</columnName> - <caption>Gender</caption> - <possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess> - </entityField> - <entityField> - <name>LASTNAME</name> - <tableName>PERS</tableName> - <columnName>LASTNAME</columnName> - <caption>Lastname</caption> - <mandatory v="true" /> - </entityField> - <entityField> - <name>MIDDLENAME</name> - <tableName>PERS</tableName> - <columnName>MIDDLENAME</columnName> - <caption>Middlename</caption> - </entityField> - <entityField> - <name>PERSID</name> - <tableName>PERS</tableName> - <columnName>PERSID</columnName> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/persid/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>SALUTATION</name> - <tableName>PERS</tableName> - <columnName>SALUTATION</columnName> - <caption>Salutation</caption> - </entityField> - <entityField> - <name>TITLE</name> - <tableName>PERS</tableName> - <columnName>TITLE</columnName> - <caption>Title</caption> - </entityField> - <entityField> - <name>TITLESUFFIX</name> - <tableName>PERS</tableName> - <columnName>TITLESUFFIX</columnName> - </entityField> - <entityField> - <name>PERS_USER_EDIT</name> - <tableName>PERS</tableName> - <columnName>USER_EDIT</columnName> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>PERS_USER_NEW</name> - <tableName>PERS</tableName> - <columnName>USER_NEW</columnName> - <state>READONLY</state> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>PREVIEWTITLE</name> - <caption></caption> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess> - </entityField> - <entityParameter> - <name>OrgId_param</name> - <expose v="true" /> - <triggerRecalculation v="true" /> - <description>PARAMETER</description> - </entityParameter> - <entityField> - <name>IMAGE</name> - <contentType>IMAGE</contentType> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/image/valueProcess.js</valueProcess> - </entityField> - <entityFieldGroup> - <name>NAME_fieldGroup</name> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess> - <description>FIELDGROUP</description> - <fields> - <element>FIRSTNAME</element> - <element>LASTNAME</element> - </fields> - </entityFieldGroup> - <entityOutgoingField> - <name>PersHistory_dfo</name> - <title>Histories</title> - <fieldType>DEPENDENCY_OUT</fieldType> - <dependency> - <name>dependency</name> - <entityName>History_entity</entityName> - <fieldName>PersHistory_dfi</fieldName> - </dependency> - <children> - <entityParameter> - <name>RowId_param</name> - <code>%aditoprj%/entity/Pers_entity/entityfields/pershistory_dfo/children/rowid_param/code.js</code> - </entityParameter> - </children> - </entityOutgoingField> - <entityField> - <name>RELATIONID</name> - <tableName>RELATION</tableName> - <columnName>RELATIONID</columnName> - </entityField> - <entityIncomingField> - <name>PersOrg_dfi</name> - <fieldType>DEPENDENCY_IN</fieldType> - <dependencies> - <entityDependency> - <name>41952879-c2f0-411f-8ca1-36c38914a629</name> - <entityName>Org_entity</entityName> - <fieldName>PersOrg_dfo</fieldName> - <isOutgoing v="false" /> - </entityDependency> - </dependencies> - </entityIncomingField> - <entityField> - <name>PERS_ID</name> - <tableName>RELATION</tableName> - <columnName>PERS_ID</columnName> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_id/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>ORG_ID</name> - <tableName>RELATION</tableName> - <columnName>ORG_ID</columnName> - <caption></caption> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>REL_USER_NEW</name> - <tableName>RELATION</tableName> - <columnName>USER_NEW</columnName> - <state>READONLY</state> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>REL_USER_EDIT</name> - <tableName>RELATION</tableName> - <columnName>DATE_EDIT</columnName> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>REL_DATE_NEW</name> - <tableName>RELATION</tableName> - <columnName>DATE_NEW</columnName> - <contentType>DATE</contentType> - <state>READONLY</state> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js</valueProcess> - </entityField> - <entityField> - <name>REL_DATE_EDIT</name> - <tableName>RELATION</tableName> - <columnName>DATE_EDIT</columnName> - <contentType>DATE</contentType> - <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess> - </entityField> - <entityOutgoingField> - <name>PersAddress_dfo</name> - <title>Addresses</title> - <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Addresses</caption> - <dependency> - <name>dependency</name> - <entityName>Address_entity</entityName> - <fieldName>PersAddress_dfi</fieldName> - </dependency> - <children> - <entityParameter> - <name>RelId_param</name> - <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js</code> - <triggerRecalculation v="true" /> - </entityParameter> - </children> - </entityOutgoingField> - <entityOutgoingField> - <name>PersComm_dfo</name> - <title>Communication</title> - <fieldType>DEPENDENCY_OUT</fieldType> - <caption>Communication</caption> - <dependency> - <name>dependency</name> - <entityName>Comm_entity</entityName> - <fieldName>PersComm_dfi</fieldName> - </dependency> - <children> - <entityParameter> - <name>RelId_param</name> - <code>%aditoprj%/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js</code> - <triggerRecalculation v="true" /> - </entityParameter> - </children> - </entityOutgoingField> - <entityField> - <name>ORGNAME</name> - <tableName>ORG</tableName> - <columnName>NAME</columnName> - <caption>Company</caption> - <linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js</linkedContextProcess> - <fieldIdProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/fieldIdProcess.js</fieldIdProcess> - </entityField> - <entityField> - <name>ORGID</name> - <tableName>ORG</tableName> - <columnName>ORGID</columnName> - </entityField> - </entityFields> - <linkInformation> - <linkInformation> - <name>ffff1758-e84e-47d8-a957-5989d0be7092</name> - <tableName>PERS</tableName> - <primaryKey>PERSID</primaryKey> - </linkInformation> - <linkInformation> - <name>5547b8d7-5145-4eb7-8698-c92674b4691f</name> - <tableName>RELATION</tableName> - <primaryKey>RELATIONID</primaryKey> - <isUIDTable v="true" /> - </linkInformation> - <linkInformation> - <name>dae8e70a-ec76-4c53-9799-ee04bfbe3bd2</name> - <tableName>ORG</tableName> - <primaryKey>ORGID</primaryKey> - <readonly v="true" /> - </linkInformation> - </linkInformation> -</entity> +<?xml version="1.0" encoding="UTF-8"?> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3"> + <name>Pers_entity</name> + <title>Contact</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <alias>Data_alias</alias> + <fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess> + <conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess> + <recordContainerType>DB</recordContainerType> + <caption>Contact</caption> + <captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess> + <iconId>VAADIN:USERS</iconId> + <imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess> + <entityFields> + <entityField> + <name>DATEOFBIRTH</name> + <tableName>PERS</tableName> + <columnName>DATEOFBIRTH</columnName> + <caption>Date of birth</caption> + <contentType>DATE</contentType> + <outputFormat>yyyy-MM-dd</outputFormat> + </entityField> + <entityField> + <name>PERS_DATE_EDIT</name> + <tableName>PERS</tableName> + <columnName>DATE_EDIT</columnName> + <contentType>DATE</contentType> + <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_edit/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>PERS_DATE_NEW</name> + <tableName>PERS</tableName> + <columnName>DATE_NEW</columnName> + <contentType>DATE</contentType> + <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_date_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>FIRSTNAME</name> + <tableName>PERS</tableName> + <columnName>FIRSTNAME</columnName> + <caption>Firstname</caption> + </entityField> + <entityField> + <name>GENDER</name> + <tableName>PERS</tableName> + <columnName>GENDER</columnName> + <caption>Gender</caption> + <possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/gender/possibleItemsProcess.js</possibleItemsProcess> + </entityField> + <entityField> + <name>LASTNAME</name> + <tableName>PERS</tableName> + <columnName>LASTNAME</columnName> + <caption>Lastname</caption> + <mandatory v="true" /> + </entityField> + <entityField> + <name>MIDDLENAME</name> + <tableName>PERS</tableName> + <columnName>MIDDLENAME</columnName> + <caption>Middlename</caption> + </entityField> + <entityField> + <name>PERSID</name> + <tableName>PERS</tableName> + <columnName>PERSID</columnName> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/persid/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>SALUTATION</name> + <tableName>PERS</tableName> + <columnName>SALUTATION</columnName> + <caption>Salutation</caption> + </entityField> + <entityField> + <name>TITLE</name> + <tableName>PERS</tableName> + <columnName>TITLE</columnName> + <caption>Title</caption> + </entityField> + <entityField> + <name>TITLESUFFIX</name> + <tableName>PERS</tableName> + <columnName>TITLESUFFIX</columnName> + </entityField> + <entityField> + <name>PERS_USER_EDIT</name> + <tableName>PERS</tableName> + <columnName>USER_EDIT</columnName> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_edit/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>PERS_USER_NEW</name> + <tableName>PERS</tableName> + <columnName>USER_NEW</columnName> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_user_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>PREVIEWTITLE</name> + <caption></caption> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/previewtitle/valueProcess.js</valueProcess> + </entityField> + <entityParameter> + <name>OrgId_param</name> + <expose v="true" /> + <triggerRecalculation v="true" /> + <description>PARAMETER</description> + </entityParameter> + <entityField> + <name>IMAGE</name> + <contentType>IMAGE</contentType> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/image/valueProcess.js</valueProcess> + </entityField> + <entityFieldGroup> + <name>NAME_fieldGroup</name> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess> + <description>FIELDGROUP</description> + <fields> + <element>FIRSTNAME</element> + <element>LASTNAME</element> + </fields> + </entityFieldGroup> + <entityOutgoingField> + <name>PersHistory_dfo</name> + <title>Histories</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>History_entity</entityName> + <fieldName>PersHistory_dfi</fieldName> + </dependency> + <children> + <entityParameter> + <name>RowId_param</name> + <code>%aditoprj%/entity/Pers_entity/entityfields/pershistory_dfo/children/rowid_param/code.js</code> + </entityParameter> + </children> + </entityOutgoingField> + <entityField> + <name>RELATIONID</name> + <tableName>RELATION</tableName> + <columnName>RELATIONID</columnName> + </entityField> + <entityIncomingField> + <name>PersOrg_dfi</name> + <fieldType>DEPENDENCY_IN</fieldType> + <dependencies> + <entityDependency> + <name>41952879-c2f0-411f-8ca1-36c38914a629</name> + <entityName>Org_entity</entityName> + <fieldName>PersOrg_dfo</fieldName> + <isOutgoing v="false" /> + </entityDependency> + </dependencies> + </entityIncomingField> + <entityField> + <name>PERS_ID</name> + <tableName>RELATION</tableName> + <columnName>PERS_ID</columnName> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/pers_id/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>ORG_ID</name> + <tableName>RELATION</tableName> + <columnName>ORG_ID</columnName> + <caption></caption> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>REL_USER_NEW</name> + <tableName>RELATION</tableName> + <columnName>USER_NEW</columnName> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>REL_USER_EDIT</name> + <tableName>RELATION</tableName> + <columnName>DATE_EDIT</columnName> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_user_edit/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>REL_DATE_NEW</name> + <tableName>RELATION</tableName> + <columnName>DATE_NEW</columnName> + <contentType>DATE</contentType> + <state>READONLY</state> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_new/valueProcess.js</valueProcess> + </entityField> + <entityField> + <name>REL_DATE_EDIT</name> + <tableName>RELATION</tableName> + <columnName>DATE_EDIT</columnName> + <contentType>DATE</contentType> + <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/rel_date_edit/valueProcess.js</valueProcess> + </entityField> + <entityOutgoingField> + <name>PersAddress_dfo</name> + <title>Addresses</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <caption>Addresses</caption> + <dependency> + <name>dependency</name> + <entityName>Address_entity</entityName> + <fieldName>PersAddress_dfi</fieldName> + </dependency> + <children> + <entityParameter> + <name>RelId_param</name> + <code>%aditoprj%/entity/Pers_entity/entityfields/persaddress_dfo/children/relid_param/code.js</code> + <triggerRecalculation v="true" /> + </entityParameter> + </children> + </entityOutgoingField> + <entityOutgoingField> + <name>PersComm_dfo</name> + <title>Communication</title> + <fieldType>DEPENDENCY_OUT</fieldType> + <caption>Communication</caption> + <dependency> + <name>dependency</name> + <entityName>Comm_entity</entityName> + <fieldName>PersComm_dfi</fieldName> + </dependency> + <children> + <entityParameter> + <name>RelId_param</name> + <code>%aditoprj%/entity/Pers_entity/entityfields/perscomm_dfo/children/relid_param/code.js</code> + <triggerRecalculation v="true" /> + </entityParameter> + </children> + </entityOutgoingField> + <entityField> + <name>ORGNAME</name> + <tableName>ORG</tableName> + <columnName>NAME</columnName> + <caption>Company</caption> + <linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js</linkedContextProcess> + <mandatory v="true" /> + <outgoingField>PersOrg_dfo</outgoingField> + <fieldIdProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/fieldIdProcess.js</fieldIdProcess> + </entityField> + <entityField> + <name>ORGID</name> + <tableName>ORG</tableName> + <columnName>ORGID</columnName> + </entityField> + <entityOutgoingField> + <name>PersOrg_dfo</name> + <fieldType>DEPENDENCY_OUT</fieldType> + <dependency> + <name>dependency</name> + <entityName>Org_entity</entityName> + <fieldName>Org_dfi</fieldName> + </dependency> + </entityOutgoingField> + </entityFields> + <linkInformation> + <linkInformation> + <name>ffff1758-e84e-47d8-a957-5989d0be7092</name> + <tableName>PERS</tableName> + <primaryKey>PERSID</primaryKey> + </linkInformation> + <linkInformation> + <name>5547b8d7-5145-4eb7-8698-c92674b4691f</name> + <tableName>RELATION</tableName> + <primaryKey>RELATIONID</primaryKey> + <isUIDTable v="true" /> + </linkInformation> + <linkInformation> + <name>dae8e70a-ec76-4c53-9799-ee04bfbe3bd2</name> + <tableName>ORG</tableName> + <primaryKey>ORGID</primaryKey> + <readonly v="true" /> + </linkInformation> + </linkInformation> +</entity> diff --git a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js index f46eabe6e8b9982d38498d4ec9293f71ad377520..ec9fb8b7c0230514f925409c072072c3b5245b0c 100644 --- a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js +++ b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js @@ -1,11 +1,11 @@ -import("system.logging"); -import("system.vars"); -import("system.result"); -import("system.neon"); - -var orgid = vars.getString("$field.ORGID"); - -if((orgid == null || orgid.trim() == "0") && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)) - result.string(null); -else - result.string("Org_context"); +import("system.logging"); +import("system.vars"); +import("system.result"); +import("system.neon"); + +var orgid = vars.getString("$field.ORGID"); + +if((orgid == null || orgid.trim() == "0") && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)) + result.string(null); +else + result.string("Org_context"); diff --git a/neonContext/Org_context/Org_context.aod b/neonContext/Org_context/Org_context.aod index c9a5b204f3b4e4a97f86b3e8ae7509fd265c4ca3..388b6446c3b02f5ddfd7f0726af591ea0854193c 100644 --- a/neonContext/Org_context/Org_context.aod +++ b/neonContext/Org_context/Org_context.aod @@ -9,6 +9,7 @@ <filterview>OrgFilter_view</filterview> <editview>OrgEdit_view</editview> <preview>OrgPreview_view</preview> + <lookupview>OrgFilter_view</lookupview> <entity>Org_entity</entity> <references> <neonViewReference> diff --git a/neonView/PersFilter_view/PersFilter_view.aod b/neonView/PersFilter_view/PersFilter_view.aod index 3dca796089029c3a388fd100826cd44938f92027..b8f86322d84be98eeb9378ec3f60e9846e428644 100644 --- a/neonView/PersFilter_view/PersFilter_view.aod +++ b/neonView/PersFilter_view/PersFilter_view.aod @@ -43,10 +43,12 @@ <neonTableColumn> <name>2cdfaf73-d3ee-4ad8-83ea-f50acba0335a</name> <entityField>TITLE</entityField> + <collapse v="true" /> </neonTableColumn> <neonTableColumn> <name>210cc6ab-5023-4d8a-8f2e-a6cd91d994ef</name> <entityField>FIRSTNAME</entityField> + <collapse v="true" /> </neonTableColumn> <neonTableColumn> <name>187bcb25-db19-4e35-8723-34764166b7bd</name> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 8fcbb815aad5cead7402f24d249fc968f7af9e89..a126a609dd8e1b45cd5deac397ff961e5e560edf 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> -<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1"> - <name>_____PREFERENCES_PROJECT</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <projectName>xRM-Basic 5</projectName> - <jditoMaxContentSize v="57671680" /> - <clientSearchOptimizedForSpeed v="true" /> - <clientSearchExcludeForIgnorecase v="true" /> - <blobHandlingMethod>DATABASE</blobHandlingMethod> - <databaseAuditGetOldValueLobs v="false" /> - <indexsearchFullIndexerEnabled v="true" /> - <indexsearchFullIndexerInterval v="0" /> - <indexsearchIncrementingIndexerEnabled v="true" /> - <indexsearchIncrementingIndexerInterval v="1000" /> - <indexsearchIncrementingIndexerBunchSize v="250" /> - <indexsearchMaximumHits v="50000" /> -</preferences> +<?xml version="1.0" encoding="UTF-8"?> +<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1"> + <name>_____PREFERENCES_PROJECT</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <projectName>xRM-Basic-5</projectName> + <jditoMaxContentSize v="57671680" /> + <clientSearchOptimizedForSpeed v="true" /> + <clientSearchExcludeForIgnorecase v="true" /> + <blobHandlingMethod>DATABASE</blobHandlingMethod> + <databaseAuditGetOldValueLobs v="false" /> + <indexsearchFullIndexerEnabled v="true" /> + <indexsearchFullIndexerInterval v="0" /> + <indexsearchIncrementingIndexerEnabled v="true" /> + <indexsearchIncrementingIndexerInterval v="1000" /> + <indexsearchIncrementingIndexerBunchSize v="250" /> + <indexsearchMaximumHits v="50000" /> +</preferences> diff --git a/process/IndexSearch_lib/process.js b/process/IndexSearch_lib/process.js index 867c245f45bc73d70a010a1794e917f44f13f59b..355f73d542a6f979ef23dcc47be2b0f101f271da 100644 --- a/process/IndexSearch_lib/process.js +++ b/process/IndexSearch_lib/process.js @@ -1,61 +1,61 @@ -function IndexsearchUtils(){ - this.getAffectedIdValues = function(fieldname, affectedInfoContainer, updateFn){ - var affectedIds; - switch (affectedInfoContainer.action){ - case "I": - affectedIds = [affectedInfoContainer.newValues[affectedInfoContainer.columns.indexOf(fieldname)]]; - break; - case "U": - affectedIds = updateFn.call(null, affectedInfoContainer.id); - break; - case "D": - affectedIds = [affectedInfoContainer.oldValues[affectedInfoContainer.columns.indexOf(fieldname)]]; - break; - } - return affectedIds || []; - } - - this.createAffectedInfoContainer = function(changedIdValue, changedTable, action, columnsFn, oldValueFn, newValueFn){ - var res, internalStorage; - internalStorage = {}; - res = { - id: changedIdValue - ,table: changedTable - ,action: action - ,columns: null //null for autocomplete in the ADITO-designer - ,oldValues: null - ,newValues: null - }; - Object.defineProperty(res, "columns", { - get: function(){ - if (internalStorage["columns"] == undefined) - internalStorage["columns"] = columnsFn.call(null); - return internalStorage["columns"]; - } - ,set: function (v){ - internalStorage["columns"] = v; - } - }); - Object.defineProperty(res, "oldValues", { - get: function(){ - if (internalStorage["oldValues"] == undefined) - internalStorage["oldValues"] = oldValueFn.call(null); - return internalStorage["oldValues"]; - } - ,set: function (v){ - internalStorage["oldValues"] = v; - } - }); - Object.defineProperty(res, "newValues", { - get: function(){ - if (internalStorage["newValues"] == undefined) - internalStorage["newValues"] = newValueFn.call(null); - return internalStorage["newValues"]; - } - ,set: function (v){ - internalStorage["newValues"] = v; - } - }); - return res; - } +function IndexsearchUtils(){ + this.getAffectedIdValues = function(fieldname, affectedInfoContainer, updateFn){ + var affectedIds; + switch (affectedInfoContainer.action){ + case "I": + affectedIds = [affectedInfoContainer.newValues[affectedInfoContainer.columns.indexOf(fieldname)]]; + break; + case "U": + affectedIds = updateFn.call(null, affectedInfoContainer.id); + break; + case "D": + affectedIds = [affectedInfoContainer.oldValues[affectedInfoContainer.columns.indexOf(fieldname)]]; + break; + } + return affectedIds || []; + } + + this.createAffectedInfoContainer = function(changedIdValue, changedTable, action, columnsFn, oldValueFn, newValueFn){ + var res, internalStorage; + internalStorage = {}; + res = { + id: changedIdValue + ,table: changedTable + ,action: action + ,columns: null //null for autocomplete in the ADITO-designer + ,oldValues: null + ,newValues: null + }; + Object.defineProperty(res, "columns", { + get: function(){ + if (internalStorage["columns"] == undefined) + internalStorage["columns"] = columnsFn.call(null); + return internalStorage["columns"]; + } + ,set: function (v){ + internalStorage["columns"] = v; + } + }); + Object.defineProperty(res, "oldValues", { + get: function(){ + if (internalStorage["oldValues"] == undefined) + internalStorage["oldValues"] = oldValueFn.call(null); + return internalStorage["oldValues"]; + } + ,set: function (v){ + internalStorage["oldValues"] = v; + } + }); + Object.defineProperty(res, "newValues", { + get: function(){ + if (internalStorage["newValues"] == undefined) + internalStorage["newValues"] = newValueFn.call(null); + return internalStorage["newValues"]; + } + ,set: function (v){ + internalStorage["newValues"] = v; + } + }); + return res; + } } \ No newline at end of file