From 21f2ae422762d626571f57668d1a69c171a677f9 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Thu, 1 Aug 2019 15:41:06 +0200
Subject: [PATCH] BulkMail diagram only in main view
---
.../_____LANGUAGE_EXTRA.aod | 6 +++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 +++++
neonContext/BulkMail/BulkMail.aod | 4 ++++
.../BulkMailMainPreview_view.aod | 23 +++++++++++++++++++
.../BulkMailMain_view/BulkMailMain_view.aod | 12 +++++-----
.../BulkMailPreview_view.aod | 6 -----
7 files changed, 49 insertions(+), 12 deletions(-)
create mode 100644 neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index cd1d779266c..9ec915acd00 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4866,6 +4866,12 @@
<entry>
<key>Testing</key>
</entry>
+ <entry>
+ <key>Save settings</key>
+ </entry>
+ <entry>
+ <key>Test email</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 5e0010607c7..541e271bab2 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -74,6 +74,10 @@
<key>NONE</key>
<value>keine</value>
</entry>
+ <entry>
+ <key>Recipient status</key>
+ <value>Empfängerstatus</value>
+ </entry>
<entry>
<key>LOW</key>
<value>gering</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index bc01304f1d2..27d3974f75c 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4915,6 +4915,12 @@
<entry>
<key>Testing</key>
</entry>
+ <entry>
+ <key>Save settings</key>
+ </entry>
+ <entry>
+ <key>Test email</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/BulkMail/BulkMail.aod b/neonContext/BulkMail/BulkMail.aod
index ae4fd6a6791..b6e2ea9a7a3 100644
--- a/neonContext/BulkMail/BulkMail.aod
+++ b/neonContext/BulkMail/BulkMail.aod
@@ -29,5 +29,9 @@
<name>6b057fb0-94ac-4bca-88b2-c97fdfcf9d6e</name>
<view>BulkMailContent_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>fb5bc6ed-d3c9-45ef-a0c7-17b190e3ce74</name>
+ <view>BulkMailMainPreview_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod
new file mode 100644
index 00000000000..27aab06baf3
--- /dev/null
+++ b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod
@@ -0,0 +1,23 @@
+<?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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2">
+ <name>BulkMailMainPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <footer>e8f0200f-3447-4196-8aba-f2966e83689a</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>2a1f719c-1838-4f30-8fb7-27cd7bbf16ee</name>
+ <entityField>#ENTITY</entityField>
+ <view>BulkMailPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e8f0200f-3447-4196-8aba-f2966e83689a</name>
+ <entityField>RecipientStatusChart</entityField>
+ <view>BulkMailStatusChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index 0f6a248d7eb..d5529d58307 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -5,15 +5,10 @@
<layout>
<masterSlaveLayout>
<name>layout</name>
- <master>9f5528f7-230e-42e5-8831-66bdee9a9588</master>
+ <master>3f7fc7d4-7cda-428c-8acb-364addc5239c</master>
</masterSlaveLayout>
</layout>
<children>
- <neonViewReference>
- <name>9f5528f7-230e-42e5-8831-66bdee9a9588</name>
- <entityField>#ENTITY</entityField>
- <view>BulkMailPreview_view</view>
- </neonViewReference>
<neonViewReference>
<name>8be4ed02-1c54-41d0-9bba-3b785346a550</name>
<entityField>Recipients</entityField>
@@ -29,5 +24,10 @@
<entityField>LogHistories</entityField>
<view>LogHistoryFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>3f7fc7d4-7cda-428c-8acb-364addc5239c</name>
+ <entityField>#ENTITY</entityField>
+ <view>BulkMailMainPreview_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
index a253dad73d0..a9bdee7f245 100644
--- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
@@ -6,7 +6,6 @@
<headerFooterLayout>
<name>layout</name>
<header>Card</header>
- <footer>6def3a7a-c9a0-4f2d-a36f-e53a631d8261</footer>
</headerFooterLayout>
</layout>
<children>
@@ -65,10 +64,5 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>6def3a7a-c9a0-4f2d-a36f-e53a631d8261</name>
- <entityField>RecipientStatusChart</entityField>
- <view>BulkMailStatusChart_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab