merged origin/2021.0.0 into #1048996-keyword-sorting

.liquibase/Data_alias/basic/2021.0.0/EwsContactSync/create_ab_synccontact.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="A.Riedl" id="9820d74b-1b58-4ffd-9f5d-8c4d670bda47">
+        <createTable tableName="AB_SYNCCONTACT">
+            <column name="SYNCCONTACTID" type="char(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_SYNCCONTACTID"/>
+            </column>
+            <column name="ASYS_FAVORITEID" type="char(36)"/>
+            <column name="EXCHANGEID" type="varchar(254)"/>
+            <column name="USER_ID" type="char(46)"/>            
+            <column name="CONTACT_ID" type="char(36)"/>
+            <column name="DATE_DEL" type="datetime"/>
+            <column name="DATE_EDIT" type="datetime"/>
+            <column name="DATE_NEW" type="datetime"/>
+        </createTable>
+        <createIndex indexName="idx_exchangeId" tableName="AB_SYNCCONTACT">
+            <column name="EXCHANGEID"/>
+        </createIndex>
+        <createIndex tableName="AB_SYNCCONTACT" indexName="idx_UserId">
+            <column name="USER_ID"/>
+        </createIndex>
+        <createIndex tableName="AB_SYNCCONTACT" indexName="idx_ContactId">
+            <column name="CONTACT_ID"/>
+        </createIndex>
+        <addUniqueConstraint 
+            columnNames="ASYS_FAVORITEID"
+            constraintName="const_uniqueFavoriteId"  
+            tableName="AB_SYNCCONTACT"/>  
+    </changeSet>
+</databaseChangeLog>

.liquibase/Data_alias/basic/2021.0.0/changelog.xml

@@ -14,4 +14,5 @@
     <include relativeToChangelogFile="true" file="Keywords/changelog.xml"/>
     <include relativeToChangelogFile="true" file="KeywordMigration/changelog.xml"/>
     <include relativeToChangelogFile="true" file="addDateNewToSalesproject.xml"/>
+    <include relativeToChangelogFile="true" file="EwsContactSync/create_ab_synccontact.xml"/>
 </databaseChangeLog>
\ No newline at end of file

entity/Campaign_entity/Campaign_entity.aod

@@ -498,8 +498,8 @@
       </children>
     </entityConsumer>
     <entityField>
-      <name>CAMPAIGN_OBEJCTTYPE</name>
-      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaign_obejcttype/valueProcess.js</valueProcess>
+      <name>CAMPAIGN_OBJECTTYPE</name>
+      <valueProcess>%aditoprj%/entity/Campaign_entity/entityfields/campaign_objecttype/valueProcess.js</valueProcess>
     </entityField>
     <entityConsumer>
       <name>PersonConsumer</name>
@@ -687,6 +687,14 @@
           <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/attribute_filter/filterConditionProcess.js</filterConditionProcess>
           <filtertype>BASIC</filtertype>
         </filterExtensionSet>
+        <filterExtension>
+          <name>Favorite_Filter</name>
+          <title>Favoritegroup</title>
+          <contentType>TEXT</contentType>
+          <filterValuesProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
+          <filterConditionProcess>%aditoprj%/entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <filtertype>BASIC</filtertype>
+        </filterExtension>
       </filterExtensions>
     </dbRecordContainer>
   </recordContainers>

entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js

+import("system.vars");
+import("Favorites_lib");
+import("system.result");
+import("Sql_lib");
+
+var operator = vars.get("$local.operator");
+var rawvalue = vars.get("$local.rawvalue");
+
+var objecttype = vars.get("$field.CAMPAIGN_OBJECTTYPE");
+var idcolumn = "CAMPAIGN.CAMPAIGNID";
+
+result.string(FavoritesUtil.getFilterDisplayCondition(objecttype, operator, rawvalue, idcolumn));
\ No newline at end of file

entity/Campaign_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js

+import("Context_lib");
+import("system.result");
+import("Favorites_lib");
+
+result.object(FavoritesUtil.getUserFavoriteGroupsByContext(ContextUtils.getCurrentContextId()));
\ No newline at end of file

entity/Communication_entity/Communication_entity.aod

@@ -6,6 +6,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Communication_entity/documentation.adoc</documentation>
   <contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
+  <afterOperatingState>%aditoprj%/entity/Communication_entity/afterOperatingState.js</afterOperatingState>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityField>

entity/Communication_entity/afterOperatingState.js

+import("system.vars");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW)
+    vars.set("$context.PushDataPrivacyNotification", "false");
\ No newline at end of file

entity/Communication_entity/recordcontainers/db/onDBInsert.js

@@ -11,7 +11,11 @@ var rowdata = vars.get("$local.rowdata");
 var standard = new StandardObject("Communication", vars.get("$local.uid"), "Person", rowdata["COMMUNICATION.CONTACT_ID"])
 standard.onCommunicationInsert(rowdata["COMMUNICATION.MEDIUM_ID"]);
 
-DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false" && vars.get("$sys.isclient"))
+{
+    DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+    vars.set("$context.PushDataPrivacyNotification", "true");
+} 
 
 if (vars.exists("$param.AdditionalContactIds_param") && vars.get("$param.AdditionalContactIds_param"))
 {

entity/Communication_entity/recordcontainers/db/onDBUpdate.js

@@ -10,7 +10,11 @@ if (rowdata["COMMUNICATION.CONTACT_ID"] != null)
     var standard = new StandardObject("Communication", vars.get("$local.uid"), "Person", rowdata["COMMUNICATION.CONTACT_ID"])
     standard.onCommunicationUpdate(rowdata["COMMUNICATION.MEDIUM_ID"]);
 }
-  
-DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+
+if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false" && vars.get("$sys.isclient"))
+{
+    DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
+    vars.set("$context.PushDataPrivacyNotification", "true");
+}  
 
 WorkflowSignalSender.updated();
\ No newline at end of file

entity/Contract_entity/Contract_entity.aod

@@ -596,6 +596,7 @@
           <contentType>TEXT</contentType>
           <filterValuesProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterValuesProcess.js</filterValuesProcess>
           <filterConditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js</filterConditionProcess>
+          <groupedRecordField></groupedRecordField>
           <filtertype>BASIC</filtertype>
         </filterExtension>
       </filterExtensions>

entity/Contract_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js

+import("system.vars");
 import("Favorites_lib");
 import("system.result");
 import("Sql_lib");
 
-var favoFilterCond = newWhere();
-var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+var operator = vars.get("$local.operator");
+var rawvalue = vars.get("$local.rawvalue");
 
-for(i = 0; i < rowIds.length; i++)
-    favoFilterCond.or("CONTRACT.CONTRACTID", rowIds[i], SqlBuilder.EQUAL());
+var objecttype = vars.get("$field.CONTRACT_OBJECTTYPE");
+var idcolumn = "CONTRACT.CONTRACTID";
 
-result.string(favoFilterCond.toString());
\ No newline at end of file
+result.string(FavoritesUtil.getFilterDisplayCondition(objecttype, operator, rawvalue, idcolumn));
\ No newline at end of file

entity/DocumentTemplate_entity/recordcontainers/db/filterextensions/favorite_filter/filterConditionProcess.js

+import("system.vars");
 import("Favorites_lib");
 import("system.result");
 import("Sql_lib");
 
-var favoFilterCond = newWhere();
-var rowIds = FavoritesUtil.getRowIdsOfFavoriteGroup();
+var operator = vars.get("$local.operator");
+var rawvalue = vars.get("$local.rawvalue");
 
-for(i = 0; i < rowIds.length; i++)
-    favoFilterCond.or("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", rowIds[i], SqlBuilder.EQUAL());
+var objecttype = vars.get("$field.DOCUMENTTEMPLATE_OBJECTTYPE");
+var idcolumn = "DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID";
 
-result.string(favoFilterCond.toString());
\ No newline at end of file
+result.string(FavoritesUtil.getFilterDisplayCondition(objecttype, operator, rawvalue, idcolumn));

entity/EwsSyncAddContacts_entity/EwsSyncAddContacts_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.3.18" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.18">
+  <name>EwsSyncAddContacts_entity</name>
+  <title>add  contact to ewssync</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <titlePlural></titlePlural>
+  <recordContainer>datalessConfig</recordContainer>
+  <entityFields>
+    <entityProvider>
+      <name>#PROVIDER</name>
+    </entityProvider>
+    <entityProvider>
+      <name>#PROVIDER_AGGREGATES</name>
+      <useAggregates v="true" />
+    </entityProvider>
+    <entityField>
+      <name>contactIds</name>
+      <state>EDITABLE</state>
+      <valueProcess>%aditoprj%/entity/EwsSyncAddContacts_entity/entityfields/contactids/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>countForSync</name>
+      <title>count</title>
+      <state>EDITABLE</state>
+      <valueProcess>%aditoprj%/entity/EwsSyncAddContacts_entity/entityfields/countforsync/valueProcess.js</valueProcess>
+    </entityField>
+    <entityParameter>
+      <name>ContactFilter_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityParameter>
+      <name>ContactIds_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionField>
+      <name>syncContacts</name>
+      <title>add to sync</title>
+      <onActionProcess>%aditoprj%/entity/EwsSyncAddContacts_entity/entityfields/synccontacts/onActionProcess.js</onActionProcess>
+      <iconId>VAADIN:REFRESH</iconId>
+      <stateProcess>%aditoprj%/entity/EwsSyncAddContacts_entity/entityfields/synccontacts/stateProcess.js</stateProcess>
+      <tooltip></tooltip>
+    </entityActionField>
+    <entityParameter>
+      <name>Mode_param</name>
+      <expose v="true" />
+    </entityParameter>
+    <entityActionField>
+      <name>removeSyncContacts</name>
+      <title>remove from sync</title>
+      <onActionProcess>%aditoprj%/entity/EwsSyncAddContacts_entity/entityfields/removesynccontacts/onActionProcess.js</onActionProcess>
+      <isObjectAction v="true" />
+      <iconId>NEON:RECURRING_APPOINTMENT_MOVED</iconId>
+      <stateProcess>%aditoprj%/entity/EwsSyncAddContacts_entity/entityfields/removesynccontacts/stateProcess.js</stateProcess>
+    </entityActionField>
+  </entityFields>
+  <recordContainers>
+    <datalessRecordContainer>
+      <name>datalessConfig</name>
+      <alias>Data_alias</alias>
+    </datalessRecordContainer>
+  </recordContainers>
+</entity>

entity/EwsSyncAddContacts_entity/entityfields/contactids/valueProcess.js

+import("system.result");
+import("system.vars");
+import("FilterViewAction_lib");
+
+var contactIds = JSON.parse(vars.get("$param.ContactIds_param"));
+var contactFilter = vars.get("$param.ContactFilter_param");
+
+contactIds = FilterViewActionUtils.getUidsBySelectionOrFilter("Person", contactIds, contactFilter);
+
+result.string(JSON.stringify(contactIds));
\ No newline at end of file

entity/EwsSyncAddContacts_entity/entityfields/countforsync/valueProcess.js

+import("system.vars");
+import("system.result");
+
+var res = "";
+if (vars.get("$field.contactIds"))
+{
+    res = JSON.parse(vars.getString("$field.contactIds")).length;
+}
+
+result.string(res);

entity/EwsSyncAddContacts_entity/entityfields/removesynccontacts/onActionProcess.js

+import("system.neon");
+import("system.tools");
+import("EwsClientSync_lib");
+import("system.vars");
+
+var contactIds = JSON.parse(vars.get("$field.contactIds"));
+EwsClientSyncUtils.removeFromFavorite(contactIds, tools.getCurrentUser()[tools.NAME]);
+neon.closeImage(vars.get("$sys.currentimage"), true);
\ No newline at end of file

entity/EwsSyncAddContacts_entity/entityfields/removesynccontacts/stateProcess.js

+import("system.neon");
+import("system.vars");
+import("system.result");
+
+var mode = vars.get("$param.Mode_param");
+var ret = neon.COMPONENTSTATE_INVISIBLE; 
+
+if(mode == "REMOVE")
+    ret = neon.COMPONENTSTATE_EDITABLE;
+
+result.string(ret);

entity/EwsSyncAddContacts_entity/entityfields/synccontacts/onActionProcess.js

+import("system.neon");
+import("EwsClientSync_lib");
+import("system.vars");
+
+var toSncContacts = JSON.parse(vars.get("$field.contactIds"));
+
+//the handling of already Contacts in the Exchange is handeled by the function itself
+EwsClientSyncUtils.addToEwsFavorite(toSncContacts);
+neon.closeImage(vars.get("$sys.currentimage"), true);
\ No newline at end of file

entity/EwsSyncAddContacts_entity/entityfields/synccontacts/stateProcess.js

+import("system.neon");
+import("system.vars");
+import("system.result");
+
+var mode = vars.get("$param.Mode_param");
+var ret = neon.COMPONENTSTATE_INVISIBLE; 
+
+if(mode == "ADD")
+    ret = neon.COMPONENTSTATE_EDITABLE;
+
+result.string(ret);