From 3e4f7b9822c3eb78baef952af725998ae5b6dd27 Mon Sep 17 00:00:00 2001
From: "m.groppe" <m.groppe@adito.de>
Date: Wed, 23 Jun 2021 11:43:00 +0200
Subject: [PATCH] [Projekt: xRM-Marketing][TicketNr.: 1082955][Scan Services
Warnings beheben.]
---
.../BulkMailAnalysisBounceChart_entity.aod | 1 +
.../documentation.adoc | 3 +++
...ulkMailAnalysisOpeningHourChart_entity.aod | 1 +
.../documentation.adoc | 3 +++
...lkMailAnalysisStatusFunnelChart_entity.aod | 1 +
.../documentation.adoc | 3 +++
.../documentation.adoc | 4 +--
.../BulkMailTestRecipient_entity.aod | 2 ++
.../documentation.adoc | 3 +++
.../bulkmailtestrecipients/documentation.adoc | 3 +++
entity/MailLog_entity/MailLog_entity.aod | 2 ++
entity/MailLog_entity/documentation.adoc | 3 +++
.../entityfields/maillogs/documentation.adoc | 3 +++
.../WeblinkClick_entity.aod | 1 +
entity/WeblinkClick_entity/documentation.adoc | 2 ++
.../WeblinkTag_entity/WeblinkTag_entity.aod | 2 ++
entity/WeblinkTag_entity/documentation.adoc | 2 ++
.../entityfields/tags/documentation.adoc | 2 ++
entity/Weblink_entity/Weblink_entity.aod | 1 +
entity/Weblink_entity/documentation.adoc | 3 +++
.../BulkMailAnalysis/BulkMailAnalysis.aod | 3 ---
...MailAnalysisDynamicMultiDataChart_view.aod | 26 -------------------
.../BulkMailScoreCard_view.aod | 15 -----------
process/DocumentTemplate_lib/process.js | 1 +
.../process.js | 10 +++++--
process/redirect_rest/process.js | 1 -
process/redirect_rest/redirect_rest.aod | 1 +
27 files changed, 53 insertions(+), 49 deletions(-)
create mode 100644 entity/BulkMailAnalysisBounceChart_entity/documentation.adoc
create mode 100644 entity/BulkMailAnalysisOpeningHourChart_entity/documentation.adoc
create mode 100644 entity/BulkMailAnalysisStatusFunnelChart_entity/documentation.adoc
create mode 100644 entity/BulkMailTestRecipient_entity/documentation.adoc
create mode 100644 entity/BulkMailTestRecipient_entity/entityfields/bulkmailtestrecipients/documentation.adoc
create mode 100644 entity/MailLog_entity/documentation.adoc
create mode 100644 entity/MailLog_entity/entityfields/maillogs/documentation.adoc
create mode 100644 entity/WeblinkClick_entity/documentation.adoc
create mode 100644 entity/WeblinkTag_entity/documentation.adoc
create mode 100644 entity/WeblinkTag_entity/entityfields/tags/documentation.adoc
create mode 100644 entity/Weblink_entity/documentation.adoc
delete mode 100644 neonView/BulkMailAnalysisDynamicMultiDataChart_view/BulkMailAnalysisDynamicMultiDataChart_view.aod
delete mode 100644 neonView/BulkMailScoreCard_view/BulkMailScoreCard_view.aod
diff --git a/entity/BulkMailAnalysisBounceChart_entity/BulkMailAnalysisBounceChart_entity.aod b/entity/BulkMailAnalysisBounceChart_entity/BulkMailAnalysisBounceChart_entity.aod
index 2eaefaa396..80bd9091e5 100644
--- a/entity/BulkMailAnalysisBounceChart_entity/BulkMailAnalysisBounceChart_entity.aod
+++ b/entity/BulkMailAnalysisBounceChart_entity/BulkMailAnalysisBounceChart_entity.aod
@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailAnalysisBounceChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/BulkMailAnalysisBounceChart_entity/documentation.adoc</documentation>
<recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/BulkMailAnalysisBounceChart_entity/documentation.adoc b/entity/BulkMailAnalysisBounceChart_entity/documentation.adoc
new file mode 100644
index 0000000000..32eda36583
--- /dev/null
+++ b/entity/BulkMailAnalysisBounceChart_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Bulkmail Analyses Bounce Chart==
+
+This entity provides a pie Chart to display the different kind of Bounces that happened during a bulk mail.
\ No newline at end of file
diff --git a/entity/BulkMailAnalysisOpeningHourChart_entity/BulkMailAnalysisOpeningHourChart_entity.aod b/entity/BulkMailAnalysisOpeningHourChart_entity/BulkMailAnalysisOpeningHourChart_entity.aod
index 4e594c6e91..511d7e49c3 100644
--- a/entity/BulkMailAnalysisOpeningHourChart_entity/BulkMailAnalysisOpeningHourChart_entity.aod
+++ b/entity/BulkMailAnalysisOpeningHourChart_entity/BulkMailAnalysisOpeningHourChart_entity.aod
@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailAnalysisOpeningHourChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/BulkMailAnalysisOpeningHourChart_entity/documentation.adoc</documentation>
<recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/BulkMailAnalysisOpeningHourChart_entity/documentation.adoc b/entity/BulkMailAnalysisOpeningHourChart_entity/documentation.adoc
new file mode 100644
index 0000000000..3b27da94b2
--- /dev/null
+++ b/entity/BulkMailAnalysisOpeningHourChart_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Bulkmail Analysis Opening Hour Chart==
+
+This entity provides a Chart to display the opening hours of recipients of a bulk mail.
\ No newline at end of file
diff --git a/entity/BulkMailAnalysisStatusFunnelChart_entity/BulkMailAnalysisStatusFunnelChart_entity.aod b/entity/BulkMailAnalysisStatusFunnelChart_entity/BulkMailAnalysisStatusFunnelChart_entity.aod
index 550306ae0d..b202b2e59d 100644
--- a/entity/BulkMailAnalysisStatusFunnelChart_entity/BulkMailAnalysisStatusFunnelChart_entity.aod
+++ b/entity/BulkMailAnalysisStatusFunnelChart_entity/BulkMailAnalysisStatusFunnelChart_entity.aod
@@ -2,6 +2,7 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21">
<name>BulkMailAnalysisStatusFunnelChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/BulkMailAnalysisStatusFunnelChart_entity/documentation.adoc</documentation>
<recordContainer>jDito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/BulkMailAnalysisStatusFunnelChart_entity/documentation.adoc b/entity/BulkMailAnalysisStatusFunnelChart_entity/documentation.adoc
new file mode 100644
index 0000000000..f8da54e4b7
--- /dev/null
+++ b/entity/BulkMailAnalysisStatusFunnelChart_entity/documentation.adoc
@@ -0,0 +1,3 @@
+== Bulkmail Analysis Status Funnel Chart==
+
+This entity provides a Chart to display the status of recipients of a bulk mail.
\ No newline at end of file
diff --git a/entity/BulkMailAnalysis_entity/documentation.adoc b/entity/BulkMailAnalysis_entity/documentation.adoc
index 6aed8e9943..aceeb22d15 100644
--- a/entity/BulkMailAnalysis_entity/documentation.adoc
+++ b/entity/BulkMailAnalysis_entity/documentation.adoc
@@ -1,3 +1,3 @@
-== Bulkmail Analyses ==
+== Bulkmail Analysis ==
-This entity provides analyses to display different things of all bulkmail.
\ No newline at end of file
+This entity provides analysis to display different things of all bulkmail.
\ No newline at end of file
diff --git a/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod b/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
index 8204e287fe..60baeaf9a9 100644
--- a/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
+++ b/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
@@ -3,6 +3,7 @@
<name>BulkMailTestRecipient_entity</name>
<title>Test Recipient</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/BulkMailTestRecipient_entity/documentation.adoc</documentation>
<titlePlural>Test Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -40,6 +41,7 @@
</entityField>
<entityProvider>
<name>BulkMailTestRecipients</name>
+ <documentation>%aditoprj%/entity/BulkMailTestRecipient_entity/entityfields/bulkmailtestrecipients/documentation.adoc</documentation>
</entityProvider>
<entityConsumer>
<name>Contacts</name>
diff --git a/entity/BulkMailTestRecipient_entity/documentation.adoc b/entity/BulkMailTestRecipient_entity/documentation.adoc
new file mode 100644
index 0000000000..780b6235ef
--- /dev/null
+++ b/entity/BulkMailTestRecipient_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= BulkMailTestRecipient_entity
+
+This entity provides information about the recipient used during test runs for bulk mails.
\ No newline at end of file
diff --git a/entity/BulkMailTestRecipient_entity/entityfields/bulkmailtestrecipients/documentation.adoc b/entity/BulkMailTestRecipient_entity/entityfields/bulkmailtestrecipients/documentation.adoc
new file mode 100644
index 0000000000..05a87586e9
--- /dev/null
+++ b/entity/BulkMailTestRecipient_entity/entityfields/bulkmailtestrecipients/documentation.adoc
@@ -0,0 +1,3 @@
+= BulkMailTestRecipient_entity - BulkMailTestRecipients
+
+Provides all BulkMailTestRecipients
\ No newline at end of file
diff --git a/entity/MailLog_entity/MailLog_entity.aod b/entity/MailLog_entity/MailLog_entity.aod
index 431f9c0c31..a26c0d3fe6 100644
--- a/entity/MailLog_entity/MailLog_entity.aod
+++ b/entity/MailLog_entity/MailLog_entity.aod
@@ -3,6 +3,7 @@
<name>MailLog_entity</name>
<title>Maillog</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/MailLog_entity/documentation.adoc</documentation>
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="false" />
@@ -78,6 +79,7 @@
</entityParameter>
<entityProvider>
<name>MailLogs</name>
+ <documentation>%aditoprj%/entity/MailLog_entity/entityfields/maillogs/documentation.adoc</documentation>
<children>
<entityParameter>
<name>ObjectType_param</name>
diff --git a/entity/MailLog_entity/documentation.adoc b/entity/MailLog_entity/documentation.adoc
new file mode 100644
index 0000000000..dc4e073457
--- /dev/null
+++ b/entity/MailLog_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= MailLog_entity
+
+Provides Information about the status of a Mail (was it send successfully, was it opened by the user, etc.).
\ No newline at end of file
diff --git a/entity/MailLog_entity/entityfields/maillogs/documentation.adoc b/entity/MailLog_entity/entityfields/maillogs/documentation.adoc
new file mode 100644
index 0000000000..9a256877b6
--- /dev/null
+++ b/entity/MailLog_entity/entityfields/maillogs/documentation.adoc
@@ -0,0 +1,3 @@
+= MailLog_entity - MailLogs
+
+Provides all MailLogs
\ No newline at end of file
diff --git a/entity/WeblinkClick_entity/WeblinkClick_entity.aod b/entity/WeblinkClick_entity/WeblinkClick_entity.aod
index bfc0e2a5ee..9e8e4288f6 100644
--- a/entity/WeblinkClick_entity/WeblinkClick_entity.aod
+++ b/entity/WeblinkClick_entity/WeblinkClick_entity.aod
@@ -3,6 +3,7 @@
<name>WeblinkClick_entity</name>
<title>Click</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/WeblinkClick_entity/documentation.adoc</documentation>
<grantCreate v="false" />
<grantUpdate v="false" />
<grantDelete v="false" />
diff --git a/entity/WeblinkClick_entity/documentation.adoc b/entity/WeblinkClick_entity/documentation.adoc
new file mode 100644
index 0000000000..9a1bde2ec0
--- /dev/null
+++ b/entity/WeblinkClick_entity/documentation.adoc
@@ -0,0 +1,2 @@
+= WeblinkClick_entity
+Entity that stores information about clicks on a link by a recipient of a mailing.
\ No newline at end of file
diff --git a/entity/WeblinkTag_entity/WeblinkTag_entity.aod b/entity/WeblinkTag_entity/WeblinkTag_entity.aod
index 88e59eec7f..a57d8a2881 100644
--- a/entity/WeblinkTag_entity/WeblinkTag_entity.aod
+++ b/entity/WeblinkTag_entity/WeblinkTag_entity.aod
@@ -3,6 +3,7 @@
<name>WeblinkTag_entity</name>
<title>Tag</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/WeblinkTag_entity/documentation.adoc</documentation>
<grantUpdate v="false" />
<grantUpdateProcess>%aditoprj%/entity/WeblinkTag_entity/grantUpdateProcess.js</grantUpdateProcess>
<onInit>%aditoprj%/entity/WeblinkTag_entity/onInit.js</onInit>
@@ -14,6 +15,7 @@
</entityProvider>
<entityProvider>
<name>Tags</name>
+ <documentation>%aditoprj%/entity/WeblinkTag_entity/entityfields/tags/documentation.adoc</documentation>
</entityProvider>
<entityParameter>
<name>WeblinkId_param</name>
diff --git a/entity/WeblinkTag_entity/documentation.adoc b/entity/WeblinkTag_entity/documentation.adoc
new file mode 100644
index 0000000000..66ca6fba03
--- /dev/null
+++ b/entity/WeblinkTag_entity/documentation.adoc
@@ -0,0 +1,2 @@
+= WeblinkTag_entity
+Stores information about tags for weblinks
\ No newline at end of file
diff --git a/entity/WeblinkTag_entity/entityfields/tags/documentation.adoc b/entity/WeblinkTag_entity/entityfields/tags/documentation.adoc
new file mode 100644
index 0000000000..8281a775ad
--- /dev/null
+++ b/entity/WeblinkTag_entity/entityfields/tags/documentation.adoc
@@ -0,0 +1,2 @@
+= WeblinkTag_entity - Tags
+Provides all Tags
\ No newline at end of file
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index d2e768f7f4..7d8d107457 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -3,6 +3,7 @@
<name>Weblink_entity</name>
<title>Weblink</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Weblink_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/Weblink_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>NEON:FILTER</iconId>
<titlePlural>Weblinks</titlePlural>
diff --git a/entity/Weblink_entity/documentation.adoc b/entity/Weblink_entity/documentation.adoc
new file mode 100644
index 0000000000..e45d1e8eca
--- /dev/null
+++ b/entity/Weblink_entity/documentation.adoc
@@ -0,0 +1,3 @@
+= Weblink_entity
+
+Entity that stores information about weblinks used for replacement during bulk mail runs.
\ No newline at end of file
diff --git a/neonContext/BulkMailAnalysis/BulkMailAnalysis.aod b/neonContext/BulkMailAnalysis/BulkMailAnalysis.aod
index 8d2a006407..119c4612e6 100644
--- a/neonContext/BulkMailAnalysis/BulkMailAnalysis.aod
+++ b/neonContext/BulkMailAnalysis/BulkMailAnalysis.aod
@@ -12,8 +12,5 @@
<name>2bdd2e2e-9399-4b4a-a123-2b7a255b9bc0</name>
<view>BulkMailAnalysisDeviceTypeChart_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5705a355-c092-417e-89ab-8899fd8c82c7</name>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/BulkMailAnalysisDynamicMultiDataChart_view/BulkMailAnalysisDynamicMultiDataChart_view.aod b/neonView/BulkMailAnalysisDynamicMultiDataChart_view/BulkMailAnalysisDynamicMultiDataChart_view.aod
deleted file mode 100644
index 856abaeea5..0000000000
--- a/neonView/BulkMailAnalysisDynamicMultiDataChart_view/BulkMailAnalysisDynamicMultiDataChart_view.aod
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>BulkMailAnalysisDynamicMultiDataChart_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <dynamicMultiDataChartViewTemplate>
- <name>dynamicMultiDataChart</name>
- <defaultGroupFields>
- <element>year</element>
- </defaultGroupFields>
- <columns>
- <neonDynamicMultiDataChartColumn>
- <name>c612bd68-b0a9-4517-bd77-4b643c8cc8d8</name>
- </neonDynamicMultiDataChartColumn>
- <neonDynamicMultiDataChartColumn>
- <name>90eb7fd9-e79a-47af-9951-a2ade5353a5a</name>
- </neonDynamicMultiDataChartColumn>
- </columns>
- </dynamicMultiDataChartViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/BulkMailScoreCard_view/BulkMailScoreCard_view.aod b/neonView/BulkMailScoreCard_view/BulkMailScoreCard_view.aod
deleted file mode 100644
index 44e48038bc..0000000000
--- a/neonView/BulkMailScoreCard_view/BulkMailScoreCard_view.aod
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>BulkMailScoreCard_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <scoreCardViewTemplate>
- <name>Keyfigures</name>
- </scoreCardViewTemplate>
- </children>
-</neonView>
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 99be3eedc8..01fd43a92a 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -227,6 +227,7 @@ DocumentTemplate.types = {
{
switch (pMimetype)
{
+ case MimeTypes.XHTML():
case MimeTypes.HTML():
return this.HTML;
case MimeTypes.EML():
diff --git a/process/SetCommunicationSetting_workflowService/process.js b/process/SetCommunicationSetting_workflowService/process.js
index 093920c3f8..c755964cca 100644
--- a/process/SetCommunicationSetting_workflowService/process.js
+++ b/process/SetCommunicationSetting_workflowService/process.js
@@ -40,21 +40,27 @@ if (settingsId)
}
else
{
+ var currentDate = vars.get("$sys.date");
settingsId = util.getNewUUID();
new SqlBuilder()
.tableName("COMMUNICATIONSETTINGS")
.insertFields({
+ "CONTACT_ID":contactId,
"COMMUNICATIONSETTINGSID": settingsId,
"CHANNEL_TYPE": channelType,
"CHANNEL_ID": channelId,
"MEDIUM": medium,
- "STATUS": status
+ "STATUS": status,
+ "USER_NEW":"workflow",
+ "DATE_NEW":date
});
new SqlBuilder()
.tableName("COMMUNICATIONLEGALBASE")
.insertFields({
"COMMUNICATIONLEGALBASEID": util.getNewUUID(),
"COMMUNICATIONSETTINGS_ID": settingsId,
- "VERSION": 1
+ "VERSION": 1,
+ "USER_NEW":"workflow",
+ "DATE_NEW":date
});
}
\ No newline at end of file
diff --git a/process/redirect_rest/process.js b/process/redirect_rest/process.js
index 966602c69e..990ccc2701 100644
--- a/process/redirect_rest/process.js
+++ b/process/redirect_rest/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("Workflow_lib");
import("Util_lib");
import("system.util");
diff --git a/process/redirect_rest/redirect_rest.aod b/process/redirect_rest/redirect_rest.aod
index 83abc318c0..7f89323e83 100644
--- a/process/redirect_rest/redirect_rest.aod
+++ b/process/redirect_rest/redirect_rest.aod
@@ -8,6 +8,7 @@
<loginTypeId>
<element>internal.none</element>
</loginTypeId>
+ <jditoWebserviceUser>Admin</jditoWebserviceUser>
<alias>Data_alias</alias>
<variants>
<element>EXECUTABLE</element>
--
GitLab