From 60f0612d97c3d289a4fd20c210a9fc34fda6d01f Mon Sep 17 00:00:00 2001
From: "S.Leierseder" <S.Leierseder@SLeierseder.aditosoftware.local>
Date: Thu, 18 Jul 2019 15:34:55 +0200
Subject: [PATCH] changes data privacy
---
entity/DSGVO_entity/DSGVO_entity.aod | 1 +
.../_____LANGUAGE_EXTRA.aod | 27 +++++++++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 3 +++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 27 +++++++++++++++++++
.../CommRestriction/CommRestriction.aod | 4 +++
neonContext/DSGVO/DSGVO.aod | 4 +++
neonContext/Person/Person.aod | 4 +++
.../CommRestrictionDrawer_view.aod | 19 +++++++++++++
.../DSGVODrawer_view/DSGVODrawer_view.aod | 19 +++++++++++++
.../PersonDSGVORestriction_view.aod | 23 ++++++++++++++++
neonView/PersonMain_view/PersonMain_view.aod | 15 ++++-------
11 files changed, 136 insertions(+), 10 deletions(-)
create mode 100644 neonView/CommRestrictionDrawer_view/CommRestrictionDrawer_view.aod
create mode 100644 neonView/DSGVODrawer_view/DSGVODrawer_view.aod
create mode 100644 neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_view.aod
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index fda4da713fd..71190d0a999 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -12,6 +12,7 @@
</siblings>
<grantCreate v="false" />
<grantDelete v="false" />
+ <titlePlural>Data privacy entries</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f5f38ebd278..d1ced1a346b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5013,6 +5013,33 @@
<entry>
<key>New Notifications</key>
</entry>
+ <entry>
+ <key>Forecasts</key>
+ </entry>
+ <entry>
+ <key>Relation types</key>
+ </entry>
+ <entry>
+ <key>Data privacy entries</key>
+ </entry>
+ <entry>
+ <key>Timetracking entries</key>
+ </entry>
+ <entry>
+ <key>Duplicatescans</key>
+ </entry>
+ <entry>
+ <key>Appointments</key>
+ </entry>
+ <entry>
+ <key>Support Tickets</key>
+ </entry>
+ <entry>
+ <key>Members</key>
+ </entry>
+ <entry>
+ <key>Cost entries</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 a0d89a130d7..06a70c61af7 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6347,6 +6347,9 @@
<entry>
<key>Occurrence</key>
</entry>
+ <entry>
+ <key>Support ticket</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 497b292e32a..d4d99d2afef 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5062,6 +5062,33 @@
<entry>
<key>New Notifications</key>
</entry>
+ <entry>
+ <key>Forecasts</key>
+ </entry>
+ <entry>
+ <key>Relation types</key>
+ </entry>
+ <entry>
+ <key>Data privacy entries</key>
+ </entry>
+ <entry>
+ <key>Timetracking entries</key>
+ </entry>
+ <entry>
+ <key>Duplicatescans</key>
+ </entry>
+ <entry>
+ <key>Appointments</key>
+ </entry>
+ <entry>
+ <key>Support Tickets</key>
+ </entry>
+ <entry>
+ <key>Members</key>
+ </entry>
+ <entry>
+ <key>Cost entries</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/CommRestriction/CommRestriction.aod b/neonContext/CommRestriction/CommRestriction.aod
index 4b27ac29d86..e7734b9ca4d 100644
--- a/neonContext/CommRestriction/CommRestriction.aod
+++ b/neonContext/CommRestriction/CommRestriction.aod
@@ -20,5 +20,9 @@
<name>c0ffb2e0-0190-47ee-aa0a-e774fe5400fb</name>
<view>CommRestrictionPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>0f29e6bd-f4cb-488f-867f-a65b84ba341f</name>
+ <view>CommRestrictionDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/DSGVO/DSGVO.aod b/neonContext/DSGVO/DSGVO.aod
index 3b01fff52f6..06c58cb090b 100644
--- a/neonContext/DSGVO/DSGVO.aod
+++ b/neonContext/DSGVO/DSGVO.aod
@@ -23,5 +23,9 @@
<name>4cf0e8c3-900a-43f1-a2c0-3f8990644b64</name>
<view>DSGVOPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>5be7aa7b-2b66-41e1-b1f5-f86af1f6e50d</name>
+ <view>DSGVODrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 07f8c24364e..7149d8ce160 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -46,5 +46,9 @@
<name>fc7e2546-b42a-48c0-8670-2d4033ad0598</name>
<view>PersonTaskAppointment_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>296af7da-1994-49a3-a26f-903f29609fae</name>
+ <view>PersonDSGVORestriction_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/CommRestrictionDrawer_view/CommRestrictionDrawer_view.aod b/neonView/CommRestrictionDrawer_view/CommRestrictionDrawer_view.aod
new file mode 100644
index 00000000000..613e5c7aa4b
--- /dev/null
+++ b/neonView/CommRestrictionDrawer_view/CommRestrictionDrawer_view.aod
@@ -0,0 +1,19 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>CommRestrictionDrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Advertising bans</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>fba5fb33-43d4-4885-84ed-9fe5cc367566</name>
+ <entityField>#ENTITY</entityField>
+ <view>CommRestrictionFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/DSGVODrawer_view/DSGVODrawer_view.aod b/neonView/DSGVODrawer_view/DSGVODrawer_view.aod
new file mode 100644
index 00000000000..4cbd306684c
--- /dev/null
+++ b/neonView/DSGVODrawer_view/DSGVODrawer_view.aod
@@ -0,0 +1,19 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DSGVODrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Data privacy entries</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>61142c4e-e82d-451e-a491-9a71ac0ec5c0</name>
+ <entityField>#ENTITY</entityField>
+ <view>DSGVOFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_view.aod b/neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_view.aod
new file mode 100644
index 00000000000..ba8c4846f35
--- /dev/null
+++ b/neonView/PersonDSGVORestriction_view/PersonDSGVORestriction_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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>PersonDSGVORestriction_view</name>
+ <title>Data Privacy</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>e9af5716-946a-4d29-86e3-06c5231838f9</name>
+ <entityField>DSGVOEntries</entityField>
+ <view>DSGVODrawer_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>38199f7b-af85-4576-a6ee-3add0e6761aa</name>
+ <entityField>CommRestrictions</entityField>
+ <view>CommRestrictionDrawer_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 967701323cc..8d0e2c2199b 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -29,11 +29,6 @@
<entityField>ObjectTrees</entityField>
<view>ObjectTreeFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>265efe97-d759-476c-9546-0f339d56474d</name>
- <entityField>CommRestrictions</entityField>
- <view>CommRestrictionFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
<entityField>OtherContacts</entityField>
@@ -44,6 +39,11 @@
<entityField>#ENTITY</entityField>
<view>PersonTaskAppointment_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>c6dad062-2708-4329-bb60-90f8ab482a6c</name>
+ <entityField>#ENTITY</entityField>
+ <view>PersonDSGVORestriction_view</view>
+ </neonViewReference>
<neonViewReference>
<name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
<entityField>AttributeTree</entityField>
@@ -59,10 +59,5 @@
<entityField>LogHistoryConsumer</entityField>
<view>LogHistoryFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>fb1dd01e-a3ad-4708-b6a0-d273cbb0b50f</name>
- <entityField>DSGVOEntries</entityField>
- <view>DSGVOFilter_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab