Skip to content
Snippets Groups Projects
Commit 46b22bff authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge remote-tracking branch 'remotes/origin/master' into object-relation 

# Conflicts:
#	entity/Activity_entity/Activity_entity.aod
#	entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js
#	entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js
#	entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js
#	entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js
#	entity/Activity_entity/entityfields/alldocuments/children/assignmentname_param/code.js
#	entity/Activity_entity/entityfields/alldocuments/children/assignmentrowid_param/code.js
#	entity/Activity_entity/entityfields/alldocuments/children/assignmenttable_param/code.js
#	entity/Activity_entity/entityfields/documents/children/assignmentname_param/code.js
#	entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/code.js
#	entity/Activity_entity/entityfields/documents/children/assignmenttable_param/code.js
#	entity/Activity_entity/entityfields/maindocuments/children/keyword_param/code.js
#	entity/Address_entity/Address_entity.aod
#	entity/Address_entity/entityfields/orgaddresses/children/relationtype_param/code.js
#	entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js
#	entity/Address_entity/entityfields/persaddresses/children/relationtype_param/code.js
#	entity/AttributeRelation_entity/AttributeRelation_entity.aod
#	entity/AttributeUsage_entity/AttributeUsage_entity.aod
#	entity/Attribute_entity/Attribute_entity.aod
#	entity/Communication_entity/Communication_entity.aod
#	entity/Contact_entity/Contact_entity.aod
#	entity/Contact_entity/entityfields/activities/children/objectid_param/code.js
#	entity/Contact_entity/entityfields/activities/children/rowid_param/code.js
#	entity/Contact_entity/entityfields/communications/children/relid_param/code.js
#	entity/Contact_entity/entityfields/contracts/children/relid_param/code.js
#	entity/Contact_entity/entityfields/documents/children/assignmentrowid_param/code.js
#	entity/Contact_entity/entityfields/documents/children/assignmenttable_param/code.js
#	entity/Contact_entity/entityfields/emailcommunications/children/relid_param/code.js
#	entity/Contact_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
#	entity/Contact_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
#	entity/Contact_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
#	entity/Contact_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
#	entity/Contact_entity/entityfields/orgaddresses/children/relid_param/code.js
#	entity/Contact_entity/entityfields/persactivity_dfo/children/objectid_param/code.js
#	entity/Contact_entity/entityfields/persactivity_dfo/children/rowid_param/code.js
#	entity/Contact_entity/entityfields/persaddress_dfo/children/defaultaddressid_param/code.js
#	entity/Contact_entity/entityfields/persaddress_dfo/children/relationtype_param/code.js
#	entity/Contact_entity/entityfields/persaddress_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
#	entity/Contact_entity/entityfields/persaddresses/children/relid_param/code.js
#	entity/Contact_entity/entityfields/perscomm_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/perscommemail_dfo/children/commcategory_param/code.js
#	entity/Contact_entity/entityfields/perscommemail_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/perscommphone_dfo/children/commcategory_param/code.js
#	entity/Contact_entity/entityfields/perscommphone_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/perscontract_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/persdocument_dfo/children/assignmentname_param/code.js
#	entity/Contact_entity/entityfields/persdocument_dfo/children/assignmentrowid_param/code.js
#	entity/Contact_entity/entityfields/persdocument_dfo/children/assignmenttable_param/code.js
#	entity/Contact_entity/entityfields/persorgsaddresses_dfo/children/relationtype_param/code.js
#	entity/Contact_entity/entityfields/persorgsaddresses_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/perspricelist_dfo/children/relid_param/code.js
#	entity/Contact_entity/entityfields/perspricelist_dfo/stateProcess.js
#	entity/Contact_entity/entityfields/phonecommunications/children/relid_param/code.js
#	entity/Contact_entity/entityfields/pricelists/children/relid_param/code.js
#	entity/Contact_entity/entityfields/pricelists/stateProcess.js
#	entity/Context_entity/Context_entity.aod
#	entity/Contract_entity/Contract_entity.aod
#	entity/Countries_Entity/Countries_Entity.aod
#	entity/Document_entity/Document_entity.aod
#	entity/Document_entity/entityfields/maindocuments/children/keyword_param/code.js
#	entity/Gender_keyword/Gender_keyword.aod
#	entity/Keyword_entity/entityfields/onlyactives/code.js
#	entity/ObjectRelation_entity/ObjectRelation_entity.aod
#	entity/Order_entity/entityfields/maindocuments/children/assignmentname_param/code.js
#	entity/Org_entity/entityfields/activities/children/objectid_param/code.js
#	entity/Org_entity/entityfields/activities/children/rowid_param/code.js
#	entity/Org_entity/entityfields/addresses/children/defaultaddressid_param/code.js
#	entity/Org_entity/entityfields/addresses/children/relationtype_param/code.js
#	entity/Org_entity/entityfields/addresses/children/relid_param/code.js
#	entity/Org_entity/entityfields/attributes/children/objectrowid_param/code.js
#	entity/Org_entity/entityfields/attributes/children/objecttype_param/code.js
#	entity/Org_entity/entityfields/communications/children/relid_param/code.js
#	entity/Org_entity/entityfields/contacts/children/orgid_param/code.js
#	entity/Org_entity/entityfields/contracts/children/relid_param/code.js
#	entity/Org_entity/entityfields/documents/children/assignmentname_param/code.js
#	entity/Org_entity/entityfields/documents/children/assignmentrowid_param/code.js
#	entity/Org_entity/entityfields/documents/children/assignmenttable_param/code.js
#	entity/Org_entity/entityfields/emailcommunications/children/relid_param/code.js
#	entity/Org_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
#	entity/Org_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
#	entity/Org_entity/entityfields/phonecommunications/children/commcategory_param/code.js
#	entity/Org_entity/entityfields/phonecommunications/children/relid_param/code.js
#	entity/Org_entity/entityfields/productprices/children/relid_param/code.js
#	entity/Org_entity/entityfields/products/children/relationid_param/code.js
#	entity/Organisation_entity/Organisation_entity.aod
#	entity/Organisation_entity/entityfields/activities/children/objectid_param/code.js
#	entity/Organisation_entity/entityfields/addresses/children/defaultaddressid_param/code.js
#	entity/Organisation_entity/entityfields/addresses/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js
#	entity/Organisation_entity/entityfields/attributes/children/objecttype_param/code.js
#	entity/Organisation_entity/entityfields/communications/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/contacts/children/orgid_param/code.js
#	entity/Organisation_entity/entityfields/contracts/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/documents/children/assignmentname_param/code.js
#	entity/Organisation_entity/entityfields/documents/children/assignmentrowid_param/code.js
#	entity/Organisation_entity/entityfields/documents/children/assignmenttable_param/code.js
#	entity/Organisation_entity/entityfields/emailcommunications/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/objectrelation_dfo/children/anyobjectrowid_param/code.js
#	entity/Organisation_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
#	entity/Organisation_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
#	entity/Organisation_entity/entityfields/orgactivity_dfo/children/objectid_param/code.js
#	entity/Organisation_entity/entityfields/orgactivity_dfo/children/rowid_param/code.js
#	entity/Organisation_entity/entityfields/orgaddress_dfo/children/defaultaddressid_param/code.js
#	entity/Organisation_entity/entityfields/orgaddress_dfo/children/relationtype_param/code.js
#	entity/Organisation_entity/entityfields/orgaddress_dfo/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/orgattr_dfo/children/objectrowid_param/code.js
#	entity/Organisation_entity/entityfields/orgcomm_dfo/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/orgcommemail_dfo/children/commcategory_param/code.js
#	entity/Organisation_entity/entityfields/orgcommemail_dfo/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/orgcommphone_dfo/children/commcategory_param/code.js
#	entity/Organisation_entity/entityfields/orgcommphone_dfo/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/orgcontract_dfo/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmentname_param/code.js
#	entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmentrowid_param/code.js
#	entity/Organisation_entity/entityfields/orgdocument_dfo/children/assignmenttable_param/code.js
#	entity/Organisation_entity/entityfields/orgproduct_dfo/children/relationid_param/code.js
#	entity/Organisation_entity/entityfields/orgproductprice_dfo/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/persorg_dfo/children/orgid_param/code.js
#	entity/Organisation_entity/entityfields/phonecommunications/children/relid_param/code.js
#	entity/Organisation_entity/entityfields/productprices/children/relid_param/code.js
#	entity/Pers_entity/entityfields/activities/children/objectid_param/code.js
#	entity/Pers_entity/entityfields/activities/children/rowid_param/code.js
#	entity/Pers_entity/entityfields/communications/children/relid_param/code.js
#	entity/Pers_entity/entityfields/contracts/children/relid_param/code.js
#	entity/Pers_entity/entityfields/documents/children/assignmentname_param/code.js
#	entity/Pers_entity/entityfields/documents/children/assignmentrowid_param/code.js
#	entity/Pers_entity/entityfields/documents/children/assignmenttable_param/code.js
#	entity/Pers_entity/entityfields/emailcommunications/children/relid_param/code.js
#	entity/Pers_entity/entityfields/objectrelations/children/anyobjectrowid_param/code.js
#	entity/Pers_entity/entityfields/orgaddresses/children/relationtype_param/code.js
#	entity/Pers_entity/entityfields/orgaddresses/children/relid_param/code.js
#	entity/Pers_entity/entityfields/persaddresses/children/defaultaddressid_param/code.js
#	entity/Pers_entity/entityfields/persaddresses/children/relationtype_param/code.js
#	entity/Pers_entity/entityfields/persaddresses/children/relid_param/code.js
#	entity/Pers_entity/entityfields/phonecommunications/children/relid_param/code.js
#	entity/Pers_entity/entityfields/pricelists/stateProcess.js
#	entity/Product_entity/Product_entity.aod
#	entity/Productprice_entity/Productprice_entity.aod
#	entity/Relation_entity/Relation_entity.aod
#	entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
#	entity/Salesproject_entity/Salesproject_entity.aod
#	entity/Salesproject_entity/entityfields/objectrelations/children/anyobjecttype_param/code.js
#	entity/Turnover_entity/Turnover_entity.aod
#	neonView/ActivityMain_view/ActivityMain_view.aod
#	neonView/ContactEdit_view/ContactEdit_view.aod
#	neonView/ContactPreview_view/ContactPreview_view.aod
#	neonView/OrganisationEdit_view/OrganisationEdit_view.aod
#	neonView/OrganisationMain_view/OrganisationMain_view.aod
#	neonView/OrganisationPreview_view/OrganisationPreview_view.aod
#	others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_activityDirection.xml
parents ce176361 d152bb58
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 152 additions and 1845 deletions
.aditoprj/project.version
+ 1
− 0
View file @ 46b22bff
#This file is generated by ADITO designer. Do NOT delete or modify!
#Tue Feb 05 08:37:18 CET 2019
version=5.1.8
.netbeans.xml 0 → 100644
+ 6
− 0
View file @ 46b22bff
<?xml version="1.0" encoding="UTF-8"?>
<auxiliary-configuration xmlns="http://www.netbeans.org/ns/auxiliary-configuration/1">
<spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
<word>organisation</word>
</spellchecker-wordlist>
</auxiliary-configuration>
aliasDefinition/Data_alias/Data_alias.aod
+ 52
− 1708
View file @ 46b22bff
This diff is collapsed.
application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+ 3
− 2
View file @ 46b22bff
......@@ -6,8 +6,8 @@
<node name="CONTACTS" kind="123" title="Contactmanagement">
<icon>VAADIN:STAR</icon>
<node name="Group1" kind="123" title="">
<node name="Pers_context" kind="10077" />
<node name="Org_context" kind="10077" />
<node name="Contact_context" kind="10077" />
<node name="Organisation_context" kind="10077" />
<node name="Activity_context" kind="10077" />
<node name="Task_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
......@@ -30,6 +30,7 @@
<icon>VAADIN:CONTROLLER</icon>
<node name="Group3" kind="123" title="">
<node name="Attribute_context" kind="10077" />
<node name="Keyword_context" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
......
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 1
− 33
View file @ 46b22bff
......@@ -19,22 +19,6 @@
<title>Beziehung</title>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ACTIVITY_ID</name>
</entityField>
......@@ -51,7 +35,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
<name>byObject_dfi</name>
<name>Link</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
......@@ -87,14 +71,6 @@
<name>ACTIVITYLINKID.value</name>
<recordfield>ACTIVITYLINK.ACTIVITYLINKID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.value</name>
<recordfield>ACTIVITYLINK.OBJECT_ROWID</recordfield>
......@@ -103,14 +79,6 @@
<name>OBJECT_TYPE.value</name>
<recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ACTIVITYLINK.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.displayValue</name>
<expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
......
entity/Activity_entity/Activity_entity.aod
+ 38
− 54
View file @ 46b22bff
......@@ -11,7 +11,7 @@
<entityField>
<name>DIRECTION</name>
<title>Direction</title>
<consumer>Directions</consumer>
<consumer>KeywordDirections</consumer>
<groupable v="true" />
</entityField>
<entityField>
......@@ -53,16 +53,6 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>USER_NEW</name>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SUBJECT_DETAILS</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/subject_details/valueProcess.js</valueProcess>
......@@ -74,6 +64,7 @@
</entityField>
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
</entityProvider>
<entityField>
<name>ICON</name>
......@@ -88,14 +79,6 @@
<mandatory v="false" />
<documentation>%aditoprj%/entity/Activity_entity/entityfields/onlyinnate_param/documentation.adoc</documentation>
</entityParameter>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ObjectId_param</name>
<expose v="true" />
......@@ -104,54 +87,50 @@
<documentation>%aditoprj%/entity/Activity_entity/entityfields/objectid_param/documentation.adoc</documentation>
</entityParameter>
<entityConsumer>
<name>ActivityDocument_dfo</name>
<name>Documents</name>
<title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>ActivityDocument_dfi</fieldName>
<fieldName>Documents</fieldName>
</dependency>
<children>
<entityParameter>
<name>AssignmentName_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentname_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentname_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmentrowid_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitydocument_dfo/children/assignmenttable_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/documents/children/assignmenttable_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ActivityMainDocument_dfo</name>
<name>MainDocuments</name>
<title>Maindocuments</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Document_entity</entityName>
<fieldName>ActivityMainDocuments_dfi</fieldName>
<fieldName>MainDocuments</fieldName>
</dependency>
<children>
<entityParameter>
<name>Keyword_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/keyword_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentTable_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmenttable_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmenttable_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentRowId_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentrowid_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>AssignmentName_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitymaindocument_dfo/children/assignmentname_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/maindocuments/children/assignmentname_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
......@@ -173,47 +152,47 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
<name>ActivityObjectRelation_dfo</name>
<name>ObjectRelations</name>
<title>Relations</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>ObjectRelation_entity</entityName>
<fieldName>ByObject1_dfi</fieldName>
<fieldName>Object1</fieldName>
</dependency>
<children>
<entityParameter>
<name>Object1Rowid_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1rowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/objectrelations/children/object1type_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>ActivityLink_dfo</name>
<name>Links</name>
<title>Beziehungen</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>ActivityLink_entity</entityName>
<fieldName>byObject_dfi</fieldName>
<fieldName>Link</fieldName>
</dependency>
<children>
<entityParameter>
<name>ObjectRowid_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objectrowid_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js</code>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/activitylink_dfo/children/objecttype_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>Directions</name>
<name>KeywordDirections</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
......@@ -223,13 +202,15 @@
<children>
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/Activity_entity/entityfields/directions/children/containername_param/code.js</code>
<code>%aditoprj%/entity/Activity_entity/entityfields/keyworddirections/children/containername_param/code.js</code>
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
<name>LinkedObjects</name>
<fieldType>DEPENDENCY_IN</fieldType>
<documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>8ececf30-a3bc-4cd2-ad04-fb9f3cb9332d</name>
......@@ -240,18 +221,18 @@
<entityDependency>
<name>549af7f6-3828-4c15-8357-72f0c6fc4f0c</name>
<entityName>Contract_entity</entityName>
<fieldName>ContractActivity_dfo</fieldName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>49a91b21-f24e-45c6-9b2c-5bb15d808d43</name>
<entityName>Org_entity</entityName>
<entityName>Organisation_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>6461d7f4-182f-4e5c-9453-49c145e15476</name>
<entityName>Pers_entity</entityName>
<entityName>Contact_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
......@@ -264,9 +245,16 @@
<entityParameter>
<name>OnlyInnate_param</name>
<expose v="false" />
<documentation>%aditoprj%/entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityProvider>
<entityField>
<name>CREATOR</name>
<title>Creator</title>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/creator/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -286,10 +274,6 @@
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>ACTIVITY.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ACTIVITYID.value</name>
<recordfield>ACTIVITY.ACTIVITYID</recordfield>
......@@ -310,10 +294,6 @@
<name>ENTRYDATE.value</name>
<recordfield>ACTIVITY.ENTRYDATE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ACTIVITY.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CATEGORY.value</name>
<recordfield>ACTIVITY.CATEGORY</recordfield>
......@@ -322,6 +302,10 @@
<name>DIRECTION.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/direction.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CREATOR.value</name>
<recordfield>ACTIVITY.CREATOR</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Pers_entity/entityfields/pers_user_new/valueProcess.js → entity/Activity_entity/entityfields/creator/valueProcess.js
+ 8
− 0
View file @ 46b22bff
import("system.vars");
import("system.result");
import("system.vars");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(vars.get("$sys.user"));
}
\ No newline at end of file
entity/Activity_entity/entityfields/linkedobjects/children/onlyinnate_param/documentation.adoc 0 → 100644
+ 1
− 0
View file @ 46b22bff
The `OnlyInnate_param` specifies a filter where only own records (records you created) are displayed.
\ No newline at end of file
entity/Activity_entity/entityfields/linkedobjects/documentation.adoc 0 → 100644
+ 2
− 0
View file @ 46b22bff
Provides records via ActivityLinks.
Every Activity can have 0..n link-records. This provider can be used to retrieve Activity Records from another object that is linkable.(e.g. get all Activites of a specific contactperson)
\ No newline at end of file
entity/Activity_entity/recordcontainers/db/conditionProcess.js
+ 1
− 1
View file @ 46b22bff
......@@ -13,7 +13,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
}
if(vars.exists("$param.OnlyInnate_param") && vars.get("$param.OnlyInnate_param")) {
cond.andPrepare("ACTIVITY.USER_NEW", vars.get("$sys.user"));
cond.andPrepare("ACTIVITY.CREATOR", vars.get("$sys.user"));
}
//TODO: use a preparedCondition when available
......
entity/Activity_entity/recordcontainers/db/onDBInsert.js
+ 2
− 2
View file @ 46b22bff
......@@ -9,7 +9,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
{
db.insertData(
"ACTIVITYLINK",
["ACTIVITYLINKID", "OBJECT_TYPE", "OBJECT_ROWID", "ACTIVITY_ID", "USER_NEW", "DATE_NEW"],
["ACTIVITYLINKID", "OBJECT_TYPE", "OBJECT_ROWID", "ACTIVITY_ID"],
null,
[util.getNewUUID(), vars.get("$param.ObjectId_param"), vars.get("$param.RowId_param"), vars.getString("$field.ACTIVITYID"), vars.getString("$sys.user"), vars.getString("$sys.date")]);
[util.getNewUUID(), vars.get("$param.ObjectId_param"), vars.get("$param.RowId_param"), vars.getString("$field.ACTIVITYID")]);
}
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 36
− 44
View file @ 46b22bff
......@@ -44,14 +44,6 @@
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
</entityField>
<entityField>
<name>DATE_NEW</name>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DISTRICT</name>
<title>District</title>
......@@ -70,14 +62,6 @@
<title>${ADDRESS_STATE}</title>
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
</entityField>
<entityField>
<name>USER_NEW</name>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ZIP</name>
<title>postcode</title>
......@@ -85,35 +69,53 @@
<onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
</entityField>
<entityProvider>
<name>OrgAddress_dfi</name>
<name>OrganisationAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
<entityName>Org_entity</entityName>
<fieldName>OrgAddress_dfo</fieldName>
<entityName>Organisation_entity</entityName>
<fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/relationtype_param/code.js</code>
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
</entityProvider>
<entityParameter>
<name>RelId_param</name>
<expose v="true" />
<mandatory v="true" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/relid_param/documentation.adoc</documentation>
</entityParameter>
<entityProvider>
<name>PersAddress_dfi</name>
<name>ContactAddresses</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
<entityName>Pers_entity</entityName>
<fieldName>PersAddress_dfo</fieldName>
<entityName>Contact_entity</entityName>
<fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
</entityProvider>
<entityProvider>
<name>#PROVIDER</name>
......@@ -128,18 +130,26 @@
</dependency>
</entityConsumer>
<entityProvider>
<name>PersOrgsAddresses_dfi</name>
<name>OrganisationAddressesByContact</name>
<fieldType>DEPENDENCY_IN</fieldType>
<documentation>%aditoprj%/entity/Address_entity/entityfields/persorgsaddresses_dfi/documentation.adoc</documentation>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
<entityName>Pers_entity</entityName>
<fieldName>PersOrgsAddresses_dfo</fieldName>
<entityName>Contact_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>RelationType_param</name>
<code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/relationtype_param/code.js</code>
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
</children>
</entityProvider>
<entityField>
<name>IS_STANDARD</name>
......@@ -150,7 +160,6 @@
<entityParameter>
<name>DefaultAddressId_param</name>
<expose v="true" />
<triggerRecalculation v="false" />
<mandatory v="false" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
<description>provide a ADDRESSID-value of the standard address (of a RELATION)</description>
......@@ -158,7 +167,6 @@
<entityParameter>
<name>RelationType_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
<mandatory v="true" />
<documentation>%aditoprj%/entity/Address_entity/entityfields/relationtype_param/documentation.adoc</documentation>
<description>PARAMETER</description>
......@@ -198,18 +206,10 @@
<name>ADDRESSID.value</name>
<recordfield>ADDRESS.ADDRESSID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>ADDRESS.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDRIDENTIFIER.value</name>
<recordfield>ADDRESS.ADDRIDENTIFIER</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>ADDRESS.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADDR_TYPE.value</name>
<recordfield>ADDRESS.ADDR_TYPE</recordfield>
......@@ -234,14 +234,6 @@
<name>STATE.value</name>
<recordfield>ADDRESS.STATE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>ADDRESS.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ADDRESS.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ZIP.value</name>
<recordfield>ADDRESS.ZIP</recordfield>
......
entity/Relation_entity/entityfields/relationcommemail_dfo/children/commcategory_param/code.js → entity/Address_entity/entityfields/contactaddresses/children/relationtype_param/code.js
+ 1
− 1
View file @ 46b22bff
import("system.result");
result.string("EMAIL");
\ No newline at end of file
result.object(2);
\ No newline at end of file
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