Merge master into ObjectRelation2

Conflicts:
	others/db_changes/data_alias/basic/2019.2/changelog.xml

entity/Activity_entity/Activity_entity.aod

@@ -19,6 +19,7 @@
       <title>Entrydate</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
     </entityField>
@@ -151,7 +152,7 @@
     </entityParameter>
     <entityConsumer>
       <name>Links</name>
-      <title>Verknüpfungen</title>
+      <title>Connections</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -258,7 +259,7 @@
     </entityField>
     <entityConsumer>
       <name>ModuleTrees</name>
-      <title>Baum</title>
+      <title>Tree</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -279,16 +280,16 @@
     <entityActionField>
       <name>newActivity_action</name>
       <fieldType>ACTION</fieldType>
-      <title>Neue Aktivität</title>
+      <title>New activity</title>
       <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity_action/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PLUS</iconId>
+      <iconId>NEON:HISTORY</iconId>
     </entityActionField>
     <entityActionField>
       <name>newTask_action</name>
       <fieldType>ACTION</fieldType>
-      <title>Neue Aufgabe</title>
+      <title>New task</title>
       <onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newtask_action/onActionProcess.js</onActionProcess>
-      <iconId>VAADIN:PLUS</iconId>
+      <iconId>VAADIN:TASKS</iconId>
     </entityActionField>
     <entityParameter>
       <name>ParentId_param</name>

entity/AnyContact_entity/AnyContact_entity.aod

 <?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.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
   <name>AnyContact_entity</name>
-  <description>former Relation</description>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <titleProcess>%aditoprj%/entity/AnyContact_entity/titleProcess.js</titleProcess>
   <recordContainer>db</recordContainer>
@@ -56,7 +55,7 @@
     <entityField>
       <name>contactType</name>
       <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
-See RelationUtils.getRelationTypeByPersOrg for possible values</description>
+See ContactUtils.getRelationTypeByPersOrg for possible values</description>
       <contentType>NUMBER</contentType>
       <searchable v="false" />
       <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
@@ -92,7 +91,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       </children>
     </entityConsumer>
     <entityField>
-      <name>ORG_NAME</name>
+      <name>ORGANISATION_NAME</name>
       <title>Organisation name</title>
     </entityField>
     <entityField>
@@ -152,6 +151,15 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
       <name>RELATIONSHIP</name>
       <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
     </entityField>
+    <entityField>
+      <name>PERSON_MIDDLENAME</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_TITLE</name>
+    </entityField>
+    <entityField>
+      <name>PERSON_SALUTATION</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -214,7 +222,7 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
           <recordfield>CONTACT.STATUS</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>ORG_NAME.value</name>
+          <name>ORGANISATION_NAME.value</name>
           <recordfield>ORGANISATION.NAME</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
@@ -237,6 +245,18 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
           <name>RELATIONSHIP.value</name>
           <recordfield>CONTACT.RELATIONSHIP</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_MIDDLENAME.value</name>
+          <recordfield>PERSON.MIDDLENAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_TITLE.value</name>
+          <recordfield>PERSON.TITLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>PERSON_SALUTATION.value</name>
+          <recordfield>PERSON.SALUTATION</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>

entity/AnyContact_entity/entityfields/contacttype/valueProcess.js

@@ -2,4 +2,4 @@ import("system.result");
 import("system.vars");
 import("Contact_lib")
 
-result.object(RelationUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
+result.object(ContactUtils.getRelationType(vars.get("$field.CONTACTID"), vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file

entity/AnyContact_entity/entityfields/image/valueProcess.js

@@ -7,7 +7,7 @@ import("Contact_lib");
 
 if (vars.get("$field.contactType") == 1) // 1 == org, 2 == person, 3 == person
 {
-    result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORG_NAME")));
+    result.string(OrgUtils.getImage(vars.get("$field.ORGANISATION_ID"), vars.getString("$field.ORGANISATION_NAME")));
 }
 else
 {

entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js

 import("system.result");
 import("Contact_lib")
 
-result.string(RelationUtils.getFullRelationFromString());
\ No newline at end of file
+result.string(ContactUtils.getFullRelationString());
\ No newline at end of file

entity/AnyContact_entity/titleProcess.js

 import("system.vars");
 import("system.result");
+import("Util_lib");
+import("Contact_lib");
 
-if(vars.get("$field.PERSON_FIRSTNAME")) {
-    result.string(vars.get("$field.PERSON_FIRSTNAME") + " " + vars.get("$field.PERSON_LASTNAME"));
-} else {
-    result.string(vars.get("$field.ORG_NAME"));
-}
+var contact = new Contact();
+contact.organisationName = vars.get("$field.ORGANISATION_NAME");
+contact.salutation = vars.get("$field.PERSON_SALUTATION");
+contact.title = vars.get("$field.PERSON_TITLE");
+contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
+contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
+contact.lastname = vars.get("$field.PERSON_LASTNAME");
+
+var renderer = new ContactTitleRenderer(contact);
+result.string(renderer.asString());
\ No newline at end of file

entity/Attribute_entity/Attribute_entity.aod

@@ -183,6 +183,22 @@
       <expose v="true" />
       <description>PARAMETER</description>
     </entityParameter>
+    <entityActionGroup>
+      <name>AttributeActions</name>
+      <children>
+        <entityActionField>
+          <name>newChildAttribute</name>
+          <fieldType>ACTION</fieldType>
+          <title>New attribute</title>
+          <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js</onActionProcess>
+          <isMenuAction v="true" />
+          <isObjectAction v="false" />
+          <isSelectionAction v="true" />
+          <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+          <tooltipProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js</tooltipProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js

+import("system.vars");
+import("system.neon");
+import("Attribute_lib");
+
+var params = {};
+if (vars.exists("$local.rows"))
+{
+    var row = JSON.parse(vars.get("$local.rows"));
+    
+    var type = row[0].ATTRIBUTE_TYPE.trim();
+    if (type == $AttributeTypes.GROUP || type == $AttributeTypes.COMBO)
+        params["attrParentId_param"] = row[0].AB_ATTRIBUTEID;
+}
+neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file

entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/tooltipProcess.js

+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New attribute"));
\ No newline at end of file

entity/Contract_entity/Contract_entity.aod

@@ -23,6 +23,7 @@
       <title>Next due date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/onValidation.js</onValidation>
     </entityField>
     <entityField>
@@ -31,6 +32,7 @@
       <title>Contract expiry date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValidation.js</onValidation>
       <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
     </entityField>
@@ -45,6 +47,7 @@
       <title>Contract start date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValidation.js</onValidation>
       <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
     </entityField>
@@ -377,10 +380,6 @@
           <name>CONTACT_PERSON_ID.value</name>
           <recordfield>CONTACT.PERSON_ID</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>ORG_NAME.value</name>
-          <recordfield>ORGANISATION.NAME</recordfield>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>PERSON_FIRSTNAME.value</name>
           <recordfield>PERSON.FIRSTNAME</recordfield>

entity/Contract_entity/entityfields/contact_id/displayValueProcess.js

@@ -3,4 +3,4 @@ import("system.vars");
 import("Contact_lib");
 import("system.neon");
 
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file

entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file

entity/Document_entity/Document_entity.aod

@@ -20,26 +20,27 @@
     </entityProvider>
     <entityField>
       <name>NAME</name>
-      <title>Dateiname</title>
+      <title>Filename</title>
       <mandatory v="true" />
       <state>AUTO</state>
     </entityField>
     <entityField>
       <name>TYPE</name>
-      <title>Dateityp</title>
+      <title>Filetype</title>
       <state>READONLY</state>
     </entityField>
     <entityField>
       <name>SIZE</name>
-      <title>Dateigröße</title>
+      <title>Filesize</title>
       <contentType>FILESIZE</contentType>
       <state>READONLY</state>
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>
-      <title>Datum</title>
+      <title>Date</title>
       <contentType>DATE</contentType>
       <resolution>MINUTE</resolution>
+      <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
       <state>READONLY</state>
     </entityField>
     <entityField>

entity/Offer_entity/Offer_entity.aod

@@ -31,6 +31,7 @@
       <title>Creation date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
     </entityField>

entity/Offer_entity/entityfields/contact_id/displayValueProcess.js

@@ -4,4 +4,4 @@ import("Contact_lib");
 import("system.neon");
 
 
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file

entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file

entity/Offer_entity/entityfields/salesproject_id/mandatoryProcess.js

@@ -2,7 +2,7 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-var type = RelationUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
+var type = ContactUtils.getRelationType(vars.get("$field.CONTACT_ID"), vars.get("$field.CONTACT_PERSON_ID"), vars.get("$field.CONTACT_ORG_ID"));
 
 result.string(type != 2);
 

entity/Order_entity/Order_entity.aod

@@ -31,6 +31,7 @@
       <title>Creation date</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
+      <outputFormat>dd.MM.yyyy</outputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Order_entity/entityfields/salesorderdate/valueProcess.js</valueProcess>
     </entityField>

entity/Order_entity/entityfields/contact_id/displayValueProcess.js

@@ -3,4 +3,4 @@ import("system.vars");
 import("Contact_lib");
 import("system.neon");
 
-result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file

entity/Order_entity/entityfields/contact_id/linkedContextProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 import("Contact_lib");
 
-result.string(RelationUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
+result.string(ContactUtils.getContextByRelationId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file