merged origin/master into Receipt

.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml

@@ -45,7 +45,7 @@
             <column name="CONTAINER" value="CommunicationMedium"/>
             <column name="SORTING" valueNumeric="1"/>
             <column name="ISACTIVE" valueNumeric="1"/>
-            <column name="ISESSENTIAL" valueNumeric="0"/>
+            <column name="ISESSENTIAL" valueNumeric="1"/>
         </insert>
         <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
             <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ace352ee-b9ba-47eb-a55d-4619a4b41e61"/>

entity/360Degree_entity/360Degree_entity.aod

@@ -138,6 +138,7 @@
         </entityActionField>
         <entityActionField>
           <name>newSupportticket</name>
+          <title>New Supportticket</title>
           <onActionProcess>%aditoprj%/entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js</onActionProcess>
           <iconId>VAADIN:QUESTION</iconId>
         </entityActionField>

entity/Activity_entity/Activity_entity.aod

@@ -493,22 +493,27 @@
         <dbRecordFieldMapping>
           <name>DIRECTION.value</name>
           <recordfield>ACTIVITY.DIRECTION</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>INFO.value</name>
           <recordfield>ACTIVITY.INFO</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>SUBJECT.value</name>
           <recordfield>ACTIVITY.SUBJECT</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>ENTRYDATE.value</name>
           <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CATEGORY.value</name>
           <recordfield>ACTIVITY.CATEGORY</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DIRECTION.displayValue</name>
@@ -549,6 +554,7 @@
         <dbRecordFieldMapping>
           <name>RESPONSIBLE.value</name>
           <recordfield>ACTIVITY.RESPONSIBLE</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>entryDateTimelineDate.value</name>

entity/Activity_entity/entityfields/direction/displayValueProcess.js

@@ -3,4 +3,4 @@ import("system.vars");
 import("KeywordRegistry_basic");
 import("Keyword_lib");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.activityDirection(), vars.get("$this.value")));
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityDirection(), vars.get("$field.DIRECTION")));
\ No newline at end of file

entity/Activity_entity/entityfields/entrydate/onValidation.js

@@ -4,6 +4,6 @@ import("system.vars");
 import("system.result");
 import("Entity_lib");
 
-var entryDate = ProcessHandlingUtils.getOnValidationValue();
+var entryDate = vars.get("local.value");
 if (Number(datetime.clearTime(entryDate)) > Number(vars.get("$sys.today")))
     result.string(translate.text("Entrydate must not be in the future"));
\ No newline at end of file

entity/Activity_entity/entityfields/responsible/displayValueProcess.js

@@ -2,7 +2,6 @@ import("system.result");
 import("system.vars");
 import("Contact_lib");
 
-var id = vars.get("$this.value");
 //show the simpel title since this will be later an employee-entry and therefore no organisation is needed
-var title = ContactUtils.getTitleByContactId(id);
+var title = ContactUtils.getTitleByContactId(vars.get("$field.RESPONSIBLE"));
 result.string(title);
\ No newline at end of file

entity/Address_entity/entityfields/address/displayValueProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 
 // needed for instant display name change if value set by neon.setFieldValue
-result.string(vars.get("$this.value"))
+result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file

entity/Address_entity/entityfields/addresssearch/displayValueProcess.js

@@ -2,4 +2,4 @@ import("system.vars");
 import("system.result");
 
 // needed for instant display name change if value set by neon.setFieldValue
-result.string(vars.get("$this.value"))
+result.string(vars.get("$field.AddressSearch"));
\ No newline at end of file

entity/Address_entity/entityfields/city/displayValueProcess.js

-import("system.vars");
-import("system.result");
-
-// needed for instant display name change if value set by neon.setFieldValue
-result.string(vars.get("$this.value"))
+import("system.vars");
+import("system.result");
+
+// needed for instant display name change if value set by neon.setFieldValue
+result.string(vars.get("$field.CITY"));
\ No newline at end of file

entity/Address_entity/entityfields/country/valueProcess.js

@@ -3,7 +3,7 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
 {
     result.string("DE");
 }
\ No newline at end of file

entity/Address_entity/entityfields/streetvalidation/children/currentvalue_param/valueProcess.js

 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$this.value"))
+result.string(vars.get("$this.value"));
\ No newline at end of file

entity/Address_entity/entityfields/zip/displayValueProcess.js

-import("system.vars");
-import("system.result");
-
-// needed for instant display name change if value set by neon.setFieldValue
-result.string(vars.get("$this.value"))
+import("system.vars");
+import("system.result");
+
+// needed for instant display name change if value set by neon.setFieldValue
+result.string(vars.get("$field.ZIP"));
\ No newline at end of file

entity/Address_entity/entityfields/zip/onValidation.js

@@ -6,7 +6,7 @@ import("Entity_lib");
 
 
 var countryCode = vars.get("$field.COUNTRY");
-var zipCode = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ZIP"));
+var zipCode = vars.get("local.value");
 var message = "";
 var isValid = AddressValidationUtils.isValidZip(countryCode, zipCode);
 if (!isValid)

entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js

 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$this.value"))
+result.string(vars.get("$this.value"));
\ No newline at end of file

entity/AnyContact_entity/AnyContact_entity.aod

@@ -50,6 +50,12 @@
           <fieldName>Contacts</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>471b6e37-13ce-4e84-a797-82bccbe4e39a</name>
+          <entityName>UnlinkedMailMappingLink_entity</entityName>
+          <fieldName>AnyContacts</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
@@ -144,6 +150,11 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
         </entityParameter>
       </children>
     </entityProvider>
+    <entityParameter>
+      <name>WithPrivatePersons_param</name>
+      <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/withprivatepersons_param/valueProcess.js</valueProcess>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js → entity/AnyContact_entity/entityfields/withprivatepersons_param/valueProcess.js

-import("system.result");
-result.string(0)
+import("system.result");
+
\ No newline at end of file
+result.string(true);
\ No newline at end of file

entity/AnyContact_entity/recordcontainers/db/conditionProcess.js

@@ -16,15 +16,18 @@ if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
     }
 }
 
+var conditionPrivateOrganisation = SqlCondition.begin()
+                                               .andPrepare("CONTACT.ORGANISATION_ID", "0", "# != ?");
+
+if (vars.getString("$param.WithPrivatePersons_param") == "true")
+    conditionPrivateOrganisation.orSqlCondition(SqlCondition.begin()
+                                                            .andPrepare("CONTACT.ORGANISATION_ID", "0")
+                                                            .and("CONTACT.PERSON_ID is not null")
+                                                );
+
 //exclude private organisation
 var cond = SqlCondition.begin()
-                        .andSqlCondition(SqlCondition.begin()
-                                        .andPrepare("CONTACT.ORGANISATION_ID", "0", "# != ?")
-                                        .orSqlCondition(SqlCondition.begin()
-                                                                        .andPrepare("CONTACT.ORGANISATION_ID", "0")
-                                                                        .and("CONTACT.PERSON_ID is not null")
-                                        )
-                        )
+                       .andSqlCondition(conditionPrivateOrganisation)
                        .andPrepareIfSet("CONTACT.ORGANISATION_ID", orgContactId);
 
 result.string(db.translateCondition(cond.build()));
\ No newline at end of file

entity/AppointmentLink_entity/AppointmentLink_entity.aod

@@ -2,6 +2,8 @@
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
   <name>AppointmentLink_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <title>Connection</title>
+  <titlePlural>Connections</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
@@ -21,6 +23,7 @@
       <title>{$OBJECTLINK_OBJECT}</title>
       <consumer>Objects</consumer>
       <linkedContext>Object</linkedContext>
+      <stateProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/stateProcess.js</stateProcess>
       <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js</displayValueProcess>
       <onValueChangeTypes>
         <element>MASK</element>
@@ -33,6 +36,7 @@
       <title>{$OBJECTLINK_TYPE}</title>
       <consumer>Context</consumer>
       <linkedContext>Context</linkedContext>
+      <stateProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/stateProcess.js</stateProcess>
       <displayValueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityParameter>
@@ -92,6 +96,12 @@
       <description>PARAMETER
 </description>
     </entityParameter>
+    <entityConsumer>
+      <name>AppointmentId</name>
+      <dependency>
+        <name>dependency</name>
+      </dependency>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/AppointmentLink_entity/entityfields/objectid/stateProcess.js

+import("system.logging");
+import("system.result");
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+    result.object(neon.COMPONENTSTATE_DISABLED);
+
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.AppointmentId_param"))
+{
+     var entry = calendars.getEntry(vars.get("$param.AppointmentId_param"), null, null);
+     doCalc(entry);
+}
+
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    var entryy = calendars.getEntry(vars.get("$field.APPOINTMENT_ID"), null, null);
+    doCalc(entryy);
+}
+
+
+function doCalc(entry)
+{
+    if(entry[calendars.ORGANIZER2]["paramvalue"] == "mailto:" + tools.getCurrentUser()["params"]["email"])
+        result.object(neon.COMPONENTSTATE_EDITABLE);
+    else
+        result.object(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file

entity/AppointmentLink_entity/entityfields/objecttype/stateProcess.js

+import("system.logging");
+import("system.result");
+import("system.tools");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+    result.object(neon.COMPONENTSTATE_DISABLED);
+
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$param.AppointmentId_param"))
+{
+     var entry = calendars.getEntry(vars.get("$param.AppointmentId_param"), null, null);
+     doCalc(entry);
+}
+
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+    var entryy = calendars.getEntry(vars.get("$field.APPOINTMENT_ID"), null, null);
+    doCalc(entryy);
+}
+
+
+function doCalc(entry)
+{    
+    if(entry[calendars.ORGANIZER2]["paramvalue"] == "mailto:" + tools.getCurrentUser()["params"]["email"])
+        result.object(neon.COMPONENTSTATE_EDITABLE);
+    else
+        result.object(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file