Skip to content
Snippets Groups Projects
Commit f22d5ddc authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong: Committed by Benjamin Ulrich
Browse files

[Projekt: xRM-ContactManagement][TicketNr.: 1083421][Kommunikationsdaten... 

[Projekt: xRM-ContactManagement][TicketNr.: 1083421][Kommunikationsdaten Modular gestalten] update demoData
parent 288cf72a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3702 additions and 1942 deletions
.liquibase/Data_alias/basic/2021.1.2/ModularCommunication/add_CommunicationObjectType.xml 0 → 100644
+ 28
− 0
View file @ f22d5ddc
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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="s.pongratz" id="86752d37-9193-42ac-8f9b-808a15e32219">
<addColumn tableName="COMMUNICATION">
<column name="OBJECT_TYPE" type="NVARCHAR(63)" />
<column name="OBJECT_ROWID" type="CHAR(36)" />
</addColumn>
<createIndex indexName="IDX_COMMUNICATION_OBJECT_TYPE" tableName="COMMUNICATION">
<column name="OBJECT_TYPE"/>
</createIndex>
<createIndex indexName="IDX_COMMUNICATION_OBJECT_ROWID" tableName="COMMUNICATION">
<column name="OBJECT_ROWID"/>
</createIndex>
<update tableName="COMMUNICATION">
<column name="OBJECT_ROWID" valueComputed="CONTACT_ID"/>
<column name="OBJECT_TYPE" value="Contact"/>
</update>
<dropColumn tableName="COMMUNICATION">
<column name="CONTACT_ID"/>
</dropColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.2/ModularCommunication/changelog.xml 0 → 100644
+ 6
− 0
View file @ f22d5ddc
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<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">
<include relativeToChangelogFile="true" file="add_CommunicationObjectType.xml"/>
</databaseChangeLog>
\ No newline at end of file
.liquibase/Data_alias/basic/2021.1.2/changelog.xml
+ 1
− 0
View file @ f22d5ddc
......@@ -3,6 +3,7 @@
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">
<include relativeToChangelogFile="true" file="MailBounce/changelog.xml"/>
<include relativeToChangelogFile="true" file="ModularCommunication/changelog.xml"/>
<include relativeToChangelogFile="true" file="Bulkmail/changelog.xml"/>
<include relativeToChangelogFile="true" file="Registration_Webservice/changelog.xml"/>
<include relativeToChangelogFile="true" file="VisitPlan/changelog.xml"/>
......
aliasDefinition/Data_alias/Data_alias.aod
+ 74
− 59
View file @ f22d5ddc
......@@ -1092,8 +1092,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -1120,8 +1120,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<size v="19" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
......@@ -1175,7 +1175,7 @@
<name>VALIDATION_RESULT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
......@@ -1238,38 +1238,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<title>Contact Id</title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customStringProperty>
<name>tableRef</name>
<global v="false" />
<property>CONTACT</property>
</customStringProperty>
</customProperties>
<dependencies>
<entityDependency>
<name>c42dcb6e-6771-4fd0-80e8-86359c417051</name>
<entityName>CONTACT</entityName>
<fieldName>CONTACTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
<entityFieldDb>
<name>ISSTANDARD</name>
<dbName></dbName>
......@@ -1366,6 +1334,53 @@
<title>Modification user</title>
<description></description>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_ROWID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
<customProperties>
<customBooleanProperty>
<name>log</name>
<global v="false" />
<property v="true" />
</customBooleanProperty>
<customStringProperty>
<name>tableRef</name>
<global v="false" />
<property>CONTACT</property>
</customStringProperty>
</customProperties>
<dependencies>
<entityDependency>
<name>c42dcb6e-6771-4fd0-80e8-86359c417051</name>
<entityName>CONTACT</entityName>
<fieldName>CONTACTID</fieldName>
</entityDependency>
</dependencies>
</entityFieldDb>
<entityFieldDb>
<name>OBJECT_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="63" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
......@@ -10041,8 +10056,8 @@
<name>FIELDVALUE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<columnType v="12" />
<size v="1000" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -10055,8 +10070,8 @@
<name>INDICATORTEXT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -10069,8 +10084,8 @@
<name>INDICATORINTEGER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -10083,8 +10098,8 @@
<name>INDICATORNUMBER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2005" />
<size v="2147483647" />
<columnType v="12" />
<size v="100" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -17063,8 +17078,8 @@
<name>GENERAL_CHANNELID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
<size v="48" />
<columnType v="12" />
<size v="200" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -20896,7 +20911,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -20910,7 +20925,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -20938,7 +20953,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -21266,7 +21281,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
......@@ -21326,7 +21341,7 @@
<columnType v="12" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -21340,7 +21355,7 @@
<columnType v="12" />
<size v="250" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -21368,7 +21383,7 @@
<columnType v="4" />
<size v="10" />
<scale v="0" />
<notNull v="false" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
......@@ -21394,7 +21409,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="250" />
<size v="500" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
......@@ -21512,8 +21527,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......@@ -21554,8 +21569,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
<size v="29" />
<scale v="9" />
<size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
......
aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+ 1993
− 577
View file @ f22d5ddc
This diff is collapsed.
entity/Address_entity/recordcontainers/db/onDBInsert.js
+ 1
− 1
View file @ f22d5ddc
......@@ -51,7 +51,7 @@ if(scopeType == "Organisation")
if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false")
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(id, vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
}
......
entity/Address_entity/recordcontainers/db/onDBUpdate.js
+ 1
− 1
View file @ f22d5ddc
......@@ -10,7 +10,7 @@ var rowdata = vars.get("$local.rowdata");
if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false")
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["ADDRESS.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
}
......
entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+ 1
− 1
View file @ f22d5ddc
......@@ -139,7 +139,7 @@
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
......
entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js
+ 2
− 1
View file @ f22d5ddc
......@@ -9,7 +9,8 @@ if (contactId)
{
var emailAddresses = new SqlBuilder().selectDistinct(["COMMUNICATION.ADDR","COMMUNICATION.ADDR"])
.from("COMMUNICATION")
.where("COMMUNICATION.CONTACT_ID",contactId)
.where("COMMUNICATION.OBJECT_ROWID",contactId)
.and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType())
.and("COMMUNICATION.MEDIUM_ID",CommUtil.getMediumIdsByCategory("EMAIL"),SqlBuilder.IN())
.table();
result.object(emailAddresses);
......
entity/BulkMailTestRecipient_entity/entityfields/email_address/dropDownProcess.js
+ 2
− 1
View file @ f22d5ddc
......@@ -9,7 +9,8 @@ if (contactId)
{
var emailAddresses = new SqlBuilder().selectDistinct(["COMMUNICATION.ADDR","COMMUNICATION.ADDR"])
.from("COMMUNICATION")
.where("COMMUNICATION.CONTACT_ID",contactId)
.where("COMMUNICATION.OBJECT_ROWID",contactId)
.and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType())
.and("COMMUNICATION.MEDIUM_ID",CommUtil.getMediumIdsByCategory("EMAIL"),SqlBuilder.IN())
.table();
result.object(emailAddresses);
......
entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js
+ 1
− 1
View file @ f22d5ddc
......@@ -2,5 +2,5 @@ import("Sql_lib");
import("system.result");
import("Communication_lib");
var res = CommUtil.getStandardSubSqlMail(newWhere("COMMUNICATION.CONTACT_ID = CAMPAIGNPARTICIPANT.CONTACT_ID"));
var res = CommUtil.getStandardSubSqlMail(newWhere("COMMUNICATION.OBJECT_ROWID = CAMPAIGNPARTICIPANT.CONTACT_ID"));
result.string(res);
\ No newline at end of file
entity/CampaignParticipant_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js
+ 1
− 1
View file @ f22d5ddc
......@@ -2,5 +2,5 @@ import("system.result");
import("Communication_lib");
import("Sql_lib");
var res = CommUtil.getStandardSubSqlPhone(newWhere("COMMUNICATION.CONTACT_ID = CAMPAIGNPARTICIPANT.CONTACT_ID"));
var res = CommUtil.getStandardSubSqlPhone(newWhere("COMMUNICATION.OBJECT_ROWID = CAMPAIGNPARTICIPANT.CONTACT_ID"));
result.string(res);
\ No newline at end of file
entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
+ 1
− 1
View file @ f22d5ddc
......@@ -37,7 +37,7 @@
</dependency>
<children>
<entityParameter>
<name>ContactId_param</name>
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/CommunicationChannel_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
......
entity/Communication_entity/Communication_entity.aod
+ 25
− 12
View file @ f22d5ddc
......@@ -30,17 +30,13 @@
<displayValueProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Communication_entity/entityfields/medium_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>CONTACT_ID</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STANDARD</name>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ContactId_param</name>
<name>ObjectRowId_param</name>
<expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
......@@ -72,7 +68,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
<name>ObjectRowId_param</name>
<expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
......@@ -99,7 +95,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
<name>ObjectRowId_param</name>
<expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
......@@ -128,7 +124,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
<name>ObjectRowId_param</name>
<expose v="true" />
<description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
......@@ -213,6 +209,19 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
<entityField>
<name>OBJECT_TYPE</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/object_type/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ObjectType_param</name>
<valueProcess>%aditoprj%/entity/Communication_entity/entityfields/objecttype_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -240,10 +249,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>COMMUNICATIONID.value</name>
<recordfield>COMMUNICATION.COMMUNICATIONID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>COMMUNICATION.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STANDARD.value</name>
<recordfield>COMMUNICATION.ISSTANDARD</recordfield>
......@@ -268,6 +273,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>DATE_EDIT.value</name>
<recordfield>COMMUNICATION.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.value</name>
<recordfield>COMMUNICATION.OBJECT_ROWID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_TYPE.value</name>
<recordfield>COMMUNICATION.OBJECT_TYPE</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Communication_entity/entityfields/contact_id/valueProcess.js deleted 100644 → 0
+ 0
− 9
View file @ 288cf72a
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null)
result.string(vars.getString("$param.ContactId_param"));
}
\ No newline at end of file
entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js
+ 1
− 1
View file @ f22d5ddc
......@@ -6,7 +6,7 @@ import("Sql_lib");
var country = newSelect("ADDRESS.COUNTRY")
.from("ADDRESS")
.join("CONTACT", "CONTACT.ADDRESS_ID = ADDRESS.ADDRESSID")
.whereIfSet("CONTACT.CONTACTID", "$param.ContactId_param")
.whereIfSet("CONTACT.CONTACTID", "$param.ObjectRowId_param")
.cell();
if (country != "")
......
entity/Communication_entity/entityfields/object_rowid/valueProcess.js 0 → 100644
+ 10
− 0
View file @ f22d5ddc
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
&& vars.get("$param.ObjectRowId_param") != null
&& !vars.get("$this.value"))
{
result.string(vars.getString("$param.ObjectRowId_param"));
}
\ No newline at end of file
entity/Communication_entity/entityfields/object_type/valueProcess.js 0 → 100644
+ 10
− 0
View file @ f22d5ddc
import("system.neon");
import("system.result");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
&& vars.get("$param.ObjectType_param") != null
&& !vars.get("$this.value"))
{
result.string(vars.getString("$param.ObjectType_param"));
}
\ No newline at end of file
entity/Communication_entity/entityfields/objecttype_param/valueProcess.js 0 → 100644
+ 4
− 0
View file @ f22d5ddc
import("Communication_lib");
import("system.result");
result.string(CommUtil.defaultObjectType());
\ 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